video_transcoding 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a766c53d54b741cc24e1d9ba31579667f8354ce1
-  data.tar.gz: d37b0b0730d5e7800aa7795f4a5caf90c84fbbcc
+  metadata.gz: 1da5b086d8c5b40636f739394d2eaa459f3ef80e
+  data.tar.gz: 27dcf3f30e2fc1ec5950bf52d1b2cfa8f8cf3edd
 SHA512:
-  metadata.gz: fffe7dc4bc59256425bb7fe704033f49fe4b733a49db896a6f1b5274a3e71f5deb85add04bf1976a51aa2f082f9fdd46561096d52c8931e0b9c1e3927ac8e791
-  data.tar.gz: d36bcf4a8ba96c4d7f17519c72af2fb3ea934e28ea8d46d94ed8f0ad3b445d7ba1624f26dfb550fe8aeb4194429a137d35faaa420f392a64211773512a2ff002
+  metadata.gz: 4e40027f639f12299b18d3f315441397b2c81cd537baf6c7b734ba17259e689446db1e3b1413ba1f40de7fab9d48be8b9f2116a2d18f76c1d5d71920897da7c9
+  data.tar.gz: 6e39b8b65e5e7f85478ec6e254ea8b66006bed22d99f8234520908a1fd4205e2f7f88068281acd5223c05bc7a2701fe0f304f4a52bb43370098a8ed1dc995b9a

data/README.md

