video_transcoding 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ec7d9f2674f60b914a959df7c76debc47249ae57b925606b1d2ca86937a6f35
-  data.tar.gz: 5db202054bf388c995005cd9752ae6203551e2aec5680acbdb3a887b5d1d38ed
+  metadata.gz: 03bf26235071514e773c623951ccf5363672daaaa6a47e382eb39047632a7535
+  data.tar.gz: 3c1e303d5002e0415a87ef397a17a08e4df547f8c3abcd3d5dd51bb8d4bfe2f4
 SHA512:
-  metadata.gz: 27dc2c42fee463759a08d50bafe115d43b42a904cb89ff9e9cd0fe59bb8be14f98bbd3f6cd23a08b7b40952191ee5c1f6f5d47c539f9fd178f929203a76b35c6
-  data.tar.gz: 548d0b737f9d976daf3a5e4f710837b0c2a807cead897b0d2c7ee7eed2509fdd1ca0044595c1b41fa29d90ecfaaf2f43d71503ae541f6b7df2074169eca62ca9
+  metadata.gz: 5a309622bce60b49984c428fe261a19f0a6a43750b1f2e7cecb55f9d2f57d3c01947e45eb43024598ee19c0f1b677169dddfba9743f7b3024caf872204fd58ca
+  data.tar.gz: 98ca7b6d7827bc9361f3f6707f622138019f105eb9f67ab9132de7f218b775245c7b0052cfddc9a6f7a693c374deb56762e4c3d6680c82da64baa0f205a8de4d

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2018 Don Melton
+Copyright (c) 2013-2019 Don Melton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -563,7 +563,7 @@ These examples are written in Bash and only supply crop values. But almost any s
 
 What is a ratecontrol system? It's how a video encoder decides on the amount of bits to allocate for a specific frame.
 
-My `transcode-video` tool has three different ratecontrol systems which manipulate the x264 and x265 software-based video encoders built into `HandBrakeCLI`.
+My `transcode-video` tool has four different ratecontrol systems which manipulate x264 and three which manipulate x265, both software-based video encoders built into `HandBrakeCLI`.
 
 Additionally, `transcode-video` allows access to hardware-based video encoders which have their own ratecontrol systems.
 
@@ -603,6 +603,18 @@ It seems counterintuitive, but constraining the maximum bitrate prevents too muc
 
 And this manipulation is exactly the same strategy used by streaming services such as Netflix.
 
+### How my average variable bitrate (AVBR) ratecontrol system works
+
+My average variable bitrate (AVBR) ratecontrol system, selected via the `--avbr` option, is also based on the ABR algorithm already within x264 which targets a specific bitrate.
+
+But the maximum bitrate is not constrained like my ABR system.
+
+Instead, the tolerance of missing the average bitrate is raised to the maximum amount, disabling overflow detection completely. This makes the ABR algorithm behave much more like a CRF-based encode, so final bitrates can be 10-15% higher or lower than the target.
+
+And to prevent bitrates from getting too low, the Macroblock-tree ratecontrol system built into x264 is disabled. While this does lower compression efficiency somewhat, it significantly reduces blockiness, color banding and other artifacts.
+
+Unfortunately, these modifications to implement AVBR are not possible when using x265.
+
 ## FAQ
 
 ### Should I worry about all these `VBV underflow` warnings?
