video_transcoding 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03bf26235071514e773c623951ccf5363672daaaa6a47e382eb39047632a7535
-  data.tar.gz: 3c1e303d5002e0415a87ef397a17a08e4df547f8c3abcd3d5dd51bb8d4bfe2f4
+  metadata.gz: 18cb27202f7ca6e7c2c06000235622d7f30ab398dc9e7da2d35961a079a11ba0
+  data.tar.gz: fcc91ae647be367d93f9bc7a9ecf317cb7f72e15c7da4880a4c2db48927bb959
 SHA512:
-  metadata.gz: 5a309622bce60b49984c428fe261a19f0a6a43750b1f2e7cecb55f9d2f57d3c01947e45eb43024598ee19c0f1b677169dddfba9743f7b3024caf872204fd58ca
-  data.tar.gz: 98ca7b6d7827bc9361f3f6707f622138019f105eb9f67ab9132de7f218b775245c7b0052cfddc9a6f7a693c374deb56762e4c3d6680c82da64baa0f205a8de4d
+  metadata.gz: cc0c7a36b0e17efd6fb3a18bd9f36a5dd61b4e20fab78a9b46e2a5a317af2c4437db831e39efd74e6ef5a6fbccbf68d673d0dc30f344a625f1d615d445be4581
+  data.tar.gz: 4e32e4f2141b38c31db2a360b8f99149dda65f5942a16096cb64d08585634f86be7dca8bdbf5e46640af755baa58210f2e9d4f92dd30c3d4d4c59f784b1d9339

data/README.md

