video_transcoding 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e3606bdc98fafac3af50e6871e4c8c1f0852e58
-  data.tar.gz: e6db68299ae0058840579164d9cc53dd3f14e38c
+  metadata.gz: 63037b3fd63e5ef4cdf280232731e3872fd3b7da
+  data.tar.gz: 7d77a2257c90eaadfb4b8ef065bb57c977dee954
 SHA512:
-  metadata.gz: 6625c65ce512c52d2e8891e6fe4aa95295f3ca421174e8de2f29abd63b85548cd0a62adb62b3deaa55d6145fdf24e8c0749b63c244efdcbb98384a14c7051fb7
-  data.tar.gz: c6c84e5819aa65257b32728005c57bec07b8269f0832a37a14f839bec1570c82b096d1fe2e08bf5f73d5888852729dca5bde1347e47b193d8caf80ba2d220e88
+  metadata.gz: a949a564de75773a2b5a30f54b1bc388ad8065f46fe2b57ac24370644a58f44ac7a3a88e0ff5bf68920a274069ce575a57c9a71553910b121c96a2695b499819
+  data.tar.gz: 456fe2f3cef7e8cff23458348fd4f1292272682732ac6a636114e52fd33203fb766111f8c39b602db5b670e15d0aa6e1288fad1513c037b71f75612351d35072

data/README.md

@@ -6,7 +6,7 @@ Tools to transcode, inspect and convert videos.
 
 Hi, I'm [Don Melton](http://donmelton.com/). I created these tools to transcode my collection of Blu-ray Discs and DVDs into a smaller, more portable format while remaining high enough quality to be mistaken for the originals.
 
-What makes these tools unique is the special rate control system which achieves those goals.
+What makes these tools unique is the special ratecontrol system which achieves those goals.
 
 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.
 
