video_transcoding 0.17.4 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5aa56f69211e30de197ee43f747cf2ea114f65e
-  data.tar.gz: 2f946e55ba82a92b2fe07192212e65215cb45bad
+  metadata.gz: 104584864a42079faafac8620a1f5ab6d54e13ea
+  data.tar.gz: d48bf0e8b305c1aa6d7adb448bf956d33c853d67
 SHA512:
-  metadata.gz: 4d53c980877d8a9158a2b7fac7f7266ee7456b28456893a88f4048ee7dfa0c600d6cf752fd95f25933331a1d4df90bc13dd1158a0dfc759839a7bdd9cc29a01f
-  data.tar.gz: 5252ee36d67adb2be542c0de66065e977526199d515670f635615b0930ad9f4eecfb15f2fd0fe1d85032e00ab0b7aba0e5f66fcb269b917d5975e9b605b18aa3
+  metadata.gz: 8aea1ce8b0cb5d02d3294ad90f89a3c5c9db0477c643a41158b051e6da7220cf91873bb3ae5932895e03caeba3013cb040d1d9e51a280c070dc3c2f674874a04
+  data.tar.gz: e397fcab87c71bf434d5abf04db8428f28912f5be0c9347393c4d9dbbeac1b60e74087996ef8481d34f5632ff04ea0c8e2294e420b4dcfa1040c2fc5b145fac2

data/README.md

@@ -551,7 +551,9 @@ The transcoding process is started by executing the script:
 
 The path is first deleted from the `queue.txt` file and then passed as an argument to the `transcode-video.` tool. To pause after `transcode-video` returns, simply insert a blank line at the top of the `queue.txt` file.
 