@@ -10,7 +10,7 @@ What makes these tools unique is the [special ratecontrol system](#explanation)
 
 This package is based on my original collection of [Video Transcoding Scripts](https://github.com/donmelton/video-transcoding-scripts) written in Bash. While still available online, those scripts are no longer in active development. Users are encouraged to install this Ruby Gem instead.
 
-Most of the tools in this package are essentially intelligent wrappers around Open Source software like [HandBrake](https://handbrake.fr/), [MKVToolNix](https://www.bunkus.org/videotools/mkvtoolnix/), [MPlayer](http://mplayerhq.hu/), [FFmpeg](http://ffmpeg.org/), and [MP4v2](https://code.google.com/p/mp4v2/). And they're all designed to be executed from the command line shell:
+Most of the tools in this package are essentially intelligent wrappers around Open Source software like [HandBrake](https://handbrake.fr/), [FFmpeg](http://ffmpeg.org/), [MKVToolNix](https://www.bunkus.org/videotools/mkvtoolnix/), and [MP4v2](https://code.google.com/p/mp4v2/). And they're all designed to be executed from the command line shell:
 
 * [`transcode-video`](#why-transcode-video)
 Transcode video file or disc image directory into format and size similar to popular online downloads.
@@ -64,7 +64,8 @@ Most of the tools in this package require other software to function properly, s
 * `ffmpeg`
 * `mkvpropedit`
 * `mp4track`
-* `mplayer`
+
+Previewing the output of `detect-crop` is optional, but doing so uses [`mpv`](https://mpv.io/), a free, Open Source, and cross-platform media player.
 
 You can download the command line version of HandBrake, called `HandBrakeCLI`, here:
 
@@ -76,7 +77,10 @@ On macOS, `HandBrakeCLI` and all its other dependencies can be easily installed
     brew install ffmpeg
     brew install mkvtoolnix
     brew install mp4v2
-    brew install mplayer
+
+The optional crop previewing package can also be installed via Homebrew:
+
+    brew install mpv
 
 On Linux, package management systems vary so it's best consult the indexes for those systems. But there's a Homebrew port available called [Linuxbrew](http://linuxbrew.sh/) and it doesn't require root access.
 
@@ -124,7 +128,7 @@ HandBrake applies automatic crop detection by default. While it's usually correc
 
 This is why `transcode-video` doesn't allow HandBrake to apply cropping by default.
 
-Instead, the `detect-crop` tool leverages both HandBrake and MPlayer to find the video cropping bounds. It then indicates whether those two programs agree. To aid in review, this tool prints commands to the terminal console allowing the recommended (or disputed) crop to be displayed, as well as a sample command line for `transcode-video` itself.
+Instead, the `detect-crop` tool leverages both HandBrake and FFmpeg to find the video cropping bounds. It then indicates whether those two programs agree. To aid in review, this tool prints commands to the terminal console allowing the recommended (or disputed) crop to be displayed, as well as a sample command line for `transcode-video` itself.
 
 ### Why `convert-video`?
 
@@ -222,7 +226,7 @@ You can also call the `detect-crop` logic from `transcode-video` with the single
 
     transcode-video --crop detect "/path/to/Movie.mkv"
 
-However, be aware that `detect` can fail if HandBrake and MPlayer disagree about the cropping values.
+However, be aware that `detect` can fail if HandBrake and FFmpeg disagree about the cropping values.
 
 #### Understanding audio
 
@@ -318,34 +322,34 @@ The command to find the video cropping bounds is as simple as:
 
 Which prints out something like this:
 
-    mplayer -really-quiet -nosound -vf rectangle=1920:816:0:132 '/path/to/Movie.mkv'
-    mplayer -really-quiet -nosound -vf crop=1920:816:0:132 '/path/to/Movie.mkv'
+    mpv --no-audio --vf lavfi=[drawbox=0:132:1920:816:invert:1] '/path/to/Movie.mkv'
+    mpv --no-audio --vf crop=1920:816:0:132 '/path/to/Movie.mkv'
 
     transcode-video --crop 132:132:0:0 '/path/to/Movie.mkv'
 
 Just copy and paste the sample commands to preview or transcode.
 
-If HandBrake and MPlayer disagree about the cropping values, then `detect-crop` prints out something like this:
+If HandBrake and FFmpeg disagree about the cropping values, then `detect-crop` prints out something like this:
 
     Results differ...
 
     # From HandBrakeCLI:
 
-    mplayer -really-quiet -nosound -vf rectangle=1920:816:0:132 '/path/to/Movie.mkv'
-    mplayer -really-quiet -nosound -vf crop=1920:816:0:132 '/path/to/Movie.mkv'
+    mpv --no-audio --vf lavfi=[drawbox=0:132:1920:816:invert:1] '/path/to/Movie.mkv'
+    mpv --no-audio --vf crop=1920:816:0:132 '/path/to/Movie.mkv'
 
     transcode-video --crop 132:132:0:0 '/path/to/Movie.mkv'
 
-    # From mplayer:
+    # From ffmpeg:
 
-    mplayer -really-quiet -nosound -vf rectangle=1920:820:0:130 '/path/to/Movie.mkv'
-    mplayer -really-quiet -nosound -vf crop=1920:820:0:130 '/path/to/Movie.mkv'
+    mpv --no-audio --vf lavfi=[drawbox=0:130:1920:820:invert:1] '/path/to/Movie.mkv'
+    mpv --no-audio --vf crop=1920:820:0:130 '/path/to/Movie.mkv'
 
     transcode-video --crop 130:130:0:0 '/path/to/Movie.mkv'
 
 You'll then need to preview both and decide which to use.
 
-When input is a disc image directory instead of a single file, the `detect-crop` tool doesn't use MPlayer, nor does it print out commands to preview the crop.
+When input is a disc image directory instead of a single file, the `detect-crop` tool doesn't use FFmpeg, nor does it print out commands to preview the crop.
 
 ### Using `convert-video`
 
@@ -420,7 +424,7 @@ I have four rules when preparing my own media for transcoding:
 
 #### Why a single `.mkv` file?
 
-* Many automatic behaviors and other features in both `transcode-video` and `detect-crop` are not available when input is a disc image directory. This is because that format limits the ability of `HandBrakeCLI` and `mplayer` to detect or manipulate certain information about the video.
+* Many automatic behaviors and other features in both `transcode-video` and `detect-crop` are not available when input is a disc image directory. This is because that format limits the ability of `HandBrakeCLI` and `ffmpeg` to detect or manipulate certain information about the video.
 
 * Both forced subtitle extraction and lossless audio conversion, detailed below, are not possible when input is a disc image directory.
 
@@ -646,7 +650,7 @@ What I don't use are [peak signal-to-noise ratios](https://en.wikipedia.org/wiki
 
 I use the default settings. That's why they're the defaults.
 
-I never use the `--crop detect` function of `transcode-video` because I don't trust either `HandBrakeCLI` or `mplayer` to always get it right without supervision. Instead, I use the separate `detect-crop` tool before transcoding to manually review and apply the best crop values.
+I never use the `--crop detect` function of `transcode-video` because I don't trust either `HandBrakeCLI` or `ffmpeg` to always get it right without supervision. Instead, I use the separate `detect-crop` tool before transcoding to manually review and apply the best crop values.
 
 I let `transcode-video` automatically burn any forced subtitles into the output video track when the "forced" flag is enabled in the original.
 
@@ -656,11 +660,23 @@ For a few problematic videos, I have to apply options like `--force-rate 23.976
 
 ## History
 
+### [0.17.0](https://github.com/donmelton/video_transcoding/releases/tag/0.17.0)
+
+Thursday, February 16, 2017
+
+* Remove all dependencies on `mplayer`, via #[ #120](https://github.com/donmelton/video_transcoding/issues/120) and #[ #123](https://github.com/donmelton/video_transcoding/issues/123):
+    * Modify `detect-crop` and `transcode-video` to use `ffmpeg` for crop detection instead of `mplayer`.
+    * Modify `detect-crop` to use [`mpv`](https://mpv.io/), a free cross-platform media player, for optional crop preview instead of `mplayer`.
+    * Add a `--player` option to `detect-crop` so `mplayer` can still be used for crop preview commands. Warning: this feature will be deprecated soon.
+* Update the "README" document to:
+    * Remove any mention of `mplayer` and list `mpv` as an optional package.
+    * Fix typo in version 0.16.0 release information. Thanks, [@samhutchins](https://github.com/samhutchins)!
+
 ### [0.16.0](https://github.com/donmelton/video_transcoding/releases/tag/0.16.0)
 
 Friday, January 20, 2017
 
-* Add a `--cvbr` option to `transcode-video`. This is essentially the same as the experimental option of the same name which was removed on February 25, 2016, but now it doesn't have a bitrate argument. It enables a _simple_ constrained variable bitrate (CVBR) ratecontrol system, less constrained the default, producing a more predictable output size while avoiding `VBV underflow` warnings. Use it with `--target big` for the best results.
+* Add a `--cvbr` option to `transcode-video`. This is essentially the same as the experimental option of the same name which was removed on February 25, 2016, but now it doesn't have a bitrate argument. It enables a _simple_ constrained variable bitrate (CVBR) ratecontrol system, less constrained than the default, producing a more predictable output size while avoiding `VBV underflow` warnings. Use it with `--target big` for the best results.
 * Modify the `--abr` option in `transcode-video` to no longer use a bitrate argument. Instead, it relies on the `--target` option to control bitrate, just like the default ratecontrol system and the new `--cvbr` option. So, passing a bitrate argument is now an error. But you should consider using `--cvbr` instead of `--abr` anyway since the former is almost always higher quality.
 * Remove the deprecated `--no-constrain` option from `detect-crop` and the `--no-constrain-crop` option from `transcode-video`.
 * Modify `convert-video` to allow HEVC format video along with H.264.

data/bin/detect-crop

@@ -31,6 +31,8 @@ Usage: #{$PROGRAM_NAME} [OPTION]... [FILE|DIRECTORY]...
                       (default: main feature or first listed)
     --constrain     constrain crop to optimal shape
     --values-only   output only unambiguous crop values, not commands
+    --player mpv|mplayer
+                    select player for preview commands (default: mpv)
 
 -v, --verbose       increase diagnostic information
 -q, --quiet         decrease     "           "
@@ -38,7 +40,7 @@ Usage: #{$PROGRAM_NAME} [OPTION]... [FILE|DIRECTORY]...
 -h, --help          display this help and exit
     --version       output version information and exit
 
-Requires `HandBrakeCLI` and `mplayer`.
+Requires `HandBrakeCLI` and `ffmpeg`.
 HERE
     end
 
@@ -48,6 +50,7 @@ HERE
       @title        = nil
       @constrain    = false
       @values_only  = false
+      @player       = :mpv
     end
 
     def define_options(opts)
@@ -55,11 +58,20 @@ HERE
       opts.on('--title ARG', Integer) { |arg| @title = arg }
       opts.on('--constrain')          { @constrain = true }
       opts.on('--values-only')        { @values_only = true }
+
+      opts.on '--player ARG' do |arg|
+        @player = case arg
+        when 'mpv', 'mplayer'
+          arg.to_sym
+        else
+          fail UsageError, "invalid player argument: #{arg}"
+        end
+      end
     end
 
     def configure
       HandBrake.setup
-      MPlayer.setup
+      FFmpeg.setup
     end
 
     def process_input(arg)
@@ -89,10 +101,17 @@ HERE
       end
 
       print_all = ->(crop) do
-        str = Crop.mplayer_string(crop, width, height)
         puts
-        puts "mplayer -really-quiet -nosound -vf rectangle=#{str} #{shell_path}"
-        puts "mplayer -really-quiet -nosound -vf crop=#{str} #{shell_path}"
+
+        if @player == :mpv
+          puts "mpv --no-audio --vf lavfi=[drawbox=#{Crop.drawbox_string(crop, width, height)}:invert:1] #{shell_path}"
+          puts "mpv --no-audio --vf crop=#{Crop.player_string(crop, width, height)} #{shell_path}"
+        else
+          str = Crop.player_string(crop, width, height)
+          puts "mplayer -really-quiet -nosound -vf rectangle=#{str} #{shell_path}"
+          puts "mplayer -really-quiet -nosound -vf crop=#{str} #{shell_path}"
+        end
+
         print_transcode.call crop
       end
 
@@ -103,24 +122,24 @@ HERE
           print_transcode.call hb_crop
         end
       else
-        mp_crop = Crop.detect(arg, media.info[:duration], width, height)
-        mp_crop = Crop.constrain(mp_crop, width, height) if @constrain
+        ff_crop = Crop.detect(arg, media.info[:duration], width, height)
+        ff_crop = Crop.constrain(ff_crop, width, height) if @constrain
 
-        if hb_crop == mp_crop
+        if hb_crop == ff_crop
           if @values_only
             puts Crop.handbrake_string(hb_crop)
           else
-            Console.info 'Results from HandBrakeCLI and mplayer are identical...'
+            Console.info 'Results from HandBrakeCLI and ffmpeg are identical...'
             print_all.call hb_crop
           end
         else
-          fail "results from HandBrakeCLI and mplayer differ: #{arg}" if @values_only
+          fail "results from HandBrakeCLI and ffmpeg differ: #{arg}" if @values_only
           Console.warn 'Results differ...'
           puts
           puts '# From HandBrakeCLI:'
           print_all.call hb_crop
-          puts '# From mplayer:'
-          print_all.call mp_crop
+          puts '# From ffmpeg:'
+          print_all.call ff_crop
         end
       end
     end

data/bin/transcode-video

@@ -80,7 +80,7 @@ Video options:
                       (use `--crop auto` for `HandBrakeCLI` behavior)
     --constrain-crop
                     constrain `--crop detect` to optimal shape
-    --fallback-crop handbrake|mplayer|none
+    --fallback-crop handbrake|ffmpeg|none
                     select fallback crop values if `--crop detect` fails
     --720p          fit video within 1280x720 pixel bounds
     --max-width WIDTH, --max-height HEIGHT
@@ -217,7 +217,7 @@ Other options:
 -h, --help          display this help and exit
     --version       output version information and exit
 
-Requires `HandBrakeCLI`, `mp4track`, `mplayer` and `mkvpropedit`.
+Requires `HandBrakeCLI`, `mp4track`, `ffmpeg` and `mkvpropedit`.
 HERE
     end
 
@@ -405,7 +405,7 @@ HERE
 
       opts.on '--fallback-crop ARG' do |arg|
         @fallback_crop = case arg
-        when 'handbrake', 'mplayer', 'none'
+        when 'handbrake', 'ffmpeg', 'mplayer', 'none'
           arg.to_sym
         else
           fail UsageError, "invalid fallback crop argument: #{arg}"
@@ -787,7 +787,7 @@ HERE
       @disable_handbrake_options.uniq!
       HandBrake.setup
       MP4track.setup
-      MPlayer.setup
+      FFmpeg.setup
       MKVpropedit.setup
     end
 
@@ -989,21 +989,21 @@ HERE
         crop = hb_crop
 
         unless media.info[:directory]
-          mp_crop = Crop.detect(media.path, media.info[:duration], width, height)
-          mp_crop = Crop.constrain(mp_crop, width, height) if @constrain_crop
+          ff_crop = Crop.detect(media.path, media.info[:duration], width, height)
+          ff_crop = Crop.constrain(ff_crop, width, height) if @constrain_crop
 
-          if hb_crop != mp_crop
+          if hb_crop != ff_crop
             crop = case @fallback_crop
             when :handbrake
               hb_crop
-            when :mplayer
-              mp_crop
+            when :ffmpeg, :mplayer
+              ff_crop
             when :none
               {:top => 0, :bottom => 0, :left => 0, :right => 0}
             else
               Console.error 'Results differ...'
               Console.error "From HandBrakeCLI: #{Crop.handbrake_string(hb_crop)}"
-              Console.error "From mplayer:      #{Crop.handbrake_string(mp_crop)}"
+              Console.error "From ffmpeg:       #{Crop.handbrake_string(ff_crop)}"
               fail "crop detection failed: #{media.path}"
             end
           end

data/lib/video_transcoding.rb

@@ -15,6 +15,5 @@ require 'video_transcoding/handbrake'
 require 'video_transcoding/media'
 require 'video_transcoding/mkvpropedit'
 require 'video_transcoding/mp4track'
-require 'video_transcoding/mplayer'
 require 'video_transcoding/tool'
 require 'video_transcoding/version'

data/lib/video_transcoding/crop.rb

@@ -9,7 +9,7 @@ module VideoTranscoding
     extend self
 
     def detect(path, duration, width, height)
-      Console.info "Detecting crop with mplayer..."
+      Console.info "Detecting crop with ffmpeg..."
       fail "media duration too short: #{duration} second(s)" if duration < 2
       steps = 10
       interval = duration / (steps + 1)
@@ -29,15 +29,19 @@ module VideoTranscoding
       (1..steps).each do |step|
         begin
           IO.popen([
-            MPlayer.command_name,
-            '-quiet',
-            '-benchmark',
-            '-vo', 'null',
-            '-ao', 'null',
-            '-vf', 'cropdetect=24:2',
-            path,
+            FFmpeg.command_name,
+            '-hide_banner',
+            '-nostdin',
+            '-noaccurate_seek',
             '-ss', (interval * step).to_s,
-            '-frames', '10'
+            '-i', path,
+            '-frames:v', '10',
+            '-filter:v', 'cropdetect=24:2',
+            '-an',
+            '-sn',
+            '-ignore_unknown',
+            '-f', 'null',
+            '-'
           ], :err=>[:child, :out]) do |io|
             io.each do |line|
               seconds = Time.now.tv_sec
@@ -47,7 +51,7 @@ module VideoTranscoding
                 last_seconds = seconds
               end
 
-              if line =~ /^\[CROP\] .* crop=([0-9]+):([0-9]+):([0-9]+):([0-9]+)/
+              if line =~ / crop=([0-9]+):([0-9]+):([0-9]+):([0-9]+)$/
                 d_width, d_height, d_x, d_y = $1.to_i, $2.to_i, $3.to_i, $4.to_i
                 crop_width  = d_width   if crop_width   < d_width
                 crop_height = d_height  if crop_height  < d_height
@@ -100,11 +104,18 @@ module VideoTranscoding
       "#{crop[:top]}:#{crop[:bottom]}:#{crop[:left]}:#{crop[:right]}"
     end
 
-    def mplayer_string(crop, width, height)
+    def player_string(crop, width, height)
       "#{width - (crop[:left] + crop[:right])}:" +
       "#{height - (crop[:top] + crop[:bottom])}:" +
       "#{crop[:left]}:" +
       "#{crop[:top]}"
     end
+
+    def drawbox_string(crop, width, height)
+      "#{crop[:left]}:" +
+      "#{crop[:top]}:" +
+      "#{width - (crop[:left] + crop[:right])}:" +
+      "#{height - (crop[:top] + crop[:bottom])}"
+    end
   end
 end

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.16.0'
+  VERSION = '0.17.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Don Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Video Transcoding is a package of tools to transcode, inspect
@@ -41,7 +41,6 @@ files:
 - lib/video_transcoding/media.rb
 - lib/video_transcoding/mkvpropedit.rb
 - lib/video_transcoding/mp4track.rb
-- lib/video_transcoding/mplayer.rb
 - lib/video_transcoding/tool.rb
 - lib/video_transcoding/version.rb
 - video_transcoding.gemspec

data/lib/video_transcoding/mplayer.rb

@@ -1,28 +0,0 @@
-#
-# mplayer.rb
-#
-# Copyright (c) 2013-2017 Don Melton
-#
-
-module VideoTranscoding
-  module MPlayer
-    extend self
-
-    COMMAND_NAME = 'mplayer'
-
-    def setup
-      Tool.provide(COMMAND_NAME, ['-version']) do |output, _, _|
-        unless output =~ /^MPlayer [^ ]+/
-          Console.debug output
-          fail "#{COMMAND_NAME} version unknown"
-        end
-
-        Console.info "#{$MATCH} found..."
-      end
-    end
-
-    def command_name
-      Tool.use(COMMAND_NAME)
-    end
-  end
-end