@@ -31,13 +31,15 @@ Even if you don't try any of my tools, you may find this "README" document helpf
 * [Rationale](#rationale)
 * [Usage](#usage)
 * [Guide](#guide)
+* [FAQ](#faq)
+* [History](#history)
 * [Feedback](#feedback)
 * [Acknowledgements](#acknowledgements)
 * [License](#license)
 
 ## Installation
 
-My Video Transcoding tools are designed to work on OS X, Linux and Windows. They're packaged as a Gem and require Ruby version 2.0 or later. See "[Installing Ruby](https://www.ruby-lang.org/en/documentation/installation/)" if don't have the proper version on your platform.
+My Video Transcoding tools are designed to work on OS X, Linux and Windows. They're packaged as a Gem and require Ruby version 2.0 or later. See "[Installing Ruby](https://www.ruby-lang.org/en/documentation/installation/)" if you don't have the proper version on your platform.
 
 Use this command to install the package: 
 
@@ -47,6 +49,12 @@ You may need to prefix that command with `sudo` in some environments:
 
     sudo gem install video_transcoding
 
+### Updating
+
+Use this command, or the variation prefixed with `sudo`, to update the package:
+
+    gem update video_transcoding
+
 ### Requirements
 
 Most of the tools in this package require other software to function properly, specifically these command line programs:
@@ -73,7 +81,7 @@ On OS X, the other dependencies can be easily installed via [Homebrew](http://br
 
     brew cask install handbrakecli
 
-On Linux, package management systems vary so it's best consult the indexes for those systems.
+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.
 
 On Windows, it's best to search the Web for the appropriate binary or add-on package manager. The [VideoHelp](http://www.videohelp.com) and [Cygwin](https://cygwin.com/) sites are a good place to start.
 
@@ -89,7 +97,7 @@ HandBrake is a powerful video transcoding tool but it's complicated to configure
 
 HandBrake's "AppleTV 3" preset is closest to what I want but transcoding "[Planet Terror (2007)](http://www.blu-ray.com/movies/Planet-Terror-Blu-ray/1248/)" with it results in a huge video bitrate of 19.9 Mbps, very near the original of 22.9 Mbps. And transcoding "[The Girl with the Dragon Tattoo (2011)](http://www.blu-ray.com/movies/The-Girl-with-the-Dragon-Tattoo-Blu-ray/35744/)," while much smaller in output size, lacks detail compared to the original.
 
-So, the `transcode-video` tool configures the [x264 video encoder](http://www.videolan.org/developers/x264.html) within HandBrake to use a [constrained variable bitrate (CVBR)](https://en.wikipedia.org/wiki/Variable_bitrate) mode, and to automatically target bitrates appropriate for different input resolutions.
+So, the `transcode-video` tool configures the [x264 video encoder](http://www.videolan.org/developers/x264.html) within HandBrake to use a modified [constrained variable bitrate (CVBR)](https://en.wikipedia.org/wiki/Variable_bitrate) mode, and to automatically target bitrates appropriate for different input resolutions.
 
 Input resolution | Target video bitrate
 --- | ---
@@ -344,6 +352,26 @@ Which prints out something like this:
 
 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:
+
+    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'
+
+    transcode-video --crop 132:132:0:0 '/path/to/Movie.mkv'
+
+    # From mplayer:
+
+    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'
+
+    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.
 
 Be aware that the algorithm to determine optimal shape always crops from the top and bottom or from the left and right, never from both axes.
@@ -437,9 +465,9 @@ I have four rules when preparing my own media for transcoding:
 
 * [DTS-HD Master Audio](https://en.wikipedia.org/wiki/DTS-HD_Master_Audio) is the most popular high definition, lossless audio format. It's used on more than 80% of all Blu-ray Discs.
 
-* HandBrake, FFmpeg, MPlayer and other Open Source software can't decode the lossless portion of a DTS-HD audio track. They're only able to extract the non-HD, lossy core which is in [DTS format](https://en.wikipedia.org/wiki/DTS_(sound_system)).
+* Currently, HandBrake can't decode the lossless portion of a DTS-HD audio track. It's only able to extract the non-HD, lossy core which is in [DTS format](https://en.wikipedia.org/wiki/DTS_(sound_system)).
 
-* But MakeMKV can [decode DTS-HD with some help from additional software](http://www.makemkv.com/dtshd/) and convert it into FLAC format which can then be decoded by HandBrake and most other software. Once again, MakeMKV can only do this when it converts the video into a single `.mkv` file.
+* But MakeMKV can decode DTS-HD and convert it into FLAC format which can then be decoded by HandBrake and most other software. Once again, MakeMKV can only do this when it converts the video into a single `.mkv` file.
 
 ### Understanding the x264 preset system
 
@@ -555,6 +583,245 @@ The path is first deleted from the `queue.txt` file and then passed as an argume
 
 These examples are written in Bash and only supply crop values. But almost any scripting language can be used and any option can be changed on a per input basis.
 
+## FAQ
+
+### Should I worry about all these `VBV underflow` warnings?
+
+No, these warnings are simply a side effect of my special ratecontrol system. The x264 video encoder within HandBrake is just being overly chatty. Ignore it. Nothing is wrong with the output from `transcode-video`.
+
+### Can you make a GUI version of your tools?
+
+My command line tools have the same behavior and scriptable interface across multiple platforms. Developing a GUI application with those requirements is not an investment that I want to make.
+
+Plus, I wouldn't use a GUI for these tasks. And it's a bad idea to develop software that you won't use yourself.
+
+### When will you add support for H.265 video?
+
+[High Efficiency Video Coding](https://en.wikipedia.org/wiki/High_Efficiency_Video_Coding) or H.265  is the likely successor to [H.264](https://en.wikipedia.org/wiki/H.264/MPEG-4_AVC), which is the format currently output by `transcode-video`. HandBrake has supported H.265 ever since it included the [x265 video encoder](http://x265.org/).
+
+While the x265 encoder can produce the same quality as the x264 encoder at a lower bitrate, it's considerably slower. So slow, in fact, as to not be practical for home transcoding.
+
+More importantly, my default ratecontrol system can't be applied with the x265 encoder. That's because x265 doesn't allow access to `qpmax`, critical for maintaining quality in certain situations. There's a [bug open on x265](https://bitbucket.org/multicoreware/x265/issues/232/add-option-to-specify-qpmax) about this now. When that's fixed, I'll consider adding support.
+
+### What about hardware-based video transcoding?
+
+Using hardware with [Intel Quick Sync Video](https://en.wikipedia.org/wiki/Intel_Quick_Sync_Video) instead of software like x264 is certainly faster. HandBrake even supports that hardware on some platforms. However, my default ratecontrol system can't be applied to existing hardware encoders because they lack API to change the necessary settings.
+
+Also, keep in mind that hardware encoders are typically designed for realtime video chat or other similar duties. To maintain that performance, they often take shortcuts with video quality like reducing reference frames, lowering subpixel motion estimation, etc. Such an approach is the equivalent of using the `veryfast` preset with a software encoder. That's fine for video chat but I wouldn't recommend it for transcoding your disc collection.
+
+### Can you add support for Enhanced AC-3 audio?
+
+[Dolby Digital Plus](https://en.wikipedia.org/wiki/Dolby_Digital_Plus) or Enhanced AC-3 is a successor to the Dolby Digital AC-3 audio format. AC-3 is the format currently output by `transcode-video` when surround audio is used as input. As of this writing, HandBrake only supports Enhanced AC-3 in development builds.
+
+The original AC-3 format is limited to 5.1 audio channels. This means that any 7.1 channel audio track, typically available on Blu-ray Discs, needs to be downmixed during transcoding. The advantage to Enhanced AC-3 is that it can support up to 13.1 audio channels, so no downmixing is necessary.
+
+I'll consider adding support once Enhanced AC-3 is available in an official HandBrake release.
+
+### How do you assess video transcoding quality?
+
+I compare by visual inspection. Always with the video in motion, never frame by frame. It's tedious but after years of practice I know which portions of which videos are problematic and difficult to transcode. And I look at those first.
+
+In addition, I use the `query-handbrake-log` tool to report on `ratefactor`, the average P-frame quantizer, to get a relative quality assessment from the x264 encoder.
+
+What I don't use are [peak signal-to-noise ratios](https://en.wikipedia.org/wiki/Peak_signal-to-noise_ratio) or a [structural similarity index](https://en.wikipedia.org/wiki/Structural_similarity) in an attempt to objectively compare quality. Although both metrics are available to the x264 encoder, enabling either of them ironically disables key psychovisual optimizations that improve quality.
+
+### What options do you use with `transcode-video`?
+
+I use the default settings. That's why they're the defaults.
+
+Of course, I apply crop values as necessary. And I let `transcode-video` automatically burn any forced subtitles into the output video track when the "forced" flag is enabled in the original.
+
+I never include separate subtitle tracks, but I do add audio commentary tracks.
+
+For a few problematic videos, I have to apply options like `--force-rate 23.976 --filter detelecine`. But that's rare.
+
+## History
+
+### 0.8.0
+
+Sunday, April 24, 2016
+
+* Add a `--no-constrain-crop` option to `transcode-video`. This changes the behavior of `--crop detect` to mimic the `--no-constrain` option in the `detect-crop` tool.
+* Add a `--fallback-crop` option to `transcode-video`. This selects fallback crop values, from HandBrake, MPlayer or no crop at all, if `--crop detect` fails. This makes the new `--no-constrain-crop` option more useful since failure is more likely without constraints. Via #56 from @cameronks.
+* Add a `--aac-encoder` option to `transcode-video`. This gives Windows and Linux users access to the Fraunhofer FDK AAC encoder if it's compiled into their version of `HandBrakeCLI`. Via #35 from @cnrd.
+* Allow a colon (":") instead of a just period (".") to separate the two numerical components of a stream identifier when parsing scan output from `HandBrakeCLI`. This ensures compatibility with different versions of libavcodec and should fix several mysterious bugs on some Linux configurations. Via #30 and #41 from @dgibbs64.
+* Maintain 480p video bitrate targets in `transcode-video` when scaling down to 480p using `--max-width 854 --max-height 480`. Via #58 from @mschout.
+* Remove the deprecated `--old-behavior` option in `transcode-video`.
+* Clarify the purpose of `--abr` and `--vbr` in the `--help` output of `transcode-video`.
+* Update the "README" document to:
+    * Add "FAQ" section. Via #26 from @reiesu and #59 from @dgibbs64.
+    * Add this "History" section.
+    * Spell "rate control" as one word, like a real transcoding geek.
+    * Insert a missing "you" in the first paragraph of the "Installation" section.
+    * Mention and link to Linuxbrew in the "Requirements" section.
+    * Describe the default ratecontrol system as a "modified constrained variable bitrate (CVBR) mode."
+    * Add example output when HandBrake and MPlayer disagree to the "Using `detect-crop`" section. Via #18 from @alanwsmith.
+    * Update the status of DTS-HD decoding for HandBrake and MakeMKV in the "Why convert lossless audio?" section.
+
+### 0.7.0
+
+Thursday, April 7, 2016
+
+* Once again, lower the video bitrate targets for 480p and 720p output in `transcode-video`. Note that 1080p and 2160p targets still remain unchanged.
+* Update the "README" document to:
+    * Reflect changes to the 480p and 720p video bitrate targets.
+    * Revise description of and recommendation for the `--quick` option.
+    * Revise warnings about using slower x264 presets.
+* Add a `--target` option to `transcode-video` allowing explicit control of the video bitrate target.
+* Deprecate the `--old-behavior` option in `transcode-video`.
+* Remove the deprecated `--big` option in `transcode-video`.
+* Separate `--small` and `--small-video` in the `--help` output of `transcode-video`.
+
+### 0.6.0
+
+Sunday, April 3, 2016
+
+* Revise the default ratecontrol system and video bitrate targets in `transcode-video`:
+    * Raise the quality target by lowering the constant ratefactor (CRF) from `16` to `1`, the lowest lossy CRF value available with the x264 video encoder. This significantly improves video quality but also raises bitrates much closer to the targets, thereby increasing output file sizes for some inputs.
+    * Raise the quality limit by setting `qpmax`, the x264 quantizer maximum, to `34`. This prevents x264 from occasionally generating a single, but still noticeable, very low quality frame because the CRF value is set so low.
+    * Lower the video bitrate targets for 480p and 720p output to keep bitrates and file sizes closer to that produced by the old ratecontrol system. Note that 1080p and 2160p targets remain unchanged.
+    * Add an `--old-behavior` option to restore the old ratecontrol system and video bitrate targets for users not yet wanting to change over. This option is only temporary and will soon be deprecated and then removed.
+    * Update the "README" document to reflect changes to the 480p and 720p video bitrate targets.
+* Remove an obsolete `brew install caskroom/cask/brew-cask` line from the "README" document. Via #54 from @timsutton.
+
+### 0.5.1
+
+Thursday, February 25, 2016
+
+* Don't fail if the `ffmpeg` version string can't be parsed. Via #43 from @rementis, @Lambdafive and @kford.
+* Remove the deprecated `--cvbr` option in `transcode-video`.
+
+### 0.5.0
+
+Thursday, January 14, 2016
+
+* Raise the default video bitrate targets and AC-3 audio bitrate limits in `transcode-video`:
+    * Deprecate the `--big` option since its behavior is now the default. An informal survey via Twitter and Facebook showed that about 90% of users (including myself) responding were always using the `--big` option anyway to get higher quality.
+    * Add a `--small` option to restore the old video bitrate targets and AC-3 audio bitrate limits.
+    * Add a `--small-video` option to restore only the old video bitrate targets. Via Facebook from @DaveHamilton.
+    * Update the "README" document to reflect all these changes.
+* Move `--abr` and `--vbr` to the advanced options section in the `--help` output of `transcode-video`.
+* Deprecate the experimental `--cvbr` option in `transcode-video`.
+
+### 0.4.0
+
+Monday, January 1, 2016
+
+* Add a `--cvbr` option to `transcode-video`. This implements a very experimental variation of the default ratecontrol system with a target bitrate as its single argument. Use it for evaluation purposes only.
+
+### 0.3.1
+
+Friday, January 8, 2016
+
+* Fix compatibility with development/nightly builds of `HandBrakeCL` in `transcode-video`:
+    * Always force the x264 `medium` preset to override the new `veryfast` default value. Via #36 from @cnrd.
+    * Explicitly set the encoder profile to `high` to override the new `main` default value.
+    * Explicitly (and dynamically) set the encoder level to override the new `4.0` default value. 
+* Fix a stupid regression from version 0.2.8 caused by a typo in the patch for the SubRip-format text file offset fix to `transcode-video`. Via #37 from @bpharriss.
+* Be more lenient about `--encoder-option` arguments in `transcode-video` so `8x8dct` is allowed.
+* Always print the `HandBrakeCLI` version string to diagnostic output even if it can't be parsed.
+
+### 0.3.0
+
+Tuesday, January 5, 2016
+
+* Add a `--abr` option to `transcode-video`. This implements a modified average bitrate (ABR) ratecontrol system with a target bitrate as its single argument. It produces a much more predictable output size but lower quality than the default ratecontrol system. It can sometimes be handy but use it with caution.
+* Add a `--vbr` option to `transcode-video`. This implements a true VBR ratecontrol system with a constant ratefactor as its single argument, much like HandBrake's default behavior when using its `--quality` option. It's useful mostly for comparison testing against the default ratecontrol system.
+* Update all copyright notices to the year 2016.
+
+### 0.2.8
+
+Tuesday, January 5, 2016
+
+* Prevent the `--bind-srt-language` option in `transcode-video` from also setting the SubRip-format text file offset to the same value. This was a stupid copy and paste error since the initial project version. Via #25 from @arikalish.
+* Don't fail if the `HandBrakeCLI` version string can't be parsed. Via #29 from @paulbailey.
+* Don't fail if the `mp4track` version string can't be parsed. Via #27 from @dgibbs64.
+* Add a missing preposition to the last bullet point of the "Why MakeMKV?" section in the "README" document. Via #32 from @eventualbuddha.
+
+### 0.2.7
+
+Tuesday, July 7, 2015
+
+* Apply the `--subtitle-forced` option when scanning subtitles in `transcode-video`. Via #20 from @rhapsodians.
+
+### 0.2.6
+
+Wednesday, May 20, 2015
+
+* Prevent the user's file format choice from corrupting the output path in `transcode-video` and `convert-video`. Via #5 from @arikalish.
+
+### 0.2.5
+
+Sunday, May 17, 2015
+
+* Simplify the calculation of `vbv-bufsize` in `transcode-video`.
+
+### 0.2.4
+
+Friday, May 15, 2015
+
+* Prevent an undefined method error if `HandBrakeCLI` removes tracks during scan. Via #15 from @blackoctopus.
+
+### 0.2.3
+
+Tuesday, May 12, 2015
+
+* No longer fail on invalid audio and subtitle track information when parsing scan output from `HandBrakeCLI`. Via #11 from @eltito51 and #13 from @tchjunky.
+
+### 0.2.2
+
+Monday, May 11, 2015
+
+* Ensure the AC-3 passthru bitrate in `transcode-video` is never below the AC-3 encoding bitrate.
+
+### 0.2.1
+
+Sunday, May 10, 2015
+
+* Fix the `--main-audio` option in `transcode-video` by ensuring the `resolve_main_audio` method actually returns a result. Via #9 from @JMoVS.
+
+### 0.2.0
+
+Saturday, May 9, 2015
+
+* Rewrite the automatic frame rate and deinterlace logic in `transcode-video` to match the behavior of the old `transcode-video.sh` script on which the tool is based.
+* Clarify in `--help` output that `transcode-video` audio copy policies only apply to main and explicitly added audio tracks.
+* Ignore the sometimes missing patch version when checking MPlayer.
+* Mention in the "README" document that custom track names and external subtitle file names are allowed to contain commas.
+
+### 0.1.4
+
+Friday, May 8, 2015
+
+* Fix a stupid regression from version 0.1.2 caused by the line endings fix on Windows. Via #7 from @brandonedling.
+
+### 0.1.3
+
+Friday, May 8, 2015
+
+* Check the extra version number for MPlayer to accept all builds. Via #6 from @CallumKerrEdwards.
+
+### 0.1.2
+
+Thursday, May 7, 2015
+
+* Fix handling of DOS-style line endings when parsing scan output from `HandBrakeCLI` on Windows. Via #4 from @CallumKerrEdwards and @commandtab.
+* Disable automatic subtitle burning in `transcode-video` when input is MP4 format.
+* Clarify usage of `--copy-audio` option in the "README" document.
+* Fix some section links in the "README" document. Via #3 from @vitorgalvao.
+
+### 0.1.1
+
+Wednesday, May 6, 2015
+
+* Add a workaround in the `Media` class `initialize` method for no required keyword arguments in Ruby 2.0. Via #1 from @cadonau and #2 from @CallumKerrEdwards.
+
+### 0.1.0
+
+Tuesday, May 5, 2015
+
+* Initial project version.
+
 ## Feedback
 
 The best way to send feedback is mentioning me, [@donmelton](https://twitter.com/donmelton), on Twitter. You can also file bugs or ask questions in a longer form by [creating a new issue](https://github.com/donmelton/video_transcoding/issues) on GitHub. I always try to respond quickly but sometimes it may take as long as 24 hours.

data/bin/transcode-video

@@ -69,6 +69,10 @@ Video options:
     --crop T:B:L:R  set video crop values (default: 0:0:0:0)
                       (use `--crop detect` for optimal crop values)
                       (use `--crop auto` for `HandBrakeCLI` behavior)
+    --no-constrain-crop
+                    don't constrain `--crop detect` to optimal shape
+    --fallback-crop handbrake|mplayer|none
+                    select fallback crop values if `--crop detect` fails
     --720p          fit video within 1280x720 pixel bounds
     --max-width WIDTH, --max-height HEIGHT
                     fit video within horizontal and/or vertical pixel bounds
@@ -127,6 +131,8 @@ Audio options:
                       or try to copy all track names in same manner
                       (only applies to main and explicitly added audio tracks)
                       (can be used multiple times)
+    --aac-encoder NAME
+                    use named AAC audio encoder (default: platform dependent)
     --no-audio      disable all audio output
 
 Subtitle options:
@@ -169,7 +175,9 @@ External subtitle options:
 
 Advanced options:
     --abr BITRATE   use modified ABR ratecontrol at average video bitrate
+                      (more predictable size but lower quality than default)
     --vbr QUALITY   use true VBR ratecontrol at constant video quality (0-51)
+                      (unpredictable size but useful for comparison to default)
 -E, --encoder-option NAME=VALUE|_NAME
                     pass x264 video encoder option by name with value
                       or disable use of option by prefixing name with "_"
@@ -212,6 +220,8 @@ HERE
       @vbv_maxrate_480p           = 2000
       @quick                      = false
       @crop                       = {:top => 0, :bottom => 0, :left => 0, :right => 0}
+      @constrain_crop             = true
+      @fallback_crop              = nil
       @target_bitrate             = nil
       @main_audio                 = nil
       @extra_audio                = []
@@ -222,6 +232,7 @@ HERE
       @pass_ac3_bitrate           = 640
       @copy_audio                 = []
       @copy_audio_name            = []
+      @aac_encoder                = nil
       @burn_subtitle              = nil
       @force_subtitle             = nil
       @extra_subtitle             = []
@@ -233,7 +244,6 @@ HERE
       @srt_language               = {}
       @srt_encoding               = {}
       @srt_offset                 = {}
-      @old_behavior               = false
       @abr_bitrate                = nil
       @vbr_quality                = nil
       @encoder_options            = {}
@@ -293,8 +303,8 @@ HERE
       opts.on '--small' do
         @vbv_maxrate_2160p  = 10000
         @vbv_maxrate_1080p  = 5000
-        @vbv_maxrate_720p   = @old_behavior ? 4000 : 3000
-        @vbv_maxrate_480p   = @old_behavior ? 2000 : 1600
+        @vbv_maxrate_720p   = 3000
+        @vbv_maxrate_480p   = 1600
         @ac3_bitrate        = 384
         @pass_ac3_bitrate   = 448
       end
@@ -302,8 +312,8 @@ HERE
       opts.on '--small-video' do
         @vbv_maxrate_2160p  = 10000
         @vbv_maxrate_1080p  = 5000
-        @vbv_maxrate_720p   = @old_behavior ? 4000 : 3000
-        @vbv_maxrate_480p   = @old_behavior ? 2000 : 1600
+        @vbv_maxrate_720p   = 3000
+        @vbv_maxrate_480p   = 1600
       end
 
       opts.on '--quick' do
@@ -336,6 +346,19 @@ HERE
         end
       end
 
+      opts.on '--no-constrain-crop' do
+        @constrain_crop = false
+      end
+
+      opts.on '--fallback-crop ARG' do |arg|
+        @fallback_crop = case arg
+        when 'handbrake', 'mplayer', 'none'
+          arg.to_sym
+        else
+          fail UsageError, "invalid fallback crop argument: #{arg}"
+        end
+      end
+
       opts.on '--720p' do
         force_handbrake_option 'maxWidth', '1280'
         force_handbrake_option 'maxHeight', '720'
@@ -491,6 +514,14 @@ HERE
         end
       end
 
+      opts.on '--aac-encoder ARG' do |arg|
+        if arg =~/_aac$/
+          @aac_encoder = arg
+        else
+          fail UsageError, "invalid aac encoder argument: #{arg}"
+        end
+      end
+
       opts.on('--no-audio')           { force_handbrake_option 'audio', 'none' }
 
       opts.on '--burn-subtitle ARG' do |arg|
@@ -608,15 +639,6 @@ HERE
         @srt_offset[@srt_file.size - 1] = arg
       end
 
-      opts.on '--old-behavior' do
-        Console.warn 'Using deprecated option: --old-behavior'
-        @old_behavior = true
-        @vbv_maxrate_720p = 6000
-        @vbv_maxrate_480p = 3000
-        @abr_bitrate = nil
-        @vbr_quality = nil
-      end
-
       opts.on '--abr ARG', Integer do |arg|
         @abr_bitrate = arg
         @vbr_quality = nil
@@ -800,7 +822,7 @@ HERE
       elsif width > 1280 or height > 720
         handbrake_options['encoder-level'] = '4.0'
         vbv_maxrate = @vbv_maxrate_1080p
-      elsif width > 720 or height > 576
+      elsif width * height > 720 * 576
         handbrake_options['encoder-level'] = '3.1'
         vbv_maxrate = @vbv_maxrate_720p
       else
@@ -816,7 +838,7 @@ HERE
           handbrake_options['encoder-level'] = 'auto'
         end
 
-        handbrake_options['quality'] = @old_behavior ? '16' : '1'
+        handbrake_options['quality'] = '1'
 
         if @target_bitrate.nil?
           unless media.info[:directory]
@@ -845,7 +867,7 @@ HERE
         encoder_options['vbv-maxrate']  = vbv_maxrate.to_s
         encoder_options['vbv-bufsize']  = (@encoder_options.fetch('vbv-maxrate', vbv_maxrate).to_i / 2).to_s
         encoder_options['crf-max']      = '25'
-        encoder_options['qpmax']        = '34' unless @old_behavior
+        encoder_options['qpmax']        = '34'
       else
         unless @abr_bitrate.nil?
           handbrake_options['vb'] = @abr_bitrate.to_s
@@ -892,21 +914,32 @@ HERE
     def resolve_crop(media)
       if @crop == :detect
         width, height = media.info[:width], media.info[:height]
-        hb_crop = Crop.constrain(media.info[:autocrop], width, height)
+        hb_crop = media.info[:autocrop]
+        hb_crop = Crop.constrain(hb_crop, width, height) if @constrain_crop
+        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)
+          mp_crop = Crop.constrain(mp_crop, width, height) if @constrain_crop
 
           if hb_crop != mp_crop
-            Console.error 'Results differ...'
-            Console.error "From HandBrakeCLI: #{Crop.handbrake_string(hb_crop)}"
-            Console.error "From mplayer:      #{Crop.handbrake_string(mp_crop)}"
-            fail "crop detection failed: #{media.path}"
+            crop = case @fallback_crop
+            when :handbrake
+              hb_crop
+            when :mplayer
+              mp_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)}"
+              fail "crop detection failed: #{media.path}"
+            end
           end
         end
 
-        hb_crop
+        crop
       elsif @crop == :auto
         nil
       else
@@ -958,7 +991,8 @@ HERE
         if copy or (info[:format] == 'AAC' and info[:channels] <= 2.0)
           encoders << 'copy'
         else
-          encoders << HandBrake.aac_encoder
+          @aac_encoder ||= HandBrake.aac_encoder
+          encoders << @aac_encoder
         end
 
         bitrates << ''

data/lib/video_transcoding/media.rb

@@ -135,7 +135,7 @@ module VideoTranscoding
       subtitle_track  = 0
 
       @scan.each_line do |line|
-        if line =~ /[ ]+Stream #0\.([0-9]+)[^ ]*: (Video|Audio|Subtitle): (.*)/
+        if line =~ /[ ]+Stream #0[.:]([0-9]+)[^ ]*: (Video|Audio|Subtitle): (.*)/
           stream      = $1.to_i
           type        = $2
           attributes  = $3
@@ -164,7 +164,7 @@ module VideoTranscoding
                 track_info[:default] = false
               end
 
-              if @scan =~ /[ ]+Stream #0\.#{stream}[^ ]*: Audio: [^\n]+\n[ ]+Metadata:\r?\n^[ ]+title[ ]+: ([^\r\n]+)/m
+              if @scan =~ /[ ]+Stream #0[.:]#{stream}[^ ]*: Audio: [^\n]+\n[ ]+Metadata:\r?\n^[ ]+title[ ]+: ([^\r\n]+)/m
                 track_info[:name] = $1
               else
                 track_info[:name] = nil
@@ -189,7 +189,7 @@ module VideoTranscoding
                 track_info[:forced] = false
               end
 
-              if @scan =~ /[ ]+Stream #0\.#{stream}[^ ]*: Subtitle: [^\n]+\n[ ]+Metadata:\r?\n^[ ]+title[ ]+: ([^\r\n]+)/m
+              if @scan =~ /[ ]+Stream #0[.:]#{stream}[^ ]*: Subtitle: [^\n]+\n[ ]+Metadata:\r?\n^[ ]+title[ ]+: ([^\r\n]+)/m
                 track_info[:name] = $1
               else
                 track_info[:name] = nil

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Don Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Video Transcoding is a package of tools to transcode, inspect