@@ -629,9 +641,16 @@ While speed continues to improve, x265 is still considerably slower than the def
 
 Hardware-based encoders, like those in [Intel Quick Sync Video](https://en.wikipedia.org/wiki/Intel_Quick_Sync_Video), are often considerably faster than x264 or x265. Some are available in recent versions of HandBrake.
 
-Check the output of `HandBrakeCLI --help` to find out if your platform has any of these video encoders available. The names of these encoders all end with "`_h264`" (for H.264) or "`_h265`" (for HEVC).
+Check the `Video Options` section from the output of `HandBrakeCLI --help` to find out if your platform has any of these video encoders available:
 
-You can try hardware-based transcoding now using the `--encoder` option. On macOS, select the H.264 encoder this way:
+Platform | H.264 encoder | HEVC encoder
+--- | --- | ---
+Intel Quick Sync Video | `qsv_h264` | `qsv_h265` and `qsv_h265_10bit`
+AMD Video Coding Engine | `vce_h264` | `vce_h265`
+Nvidia NVENC | `nvenc_h264` | `nvenc_h265`
+Apple VideoToolbox | `vt_h264` | `vt_h265`
+
+You can try hardware-based transcoding now using the `--encoder` option. On macOS, select the Apple VideoToolbox H.264 encoder this way:
 
     transcode-video --encoder vt_h264 "/path/to/Movie.mkv"
 
@@ -657,6 +676,21 @@ For a few problematic videos, I have to apply options like `--force-rate 23.976
 
 ## History
 
+### [0.23.0](https://github.com/donmelton/video_transcoding/releases/tag/0.23.0)
+
+Sunday, February 10, 2019
+
+* Add a `--avbr` ratecontrol option to `transcode-video` (via [ #248](https://github.com/donmelton/video_transcoding/issues/248)) which:
+    * Implements an average variable bitrate (AVBR) ratecontrol system focused on maintaining quality at the risk of final bitrates being as much as 10-15% higher or lower than the target.
+    * May emit a few `VBV underflow` warnings at the beginning of a transcode, but nothing like the sustained deluge possible with my special, or default, ratecontrol system.
+    * Works only with the `x264` and `x264_10bit` encoders. Sorry, but the settings necessary to implement AVBR are not available with the `x265` family of encoders.
+* Add my new AVBR ratecontrol system to the "Explanation" section of the "README" document.
+* Add an undocumented `--raw` ratecontrol testing option to `transcode-video` which implements, by default, an unconstrained ABR system, easily modified with `--handbrake-option` and/or `--encoder-option`.
+* Add a `--mixdown` option to `transcode-video` which sets the mixdown format for all AAC audio tracks, either Dolby Pro Logic II (the default) or stereo. Thanks to [@samhutchins](https://github.com/samhutchins) for the idea and the patch! Via [ #245](https://github.com/donmelton/video_transcoding/pull/245).
+* Fix failure in `detect-crop` on Linux for certain inputs by forcing the text output from `ffmpeg` into UTF-8 binary format to ensure the correct parsing of that data during crop detection. Via [ #247](https://github.com/donmelton/video_transcoding/issues/247).
+* List all hardware-based video encoders within the related answer in the "FAQ" section of the "README" document. Thanks to [@vr8hub](https://github.com/vr8hub) for the idea! Via [ #251](https://github.com/donmelton/video_transcoding/issues/251).
+* Update all copyright notices to the year 2019.
+
 ### [0.22.0](https://github.com/donmelton/video_transcoding/releases/tag/0.22.0)
 
 Saturday, December 15, 2018

data/bin/convert-video

@@ -2,7 +2,7 @@
 #
 # convert-video
 #
-# Copyright (c) 2013-2018 Don Melton
+# Copyright (c) 2013-2019 Don Melton
 #
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')

data/bin/detect-crop

@@ -2,7 +2,7 @@
 #
 # detect-crop
 #
-# Copyright (c) 2013-2018 Don Melton
+# Copyright (c) 2013-2019 Don Melton
 #
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')

data/bin/query-handbrake-log

@@ -2,7 +2,7 @@
 #
 # query-handbrake-log
 #
-# Copyright (c) 2013-2018 Don Melton
+# Copyright (c) 2013-2019 Don Melton
 #
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')

data/bin/transcode-video

@@ -2,7 +2,7 @@
 #
 # transcode-video
 #
-# Copyright (c) 2013-2018 Don Melton
+# Copyright (c) 2013-2019 Don Melton
 #
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
@@ -62,6 +62,9 @@ Quality options:
                       (predictable size with different quality than default)
     --simple        use simple constrained ratecontrol
                       (limited size with different quality than default)
+    --avbr          use average variable bitrate (AVBR) ratecontrol
+                      (size near target with different quality than default)
+                      (only available with x264 and x264_10bit encoders)
     --target big|small
                     apply video bitrate target macro for all input resolutions
                       (`big` trades some size for increased quality)
@@ -154,6 +157,8 @@ 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)
     --no-audio      disable all audio output
 
 Subtitle options:
@@ -230,8 +235,7 @@ HERE
       @format                     = :mkv
       @log                        = true
       @dry_run                    = false
-      @use_abr                    = false
-      @use_simple                 = false
+      @ratecontrol                = :special
       @target_bitrate_2160p       = 12000
       @target_bitrate_1080p       = 6000
       @target_bitrate_720p        = 3000
@@ -256,6 +260,7 @@ HERE
       @copy_audio                 = []
       @copy_audio_name            = []
       @aac_encoder                = nil
+      @mixdown                    = 'dpl2'
       @burn_subtitle              = nil
       @force_subtitle             = nil
       @extra_subtitle             = []
@@ -326,13 +331,19 @@ HERE
       end
 
       opts.on '--abr' do
-        @use_abr    = true
-        @use_simple = false
+        @ratecontrol = :abr
       end
 
       opts.on '--simple' do
-        @use_simple = true
-        @use_abr    = false
+        @ratecontrol = :simple
+      end
+
+      opts.on '--avbr' do
+        @ratecontrol = :avbr
+      end
+
+      opts.on '--raw' do
+        @ratecontrol = :raw
       end
 
       opts.on '--target ARG' do |arg|
@@ -607,6 +618,15 @@ HERE
         end
       end
 
+      opts.on '--mixdown ARG' do |arg|
+        @mixdown = case arg
+        when 'dpl2', 'stereo'
+          arg
+        else
+          fail UsageError, "invalid mixdown: #{arg}"
+        end
+      end
+
       opts.on('--no-audio')           { force_handbrake_option 'audio', 'none' }
 
       opts.on '--burn-subtitle ARG' do |arg|
@@ -968,24 +988,41 @@ HERE
           handbrake_options['encoder-level'] = encoder_level
       end
 
-      if @use_abr
+      signal_hrd = false
+
+      case @ratecontrol
+      when :special
+        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'
+      when :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[02]bit)?$/
-      elsif @use_simple
+        signal_hrd                      = true
+      when :simple
         handbrake_options['quality']    = '1'
         encoder_options['vbv-maxrate']  = bitrate.to_s
         encoder_options['vbv-bufsize']  = bitrate.to_s
+        signal_hrd                      = true
+      when :avbr
+        handbrake_options['vb']         = bitrate.to_s
+
+        if encoder =~ /^x264(?:_10bit)?$/
+          encoder_options['ratetol']    = 'inf'
+          encoder_options['mbtree']     = '0'
+        else
+          fail UsageError, "`--avbr` not available with the `#{encoder}` encoder"
+        end
+      when :raw
+        handbrake_options['vb']         = bitrate.to_s unless @handbrake_options.has_key? 'quality'
+      end
+
+      if signal_hrd
         encoder_options['nal-hrd']      = 'vbr' if encoder =~ /^x264(?:_10bit)?$/
         encoder_options['hrd']          = '1'   if encoder =~ /^x265(?:_1[02]bit)?$/
-      else
-        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
@@ -1088,7 +1125,7 @@ HERE
         else
           @aac_encoder ||= HandBrake.aac_encoder
           encoders << @aac_encoder
-          mixdowns << (info[:channels] > 2.0 ? 'dpl2' : '')
+          mixdowns << (info[:channels] > 2.0 ? @mixdown : '')
         end
 
         bitrates << ''

data/lib/video_transcoding.rb

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

data/lib/video_transcoding/cli.rb

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

data/lib/video_transcoding/console.rb

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

data/lib/video_transcoding/copyright.rb

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

data/lib/video_transcoding/crop.rb

@@ -1,7 +1,7 @@
 #
 # crop.rb
 #
-# Copyright (c) 2013-2018 Don Melton
+# Copyright (c) 2013-2019 Don Melton
 #
 
 module VideoTranscoding
@@ -51,6 +51,8 @@ module VideoTranscoding
                 last_seconds = seconds
               end
 
+              line.encode! 'UTF-8', 'binary', invalid: :replace, undef: :replace, replace: ''
+
               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

data/lib/video_transcoding/errors.rb

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

data/lib/video_transcoding/ffmpeg.rb

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

data/lib/video_transcoding/handbrake.rb

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

data/lib/video_transcoding/media.rb

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

data/lib/video_transcoding/mkvpropedit.rb

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

data/lib/video_transcoding/mp4track.rb

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

data/lib/video_transcoding/tool.rb

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

data/lib/video_transcoding/version.rb

@@ -1,9 +1,9 @@
 #
 # version.rb
 #
-# Copyright (c) 2013-2018 Don Melton
+# Copyright (c) 2013-2019 Don Melton
 #
 
 module VideoTranscoding
-  VERSION = '0.22.0'
+  VERSION = '0.23.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Don Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2019-02-10 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Video Transcoding is a package of tools to transcode, inspect
@@ -63,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Tools to transcode, inspect and convert videos.