-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.
+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. [Nick Wronski](https://github.com/nwronski) has written a batch-processing wrapper for `transcode-video` in [Node.js](https://nodejs.org/), available here:
+
+<https://github.com/nwronski/batch-transcode-video>
 
 ## Explanation
 
@@ -570,9 +572,7 @@ These are actually the settings used by my special ratecontrol system to configu
 
 My system attempts to produce the highest possible video quality near a target bitrate. That target is automatically determined by `transcode-video` using the resolution of the input. For example, the default target for 1080p output is `6000` Kbps, which is about one-fifth the video bitrate found on a typical Blu-ray Disc.
 
-The average bitrate (ABR) mode in x264 is normally used to target a specific bitrate. But the ABR algorithm often sacrifices quality in order to maintain that bitrate. Getting acceptable quality with ABR requires multiple passes through the input, a process too slow for many people. And even multiple-pass ABR won't provide sufficient quality for some 1080p video input when bitrate targets are as low as `6000` Kbps.
-
-Instead, I leverage the constant quality ratecontrol system in x264. This algorithm uses a constant ratefactor (CRF) to target a specific quality instead of a bitrate. A CRF is represented by a number from `0` to `51` with lower values indicating higher quality. The special value of `0` is for lossless output.
+The average bitrate (ABR) mode in x264 is normally used to target a specific bitrate. Instead, I leverage the constant quality ratecontrol system in x264. This algorithm uses a constant ratefactor (CRF) to target a specific quality instead of a bitrate. A CRF is represented by a number from `0` to `51` with lower values indicating higher quality. The special value of `0` is for lossless output.
 
 Unfortunately, the output bitrate is extremely unpredictable when using this CRF-based system. Typically, people pick a middle-level CRF value as their quality target and just hope for the best. This is what most of the presets built into HandBrake do, choosing a CRF of `20` or `22`.
 
@@ -662,6 +662,23 @@ For a few problematic videos, I have to apply options like `--force-rate 23.976
 
 ## History
 
+Saturday, December 2, 2017
+
+### [0.18.0](https://github.com/donmelton/video_transcoding/releases/tag/0.18.0)
+
+* Improve the average bitrate (ABR) ratecontrol system provided by the `--abr` option in `transcode-video`. Via [ #179](https://github.com/donmelton/video_transcoding/issues/179).
+    * Implement it with a maximum bitrate constraint to raise its overal quality level and guarantee that it will not generate any `VBV underflow` warnings like the default ratecontrol system.
+    * Signal Hypothetical Reference Decoder (HRD) information, meaning that the VBV maximum bitrate value is added as metadata to the output video, something you should _not_ do when using the default ratecontrol system.
+    * Move it from the "Advanced" to the "Quality" section in the `--help` output and describe its quality output as "different" rather than "lower" compared to the default ratecontrol system.
+    * Also remove the no-longer valid characterization of ABR in the "Explanation" section of the "README" document.
+* Deprecate the poorly named `--cvbr` and `--vbr` options in `transcode-video` and remove them from the `--help` output.
+    * The ratecontrol system implemented by the `--cvbr` option was always experimental. After much testing, it was found to be noticeably lower in quality compared to the default and to the new ABR implementation.
+    * The ratecontrol system implemented by the `--vbr` option was only ever intended for comparison testing. And probably used only by myself.
+* Modify `transcode-video` to no longer re-calculate `vbv-bufsize` based on any user input value for `vbv-maxrate`. Instead, always calculate both `vbv-maxrate` and `vbv-bufsize` based on the target video bitrate.
+* Deprecate the `--player` option in `detect-crop` and remove it from the `--help` output.
+* Fix failure of subtitle detection for HandBrake nightly builds. Language detection for subtitles in disc image directory input and individual closed caption tracks may still be wrong but will not be fixed at this time. Via [ #172](https://github.com/donmelton/video_transcoding/issues/172).
+* Mention [Nick Wronski](https://github.com/nwronski)'s nifty batch-processing wrapper for `transcode-video` in the the "README" document. Thanks, [@JMoVS](https://github.com/JMoVS)! Via [ #180](https://github.com/donmelton/video_transcoding/pull/180).
+
 Sunday, September 10, 2017
 
 ### [0.17.4](https://github.com/donmelton/video_transcoding/releases/tag/0.17.4)

data/bin/detect-crop

@@ -31,8 +31,6 @@ 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     "           "
@@ -60,6 +58,9 @@ HERE
       opts.on('--values-only')        { @values_only = true }
 
       opts.on '--player ARG' do |arg|
+        Console.warn '**********'
+        Console.warn 'Using deprecated option: --player'
+        Console.warn '**********'
         @player = case arg
         when 'mpv', 'mplayer'
           arg.to_sym

data/bin/transcode-video

@@ -56,6 +56,8 @@ Output options:
     --dry-run       don't transcode, just show `HandBrakeCLI` command and exit
 
 Quality options:
+    --abr           use constrained average bitrate (ABR) ratecontrol
+                      (predictable size with different quality than default)
     --target big|small
                     apply video bitrate target macro for all input resolutions
                       (`big` trades some size for increased quality)
@@ -186,13 +188,6 @@ External subtitle options:
                       (can be used multiple times)
 
 Advanced options:
-    --cvbr          use simple constrained variable bitrate (CVBR) ratecontrol
-                      (more predictable size while avoiding VBV underflows)
-                      (use with `--target big` for best results)
-    --abr           use modified average bitrate (ABR) ratecontrol
-                      (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 "_"
@@ -229,10 +224,11 @@ HERE
       @format                     = :mkv
       @log                        = true
       @dry_run                    = false
-      @max_bitrate_2160p          = 12000
-      @max_bitrate_1080p          = 6000
-      @max_bitrate_720p           = 3000
-      @max_bitrate_480p           = 1500
+      @use_abr                    = false
+      @target_bitrate_2160p       = 12000
+      @target_bitrate_1080p       = 6000
+      @target_bitrate_720p        = 3000
+      @target_bitrate_480p        = 1500
       @quick                      = false
       @veryquick                  = false
       @crop                       = {:top => 0, :bottom => 0, :left => 0, :right => 0}
@@ -262,9 +258,6 @@ HERE
       @srt_language               = {}
       @srt_encoding               = {}
       @srt_offset                 = {}
-      @use_cvbr                   = false
-      @use_abr                    = false
-      @vbr_quality                = nil
       @encoder_options            = {}
       @disable_encoder_options    = []
       @handbrake_options          = {}
@@ -319,30 +312,34 @@ HERE
       opts.on('--no-log')             { @log = false }
       opts.on('--dry-run')            { @dry_run = true }
 
+      opts.on '--abr' do
+        @use_abr = true
+      end
+
       opts.on '--target ARG' do |arg|
         case arg
         when 'big'
-          @max_bitrate_2160p  = 16000
-          @max_bitrate_1080p  = 8000
-          @max_bitrate_720p   = 4000
-          @max_bitrate_480p   = 2000
+          @target_bitrate_2160p = 16000
+          @target_bitrate_1080p = 8000
+          @target_bitrate_720p  = 4000
+          @target_bitrate_480p  = 2000
         when 'small'
-          @max_bitrate_2160p  = 8000
-          @max_bitrate_1080p  = 4000
-          @max_bitrate_720p   = 2000
-          @max_bitrate_480p   = 1000
+          @target_bitrate_2160p = 8000
+          @target_bitrate_1080p = 4000
+          @target_bitrate_720p  = 2000
+          @target_bitrate_480p  = 1000
         when /^([0-9]+p)=([1-9][0-9]*)$/
           bitrate = $2.to_i
 
           case $1
           when '2160p'
-            @max_bitrate_2160p = bitrate
+            @target_bitrate_2160p = bitrate
           when '1080p'
-            @max_bitrate_1080p = bitrate
+            @target_bitrate_1080p = bitrate
           when '720p'
-            @max_bitrate_720p = bitrate
+            @target_bitrate_720p = bitrate
           when '480p'
-            @max_bitrate_480p = bitrate
+            @target_bitrate_480p = bitrate
           else
             fail UsageError, "invalid target video bitrate resolution: #{$1}"
           end
@@ -355,8 +352,6 @@ HERE
 
           @target_bitrate = arg.to_i
         end
-
-        @vbr_quality = nil
       end
 
       opts.on '--quick' do
@@ -702,24 +697,6 @@ HERE
         @srt_offset[@srt_file.size - 1] = arg
       end
 
-      opts.on '--cvbr' do
-        @use_cvbr = true
-        @use_abr = false
-        @vbr_quality = nil
-      end
-
-      opts.on '--abr' do
-        @use_abr = true
-        @use_cvbr = false
-        @vbr_quality = nil
-      end
-
-      opts.on '--vbr ARG', Float do |arg|
-        @vbr_quality = arg
-        @use_cvbr = false
-        @use_abr = false
-      end
-
       opts.on '-E', '--encoder-option ARG' do |arg|
         if arg =~ /^([a-z0-9][a-z0-9_-]+)=([^ :]+)$/
           @encoder_options[$1] = $2
@@ -743,6 +720,30 @@ HERE
           fail UsageError, "invalid HandBrakeCLI option: #{arg}"
         end
       end
+
+      opts.on '--cvbr' do
+        Console.warn '**********'
+        Console.warn 'Using deprecated option: --cvbr'
+        Console.warn 'Replace with: -E crf-max=30 -E _qpmax'
+        Console.warn '**********'
+        @encoder_options['crf-max'] = '30'
+        @disable_encoder_options << 'qpmax'
+        @use_abr = false
+      end
+
+      opts.on '--vbr ARG', Float do |arg|
+        crf = arg.to_s.gsub(/\.0+$/, '')
+        Console.warn '**********'
+        Console.warn 'Using deprecated option: --vbr'
+        Console.warn "Replace with: -H quality=#{crf} -E _vbv-maxrate -E _vbv-bufsize -E _crf-max -E _qpmax"
+        Console.warn '**********'
+        @handbrake_options['quality'] = crf
+        @disable_encoder_options << 'vbv-maxrate'
+        @disable_encoder_options << 'vbv-bufsize'
+        @disable_encoder_options << 'crf-max'
+        @disable_encoder_options << 'qpmax'
+        @use_abr = false
+      end
     end
 
     def force_handbrake_option(name, value)
@@ -923,16 +924,16 @@ HERE
 
       if width > 1920 or height > 1080
         encoder_level = '5.1'
-        max_bitrate = @max_bitrate_2160p
+        bitrate = @target_bitrate_2160p
       elsif width > 1280 or height > 720
         encoder_level = '4.0'
-        max_bitrate = @max_bitrate_1080p
+        bitrate = @target_bitrate_1080p
       elsif width * height > 720 * 576
         encoder_level = '3.1'
-        max_bitrate = @max_bitrate_720p
+        bitrate = @target_bitrate_720p
       else
         encoder_level = '3.0'
-        max_bitrate = @max_bitrate_480p
+        bitrate = @target_bitrate_480p
       end
 
       case encoder
@@ -950,37 +951,36 @@ HERE
         handbrake_options['encoder-profile'] = 'main10'
       end
 
-      if @vbr_quality.nil?
-        if @target_bitrate.nil?
-          unless media.info[:directory]
-            bitrate = ((((media.info[:size] * 8) / media.info[:duration]) / 1000) / 1000) * 1000
+      if @target_bitrate.nil?
+        unless media.info[:directory]
+          media_bitrate = ((((media.info[:size] * 8) / media.info[:duration]) / 1000) / 1000) * 1000
 
-            if bitrate < max_bitrate
-              min_bitrate = max_bitrate / 2
+          if media_bitrate < bitrate
+            min_bitrate = bitrate / 2
 
-              if bitrate < min_bitrate
-                max_bitrate = min_bitrate
-              else
-                max_bitrate = bitrate
-              end
+            if media_bitrate < min_bitrate
+              bitrate = min_bitrate
+            else
+              bitrate = media_bitrate
             end
           end
-        else
-          max_bitrate = @target_bitrate
-        end
-
-        if @use_abr
-          handbrake_options['vb'] = max_bitrate.to_s
-        else
-          handbrake_options['quality'] = '1'
-          encoder_options['vbv-maxrate'] = max_bitrate.to_s
-          encoder_options['vbv-bufsize'] = (@encoder_options.fetch('vbv-maxrate', max_bitrate).to_i * 2).to_s
-          encoder_options['crf-max'] = @use_cvbr ? '30' : '25'
         end
+      else
+        bitrate = @target_bitrate
+      end
 
-        encoder_options['qpmax'] = '34' unless @use_cvbr
+      if @use_abr
+        handbrake_options['vb']         = bitrate.to_s
+        encoder_options['vbv-maxrate']  = ((bitrate * 1.5).to_i).to_s
+        encoder_options['vbv-bufsize']  = ((bitrate * 2).to_i).to_s
+        encoder_options['nal-hrd']      = 'vbr' if encoder =~ /^x264(?:_10bit)?$/
+        encoder_options['hrd']          = '1'   if encoder =~ /^x265(?:_1[026]bit)?$/
       else
-        handbrake_options['quality'] = @vbr_quality.to_s.gsub(/\.0+$/, '')
+        handbrake_options['quality']    = '1'
+        encoder_options['vbv-maxrate']  = bitrate.to_s
+        encoder_options['vbv-bufsize']  = ((bitrate * 2).to_i).to_s
+        encoder_options['crf-max']      = '25'
+        encoder_options['qpmax']        = '34'
       end
 
       if  (@quick or @veryquick) and

data/lib/video_transcoding/media.rb

@@ -127,6 +127,13 @@ module VideoTranscoding
           track_info[:format]     = $3
           track_info[:encoding]   = $4
           @info[:subtitle][track] = track_info
+        elsif line =~ /^    \+ ([0-9]+), .*\[(.*)\]/
+          track                   = $1.to_i
+          track_info              = {}
+          track_info[:language]   = 'und'
+          track_info[:format]     = ($2 == 'PGS' or $2 == 'VOBSUB') ? 'Bitmap' : 'Text'
+          track_info[:encoding]   = $2
+          @info[:subtitle][track] = track_info
         end
       end
 
@@ -137,10 +144,11 @@ 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]+)(?:\(([a-z]{3})\))?: (Video|Audio|Subtitle): (.*)/
           stream      = $1.to_i
-          type        = $2
-          attributes  = $3
+          language    = $2
+          type        = $3
+          attributes  = $4
 
           case type
           when 'Video'
@@ -181,6 +189,51 @@ module VideoTranscoding
               track_info = @info[:subtitle][subtitle_track]
               track_info[:stream] = stream
 
+              if track_info[:language] == 'und'
+                case language
+                when 'alb'
+                  track_info[:language] = 'sqi'
+                when 'arm'
+                  track_info[:language] = 'hye'
+                when 'baq'
+                  track_info[:language] = 'eus'
+                when 'bur'
+                  track_info[:language] = 'mya'
+                when 'chi'
+                  track_info[:language] = 'zho'
+                when 'cze'
+                  track_info[:language] = 'ces'
+                when 'dut'
+                  track_info[:language] = 'nld'
+                when 'fre'
+                  track_info[:language] = 'fra'
+                when 'geo'
+                  track_info[:language] = 'kat'
+                when 'ger'
+                  track_info[:language] = 'deu'
+                when 'gre'
+                  track_info[:language] = 'ell'
+                when 'ice'
+                  track_info[:language] = 'isl'
+                when 'mac'
+                  track_info[:language] = 'mkd'
+                when 'mao'
+                  track_info[:language] = 'mri'
+                when 'per'
+                  track_info[:language] = 'fas'
+                when 'rum'
+                  track_info[:language] = 'ron'
+                when 'slo'
+                  track_info[:language] = 'slk'
+                when 'tib'
+                  track_info[:language] = 'bod'
+                when 'wel'
+                  track_info[:language] = 'cym'
+                else
+                  track_info[:language] = language
+                end
+              end
+
               if attributes =~ /\(default\)/
                 track_info[:default] = true
               else

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.17.4'
+  VERSION = '0.18.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.17.4
+  version: 0.18.0
 platform: ruby
 authors:
 - Don Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Video Transcoding is a package of tools to transcode, inspect
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Tools to transcode, inspect and convert videos.