video_transcoding 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c228704a28bdfc0fcc86e1bab03106c34c7b92cd
-  data.tar.gz: 6d86557aae17cce47fc0db4692d72bc0cc0ff8bf
+  metadata.gz: 7e1eab23f13cde11a9882596e7357a7b9170a060
+  data.tar.gz: 7d73d07d2765345777c7d0cec42004d09508097b
 SHA512:
-  metadata.gz: 6230729bd71adb9bd9b7bfe85ce26d1528c32d23409fdecf1a75178a8e38307c52bffd7b0d35451402502723bd98cca34116f85005490e77ab36d8f91b96c7b2
-  data.tar.gz: cdaf3c5804952e883bc897e6462f851b34ff156c8fda5603ead93c299047363a00b2dc424b5e4167d8e44436a1270f8d54421f80dd3cfc4cd00818b2a6f1214c
+  metadata.gz: ea3e5c6d2e014bddec8b393432b8dd3cfbe98980be22d7a27ab1a647eb16c06f380680e753c4448b6341b07119505c68fe38f988299eb13a3f2b66e40d6d454e
+  data.tar.gz: c6c1875c5ff26df2188e0049a9416caa04300da51c6a68d486b0798c5278c6bf2a4620de2a8a6b769cfa87a2a67b9b6a805df4401f134ae3f2f81c36ba07c934

data/README.md

@@ -71,7 +71,6 @@ On OS X, the other dependencies can be easily installed via [Homebrew](http://br
 
 `HandBrakeCLI` is also available via [Homebrew Cask](http://caskroom.io/), an extension to Homebrew:
 
-    brew install caskroom/cask/brew-cask
     brew cask install handbrakecli
 
 On Linux, package management systems vary so it's best consult the indexes for those systems.
@@ -94,11 +93,9 @@ So, the `transcode-video` tool configures the [x264 video encoder](http://www.vi
 
 Input resolution | Target video bitrate
 --- | ---
-1080p or Blu-ray video | 8 Mbps
-720p | 6 Mbps
-480i, 576p or DVD video | 3 Mbps
-
-Actual output video bitrates are usually lower than these targets, especially for DVD video.
+1080p or Blu-ray video | 8000 Kbps
+720p | 5000 Kbps
+480i, 576p or DVD video | 2500 Kbps
 
 When audio transcoding is required, it's done in [AAC format](https://en.wikipedia.org/wiki/Advanced_Audio_Coding) and, if the original is [multi-channel surround sound](https://en.wikipedia.org/wiki/Surround_sound), in [Dolby Digital AC-3 format](https://en.wikipedia.org/wiki/Dolby_Digital). Meaning the output can contain two tracks from the same source in different formats. And mono, stereo and surround inputs are all handled differently.
 
@@ -204,9 +201,9 @@ Video bitrate targets are lowered 33-37% depending upon the video resolution of
 
 Input resolution | Target video bitrate with `--small`
 --- | ---
-1080p or Blu-ray video | 5 Mbps
-720p | 4 Mbps
-480i, 576p or DVD video | 2 Mbps
+1080p or Blu-ray video | 5000 Kbps
+720p | 4000 Kbps
+480i, 576p or DVD video | 2000 Kbps
 
 Dolby Digital AC-3 audio bitrate limits are lowered 40%. However, there's no impact on the bitrate of mono and stereo AAC audio tracks.
 

data/bin/transcode-video

@@ -165,6 +165,7 @@ External subtitle options:
                       (can be used multiple times)
 
 Advanced options:
+    --old-behavior  use old ratecontrol system and video bitrate limits
     --abr BITRATE   use modified ABR ratecontrol at average video bitrate
     --vbr QUALITY   use true VBR ratecontrol at constant video quality (0-51)
 -E, --encoder-option NAME=VALUE|_NAME
@@ -205,8 +206,8 @@ HERE
       @dry_run                    = false
       @vbv_maxrate_2160p          = 16000
       @vbv_maxrate_1080p          = 8000
-      @vbv_maxrate_720p           = 6000
-      @vbv_maxrate_480p           = 3000
+      @vbv_maxrate_720p           = 5000
+      @vbv_maxrate_480p           = 2500
       @quick                      = false
       @crop                       = {:top => 0, :bottom => 0, :left => 0, :right => 0}
       @main_audio                 = nil
@@ -229,6 +230,7 @@ HERE
       @srt_language               = {}
       @srt_encoding               = {}
       @srt_offset                 = {}
+      @old_behavior               = false
       @abr_bitrate                = nil
       @vbr_quality                = nil
       @encoder_options            = {}
@@ -305,8 +307,8 @@ HERE
         Console.warn 'Using deprecated option: --big'
         @vbv_maxrate_2160p  = 16000
         @vbv_maxrate_1080p  = 8000
-        @vbv_maxrate_720p   = 6000
-        @vbv_maxrate_480p   = 3000
+        @vbv_maxrate_720p   = @old_behavior ? 6000 : 5000
+        @vbv_maxrate_480p   = @old_behavior ? 3000 : 2500
         @ac3_bitrate        = 640
         @pass_ac3_bitrate   = 640
       end
@@ -607,6 +609,14 @@ HERE
         @srt_offset[@srt_file.size - 1] = arg
       end
 
+      opts.on '--old-behavior' do
+        @old_behavior = true
+        @vbv_maxrate_720p = 6000 if @vbv_maxrate_720p == 5000
+        @vbv_maxrate_480p = 3000 if @vbv_maxrate_480p == 2500
+        @abr_bitrate = nil
+        @vbr_quality = nil
+      end
+
       opts.on '--abr ARG', Integer do |arg|
         @abr_bitrate = arg
         @vbr_quality = nil
@@ -806,7 +816,7 @@ HERE
           handbrake_options['encoder-level'] = 'auto'
         end
 
-        handbrake_options['quality'] = '16'
+        handbrake_options['quality'] = @old_behavior ? '16' : '1'
 
         unless media.info[:directory]
           bitrate = ((((media.info[:size] * 8) / media.info[:duration]) / 1000) / 1000) * 1000
@@ -825,6 +835,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
       else
         unless @abr_bitrate.nil?
           handbrake_options['vb'] = @abr_bitrate.to_s

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

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