video_transcoding 0.23.0 → 0.25.3

data/bin/convert-video

@@ -2,7 +2,7 @@
 #
 # convert-video
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
@@ -436,8 +436,23 @@ HERE
             Process.kill 'INT', io.pid
           end
 
+          buffer = ''
+
           io.each_char do |char|
-            print char
+            if (char.bytes[0] & 0x80) != 0
+              buffer << char
+            else
+              if not buffer.empty?
+                print buffer
+                buffer = ''
+              end
+
+              print char
+            end
+          end
+
+          if not buffer.empty?
+            print buffer
           end
         end
       rescue SystemCallError => e

data/bin/detect-crop

@@ -2,7 +2,7 @@
 #
 # detect-crop
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
@@ -90,8 +90,8 @@ HERE
 
       print_all = ->(crop) do
         puts
-        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}"
+        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}"
         print_transcode.call crop
       end
 

data/bin/query-handbrake-log

@@ -2,7 +2,7 @@
 #
 # query-handbrake-log
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
@@ -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

@@ -2,7 +2,7 @@
 #
 # transcode-video
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
@@ -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,18 +136,21 @@ 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
-                    set AC-3 audio bitrate (default: 640)
+                    set AC-3 surround audio bitrate (default: 640)
     --pass-ac3-bitrate 384|448|640|768|1536
-                    set AC-3 audio pass-through bitrate (default: 640)
+                    set AC-3 surround 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)
@@ -157,8 +162,10 @@ Audio options:
                       (can be used multiple times)
     --aac-encoder NAME
                     use named AAC audio encoder (default: platform dependent)
-    --mixdown dpl2|stereo
-                    set mixdown format for stereo audio tracks (default: dpl2)
+    --mixdown stereo|dpl2
+                    set mixdown for stereo audio output tracks
+                      to regular stereo or Dolby Pro Logic II format
+                      (default: stereo)
     --no-audio      disable all audio output
 
 Subtitle options:
@@ -253,14 +260,16 @@ 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
       @copy_audio                 = []
       @copy_audio_name            = []
       @aac_encoder                = nil
-      @mixdown                    = 'dpl2'
+      @mixdown                    = 'stereo'
       @burn_subtitle              = nil
       @force_subtitle             = nil
       @extra_subtitle             = []
@@ -430,7 +439,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 +566,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|
@@ -620,7 +654,7 @@ HERE
 
       opts.on '--mixdown ARG' do |arg|
         @mixdown = case arg
-        when 'dpl2', 'stereo'
+        when 'stereo', 'dpl2'
           arg
         else
           fail UsageError, "invalid mixdown: #{arg}"
@@ -843,6 +877,7 @@ HERE
       adjust_metadata(handbrake_options['output'])
 
       unless @dry_run
+        puts "Completed: #{handbrake_options['output']}"
         seconds = Time.now.tv_sec - seconds
         hours   = seconds / (60 * 60)
         minutes = (seconds / 60) % 60
@@ -1053,6 +1088,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,41 +1136,78 @@ 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
         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
+            ((@ac3_encoder == 'ac3' and info[:format] == 'AC3') or
+            (@ac3_encoder == 'eac3' and info[:format] =~ /^(?:E-)?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)
+        if copy or
+            (info[:channels] <= 2.0 and
+              ((@stereo_format == 'aac' and info[:format] =~ /^AAC/) or
+              (((@ac3_encoder == 'ac3' and info[:format] == 'AC3') or
+              (@ac3_encoder == 'eac3' and info[:format] =~ /^(?:E-)?AC3$/)) and
+              (@keep_ac3_stereo or @stereo_format == 'ac3'))))
           encoders << 'copy'
+          bitrates << ''
           mixdowns << ''
         else
-          @aac_encoder ||= HandBrake.aac_encoder
-          encoders << @aac_encoder
+          encoders << stereo_encoder
+
+          if stereo_encoder == 'eac3'
+            if @ac3_bitrate == 1536
+              bitrates << ''
+            else
+              if (info[:channels] > 1.0)
+                if @ac3_bitrate == 768
+                  bitrates << '384'
+                else
+                  bitrates << '224'
+                end
+              else
+                if @ac3_bitrate == 768
+                  bitrates << '192'
+                else
+                  bitrates << '96'
+                end
+              end
+            end
+          else
+            bitrates << ''
+          end
+
           mixdowns << (info[:channels] > 2.0 ? @mixdown : '')
         end
-
-        bitrates << ''
       end
 
       track_order.each do |track|
@@ -1138,6 +1217,7 @@ HERE
 
         if @copy_audio_name.first == :all or @copy_audio_name.include? track
           name = info.fetch(:name, '')
+          name ||= ''
         else
           name = ''
         end
@@ -1162,7 +1242,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 +1255,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(',')
@@ -1336,10 +1416,26 @@ HERE
             Process.kill 'INT', io.pid
           end
 
+          buffer = ''
+
           io.each_char do |char|
-            print char
+            if (char.bytes[0] & 0x80) != 0
+              buffer << char
+            else
+              if not buffer.empty?
+                print buffer
+                buffer = ''
+              end
+
+              print char
+            end
+
             log_file.print char unless log_file.nil?
           end
+
+          if not buffer.empty?
+            print buffer
+          end
         end
       rescue SystemCallError => e
         raise "transcoding failed: #{e}"

data/lib/video_transcoding.rb

@@ -1,7 +1,7 @@
 #
 # video_transcoding.rb
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 require 'English'

data/lib/video_transcoding/cli.rb

@@ -1,7 +1,7 @@
 #
 # cli.rb
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 require 'optparse'

data/lib/video_transcoding/console.rb

@@ -1,7 +1,7 @@
 #
 # console.rb
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 module VideoTranscoding

data/lib/video_transcoding/copyright.rb

@@ -1,9 +1,9 @@
 #
 # copyright.rb
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 module VideoTranscoding
-  COPYRIGHT = 'Copyright (c) 2013-2019 Don Melton'
+  COPYRIGHT = 'Copyright (c) 2013-2020 Don Melton'
 end

data/lib/video_transcoding/crop.rb

@@ -1,7 +1,7 @@
 #
 # crop.rb
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 module VideoTranscoding

data/lib/video_transcoding/errors.rb

@@ -1,7 +1,7 @@
 #
 # errors.rb
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 module VideoTranscoding

data/lib/video_transcoding/ffmpeg.rb

@@ -1,7 +1,7 @@
 #
 # ffmpeg.rb
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 module VideoTranscoding

data/lib/video_transcoding/handbrake.rb

@@ -1,7 +1,7 @@
 #
 # handbrake.rb
 #
-# Copyright (c) 2013-2019 Don Melton
+# Copyright (c) 2013-2020 Don Melton
 #
 
 module VideoTranscoding