@@ -676,6 +676,22 @@ For a few problematic videos, I have to apply options like `--force-rate 23.976
 
 ## History
 
+### [0.24.0](https://github.com/donmelton/video_transcoding/releases/tag/0.24.0)
+
+Sunday, February 24, 2019
+
+* Add `--audio-format` and `--keep-ac3-stereo` options to `transcode-video`. Thanks to [@samhutchins](https://github.com/samhutchins) for the idea and design! Via [ #254](https://github.com/donmelton/video_transcoding/issues/254).
+    * With the `--audio-format` option, you can now specify whether AC-3 or AAC is used when surround or stereo output tracks are created.
+    * This allows multichannel 5.1 AAC audio output by adding `--audio-format surround=aac` to your command line. However, you may want to pair that with `--audio-width main=surround` to avoid two AAC tracks of the same input being created.
+    * Think of the `--keep-ac3-stereo` option as a kinder, gentler form of the `--prefer-ac3` option.
+    * It copies rather than transcodes AC-3 stereo or mono audio tracks even when the current stereo format is AAC, but it doesn't affect surround tracks.
+* Deprecate the `--prefer-ac3` option in `transcode-video` and remove its description from the `--help` output. Also via [ #254](https://github.com/donmelton/video_transcoding/issues/254).
+    * The option still works for now, but using it issues a warning message.
+    * You can get the exact same functionality by adding `--audio-width all=surround --audio-format all=ac3` to your command line.
+    * However, you might want to add `--audio-width all=surround --keep-ac3-stereo` instead since you'll get higher quality and slightly smaller output, albeit with some AAC tracks in your output when stereo audio in non-AC-3 format still needs to be transcoded.
+* Add a `minimal` argument to the `--fallback-crop` option in `transcode-video` which determines the smallest possible crop values, when using the`--crop detect` option and argument, by combining results from both `HandBrakeCLI` and `ffmpeg`. Thanks to [@dkoenig01](https://github.com/dkoenig01) for the idea! Via [ #255](https://github.com/donmelton/video_transcoding/issues/255).
+* Relax validation criteria for HandBrake-generated `.log` files in `query-handbrake-log` as workaround for `HandBrakeCLI` spewing linkage failure warnings on certain Linux platforms. Via [ #257](https://github.com/donmelton/video_transcoding/issues/257).
+
 ### [0.23.0](https://github.com/donmelton/video_transcoding/releases/tag/0.23.0)
 
 Sunday, February 10, 2019

data/bin/query-handbrake-log

@@ -137,7 +137,7 @@ HERE
           File.foreach(log) do |line|
             found = true if not found and line =~ /^HandBrake/
             count += 1
-            fail "not a HandBrake-generated `.log` file: #{log}" if count > 5 and not found
+            fail "not a HandBrake-generated `.log` file: #{log}" if count > 10 and not found
             duration_line = line if duration_line.nil? and line =~ /\+ duration: /
             rate_line = line if line =~ /\+ frame rate: /
 

data/bin/transcode-video

@@ -89,8 +89,10 @@ Video options:
                       (use `--crop auto` for `HandBrakeCLI` behavior)
     --constrain-crop
                     constrain `--crop detect` to optimal shape
-    --fallback-crop handbrake|ffmpeg|none
+    --fallback-crop handbrake|ffmpeg|minimal|none
                     select fallback crop values if `--crop detect` fails
+                      (`minimal` uses the smallest possible crop values
+                        combining results from `HandBrakeCLI` and `ffmpeg`)
     --720p          fit video within 1280x720 pixel bounds
     --max-width WIDTH, --max-height HEIGHT
                     fit video within horizontal and/or vertical pixel bounds
@@ -134,9 +136,12 @@ Audio options:
                       (can be used multiple times)
     --reverse-double-order
                     reverse order of `double` width audio output tracks
-    --prefer-ac3    prefer AC-3 over AAC format when encoding or copying audio
-                      even when original track channel layout is stereo or mono
-                      (sets audio output width for all tracks to `surround`)
+    --audio-format surround|stereo|all=ac3|aac
+                    set audio format for specific or all output tracks
+                      (default for surround: ac3; default for stereo: aac)
+    --keep-ac3-stereo
+                    copy rather than transcode AC-3 stereo or mono audio tracks
+                      even when the current stereo format is AAC
     --ac3-encoder ac3|eac3
                     set AC-3 audio encoder (default: ac3)
     --ac3-bitrate 384|448|640|768|1536
@@ -145,7 +150,7 @@ Audio options:
                     set AC-3 audio pass-through bitrate (default: 640)
     --copy-audio TRACK|all
                     try to copy track selected by number in its original format
-                      falling back to AC-3 format if original not allowed
+                      falling back to surround format if original not allowed
                       or try to copy all tracks in same manner
                       (only applies to main and explicitly added audio tracks)
                       (can be used multiple times)
@@ -253,7 +258,9 @@ HERE
       @audio_language             = []
       @audio_width                = {:main => :double, :other => :stereo}
       @reverse_double_order       = false
-      @prefer_ac3                 = false
+      @surround_format            = 'ac3'
+      @stereo_format              = 'aac'
+      @keep_ac3_stereo            = false
       @ac3_encoder                = 'ac3'
       @ac3_bitrate                = 640
       @pass_ac3_bitrate           = 640
@@ -430,7 +437,7 @@ HERE
 
       opts.on '--fallback-crop ARG' do |arg|
         @fallback_crop = case arg
-        when 'handbrake', 'ffmpeg', 'mplayer', 'none'
+        when 'handbrake', 'ffmpeg', 'mplayer', 'minimal', 'none'
           arg.to_sym
         else
           fail UsageError, "invalid fallback crop argument: #{arg}"
@@ -557,10 +564,35 @@ HERE
 
       opts.on('--reverse-double-order') { @reverse_double_order = true }
 
+      opts.on '--audio-format ARG' do |arg|
+        if arg =~ /^(surround|stereo|all)=(ac3|aac)$/
+          case $1
+          when 'surround'
+            @surround_format = $2
+          when 'stereo'
+            @stereo_format = $2
+          else
+            @surround_format = $2
+            @stereo_format = $2
+          end
+        else
+          fail UsageError, "invalid audio format argument: #{arg}"
+        end
+      end
+
+      opts.on '--keep-ac3-stereo' do
+        @keep_ac3_stereo = true
+      end
+
       opts.on '--prefer-ac3' do
-        @prefer_ac3 = true
+        Console.warn '**********'
+        Console.warn 'Using deprecated option: --prefer-ac3'
+        Console.warn "Replace with: --audio-width all=surround --audio-format all=ac3"
+        Console.warn '**********'
         @audio_width[:main] = :surround
         @audio_width[:other] = :surround
+        @surround_format = 'ac3'
+        @stereo_format = 'ac3'
       end
 
       opts.on '--ac3-encoder ARG' do |arg|
@@ -1053,6 +1085,13 @@ HERE
               hb_crop
             when :ffmpeg, :mplayer
               ff_crop
+            when :minimal
+              {
+                :top    => [hb_crop[:top],    ff_crop[:top]].min,
+                :bottom => [hb_crop[:bottom], ff_crop[:bottom]].min,
+                :left   => [hb_crop[:left],   ff_crop[:left]].min,
+                :right  => [hb_crop[:right],  ff_crop[:right]].min
+              }
             when :none
               {:top => 0, :bottom => 0, :left => 0, :right => 0}
             else
@@ -1094,37 +1133,53 @@ HERE
       end
 
       tracks, encoders, bitrates, mixdowns, names = [], [], [], [], []
+      @aac_encoder ||= HandBrake.aac_encoder
+      surround_encoder = @surround_format == 'ac3' ? @ac3_encoder : @aac_encoder
+      stereo_encoder = @stereo_format == 'ac3' ? @ac3_encoder : @aac_encoder
 
       add_surround = ->(info, copy) do
+        has_ac3 = (@ac3_encoder == 'ac3'  and info[:format] == 'AC3') or
+                  (@ac3_encoder == 'eac3' and info[:format] =~ /^(?:E-)?AC3$/)
         bitrate = info[:bps].nil? ? 640 : info[:bps] / 1000
 
-        if  copy or
-            (((@ac3_encoder == 'ac3'  and info[:format] == 'AC3') or
-              (@ac3_encoder == 'eac3' and info[:format] =~ /^(?:E-)?AC3$/)) and
-            bitrate <= @pass_ac3_bitrate)
+        if copy or
+            (@surround_format == 'ac3' and has_ac3 and bitrate <= @pass_ac3_bitrate) or
+            (@surround_format == 'aac' and info[:format] =~ /^AAC/)
           encoders << 'copy'
           bitrates << ''
+          mixdowns << ''
         else
-          encoders << @ac3_encoder
+          encoders << surround_encoder
 
-          if  (@ac3_encoder == 'ac3'  and @ac3_bitrate >= 640) or
-              (@ac3_encoder == 'eac3' and @ac3_bitrate == 1536)
-            bitrates << ''
+          if @surround_format == 'ac3'
+            if  (@ac3_encoder == 'ac3'  and @ac3_bitrate >= 640) or
+                (@ac3_encoder == 'eac3' and @ac3_bitrate == 1536)
+              bitrates << ''
+            else
+              bitrates << @ac3_bitrate.to_s
+            end
+
+            mixdowns << ''
           else
-            bitrates << @ac3_bitrate.to_s
+            bitrates << ''
+            mixdowns << '5point1'
           end
         end
-
-        mixdowns << ''
       end
 
       add_stereo = ->(info, copy) do
-        if copy or (info[:format] =~ /^AAC/ and info[:channels] <= 2.0)
+        has_ac3 = (@ac3_encoder == 'ac3'  and info[:format] == 'AC3') or
+                  (@ac3_encoder == 'eac3' and info[:format] =~ /^(?:E-)?AC3$/)
+
+        if copy or
+            (info[:channels] <= 2.0 and
+              ((@stereo_format == 'aac' and
+                (info[:format] =~ /^AAC/ or (@keep_ac3_stereo and has_ac3))) or
+              (@stereo_format == 'ac3' and has_ac3)))
           encoders << 'copy'
           mixdowns << ''
         else
-          @aac_encoder ||= HandBrake.aac_encoder
-          encoders << @aac_encoder
+          encoders << stereo_encoder
           mixdowns << (info[:channels] > 2.0 ? @mixdown : '')
         end
 
@@ -1162,7 +1217,7 @@ HERE
             add_stereo.call info, copy
           end
         when :surround
-          if @prefer_ac3 or (info[:channels] > 2.0)
+          if (info[:channels] > 2.0)
             add_surround.call info, copy
           else
             add_stereo.call info, copy
@@ -1175,7 +1230,7 @@ HERE
       handbrake_options['audio'] = tracks.join(',')
       encoders = encoders.join(',')
       handbrake_options['aencoder'] = encoders if encoders.gsub(/,/, '') != ''
-      handbrake_options['audio-fallback'] = @ac3_encoder unless @copy_audio.empty?
+      handbrake_options['audio-fallback'] = surround_encoder unless @copy_audio.empty?
       bitrates = bitrates.join(',')
       handbrake_options['ab'] = bitrates if bitrates.gsub(/,/, '') != ''
       mixdowns = mixdowns.join(',')

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.23.0'
+  VERSION = '0.24.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Don Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Video Transcoding is a package of tools to transcode, inspect