video_transcoding 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e1eab23f13cde11a9882596e7357a7b9170a060
-  data.tar.gz: 7d73d07d2765345777c7d0cec42004d09508097b
+  metadata.gz: 8e3606bdc98fafac3af50e6871e4c8c1f0852e58
+  data.tar.gz: e6db68299ae0058840579164d9cc53dd3f14e38c
 SHA512:
-  metadata.gz: ea3e5c6d2e014bddec8b393432b8dd3cfbe98980be22d7a27ab1a647eb16c06f380680e753c4448b6341b07119505c68fe38f988299eb13a3f2b66e40d6d454e
-  data.tar.gz: c6c1875c5ff26df2188e0049a9416caa04300da51c6a68d486b0798c5278c6bf2a4620de2a8a6b769cfa87a2a67b9b6a805df4401f134ae3f2f81c36ba07c934
+  metadata.gz: 6625c65ce512c52d2e8891e6fe4aa95295f3ca421174e8de2f29abd63b85548cd0a62adb62b3deaa55d6145fdf24e8c0749b63c244efdcbb98384a14c7051fb7
+  data.tar.gz: c6c84e5819aa65257b32728005c57bec07b8269f0832a37a14f839bec1570c82b096d1fe2e08bf5f73d5888852729dca5bde1347e47b193d8caf80ba2d220e88

data/README.md

@@ -94,8 +94,8 @@ So, the `transcode-video` tool configures the [x264 video encoder](http://www.vi
 Input resolution | Target video bitrate
 --- | ---
 1080p or Blu-ray video | 8000 Kbps
-720p | 5000 Kbps
-480i, 576p or DVD video | 2500 Kbps
+720p | 4000 Kbps
+480i, 576p or DVD video | 2000 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.
 
@@ -202,8 +202,8 @@ 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 | 5000 Kbps
-720p | 4000 Kbps
-480i, 576p or DVD video | 2000 Kbps
+720p | 3000 Kbps
+480i, 576p or DVD video | 1600 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.
 
@@ -213,8 +213,6 @@ Mono | AAC only | 80 Kbps | none
 Stereo | AAC only | 160 Kbps | none
 Surround | AC-3 only, up to 448 Kbps | 160 Kbps | 384 Kbps with 5.1 channels
 
-This makes the output of `transcode-video` very near the same size as videos from the iTunes Store, including their audio tracks.
-
 With `--small`, noisy video and complex surround audio have the most potential for perceptible quality loss.
 
 #### Improving performance
@@ -459,14 +457,14 @@ Preset name | Note
 `faster` | use with caution
 `fast` | good but you might want to use `--quick` instead
 `medium` | default
-`slow` | use with caution
-`slower` | use with caution
-`veryslow` | use with caution
+`slow` | smaller but not obviously higher quality
+`slower` | smaller but not obviously higher quality
+`veryslow` | smaller but not obviously higher quality
 `placebo` | not recommended
 
 Presets faster than `medium` trade precision for more speed. That tradeoff is acceptable for the `fast` preset. But you may notice occasional quality loss problems when using the `faster` or `veryfast` presets.
 
-Presets slower than `medium` trade encoding speed for more compression efficiency. Any quality improvement using these presets may not be perceptible for most input. And on rare occasions, these presets lower quality noticeably.
+Presets slower than `medium` trade encoding speed for more compression efficiency. Any quality improvement using these presets may not be perceptible for most input.
 
 ### Recommended `transcode-video` usage
 
@@ -474,9 +472,9 @@ Use the default settings whenever possible.
 
 Use the `--mp4` or `--m4v` options if your target player can't handle Matroska format.
 
-Use the `--small` option if you're short on storage space or you want your files near the same size as those from the iTunes Store.
+Use the `--small` option if you're short on storage space.
 
-Use the `--quick` option if you're in a hurry or you have a huge number of files to transcode.
+Use the `--quick` option if you're in a hurry.
 
 Apply unambiguous crop values from `detect-crop` after review.
 

data/bin/transcode-video

@@ -56,9 +56,9 @@ Output options:
     --dry-run       don't transcode, just show `HandBrakeCLI` command and exit
 
 Quality options:
-    --small, --small-video
-                    lower default limits for both video and AC-3 audio bitrates
-                      or for video only, trading some quality for reduced size
+    --small         lower video bitrate target and AC-3 audio bitrate limits,
+                      trading some quality for reduced size
+    --small-video   lower video bitrate target only
     --quick         trade some precision for 45-50% increase in encoding speed
                       (more than 15% speedier than x264 encoder "fast" preset)
                       (avoids quality loss of "faster" and "veryfast" presets)
@@ -75,6 +75,9 @@ Video options:
     --pixel-aspect X:Y
                     set pixel aspect ratio (default: 1:1)
                       (e.g.: make X larger than Y to stretch horizontally)
+    --target BITRATE
+                    set video bitrate target (default: based on input)
+                      (can be exceeded to maintain video quality)
     --force-rate FPS
                     force constant video frame rate
                       (`23.976` applied automatically for some inputs)
@@ -165,7 +168,6 @@ 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
@@ -206,10 +208,11 @@ HERE
       @dry_run                    = false
       @vbv_maxrate_2160p          = 16000
       @vbv_maxrate_1080p          = 8000
-      @vbv_maxrate_720p           = 5000
-      @vbv_maxrate_480p           = 2500
+      @vbv_maxrate_720p           = 4000
+      @vbv_maxrate_480p           = 2000
       @quick                      = false
       @crop                       = {:top => 0, :bottom => 0, :left => 0, :right => 0}
+      @target_bitrate             = nil
       @main_audio                 = nil
       @extra_audio                = []
       @audio_name                 = {}
@@ -290,8 +293,8 @@ HERE
       opts.on '--small' do
         @vbv_maxrate_2160p  = 10000
         @vbv_maxrate_1080p  = 5000
-        @vbv_maxrate_720p   = 4000
-        @vbv_maxrate_480p   = 2000
+        @vbv_maxrate_720p   = @old_behavior ? 4000 : 3000
+        @vbv_maxrate_480p   = @old_behavior ? 2000 : 1600
         @ac3_bitrate        = 384
         @pass_ac3_bitrate   = 448
       end
@@ -299,18 +302,8 @@ HERE
       opts.on '--small-video' do
         @vbv_maxrate_2160p  = 10000
         @vbv_maxrate_1080p  = 5000
-        @vbv_maxrate_720p   = 4000
-        @vbv_maxrate_480p   = 2000
-      end
-
-      opts.on '--big' do
-        Console.warn 'Using deprecated option: --big'
-        @vbv_maxrate_2160p  = 16000
-        @vbv_maxrate_1080p  = 8000
-        @vbv_maxrate_720p   = @old_behavior ? 6000 : 5000
-        @vbv_maxrate_480p   = @old_behavior ? 3000 : 2500
-        @ac3_bitrate        = 640
-        @pass_ac3_bitrate   = 640
+        @vbv_maxrate_720p   = @old_behavior ? 4000 : 3000
+        @vbv_maxrate_480p   = @old_behavior ? 2000 : 1600
       end
 
       opts.on '--quick' do
@@ -374,6 +367,12 @@ HERE
         end
       end
 
+      opts.on '--target ARG', Integer do |arg|
+        @target_bitrate = arg
+        @abr_bitrate = nil
+        @vbr_quality = nil
+      end
+
       opts.on '--force-rate ARG' do |arg|
         unless arg =~ /^[1-9][0-9]*(?:\.[0-9]+)?$/
           fail UsageError, "invalid force rate argument: #{arg}"
@@ -610,9 +609,10 @@ HERE
       end
 
       opts.on '--old-behavior' do
+        Console.warn 'Using deprecated option: --old-behavior'
         @old_behavior = true
-        @vbv_maxrate_720p = 6000 if @vbv_maxrate_720p == 5000
-        @vbv_maxrate_480p = 3000 if @vbv_maxrate_480p == 2500
+        @vbv_maxrate_720p = 6000
+        @vbv_maxrate_480p = 3000
         @abr_bitrate = nil
         @vbr_quality = nil
       end
@@ -818,18 +818,28 @@ HERE
 
         handbrake_options['quality'] = @old_behavior ? '16' : '1'
 
-        unless media.info[:directory]
-          bitrate = ((((media.info[:size] * 8) / media.info[:duration]) / 1000) / 1000) * 1000
+        if @target_bitrate.nil?
+          unless media.info[:directory]
+            bitrate = ((((media.info[:size] * 8) / media.info[:duration]) / 1000) / 1000) * 1000
 
-          if bitrate < vbv_maxrate
-            min_bitrate = vbv_maxrate / 2
+            if bitrate < vbv_maxrate
+              min_bitrate = vbv_maxrate / 2
 
-            if bitrate < min_bitrate
-              vbv_maxrate = min_bitrate
-            else
-              vbv_maxrate = bitrate
+              if bitrate < min_bitrate
+                vbv_maxrate = min_bitrate
+              else
+                vbv_maxrate = bitrate
+              end
             end
           end
+        else
+          if @target_bitrate < 2
+            vbv_maxrate = 2
+          elsif @target_bitrate > 300000
+            vbv_maxrate = 300000
+          else
+            vbv_maxrate = @target_bitrate
+          end
         end
 
         encoder_options['vbv-maxrate']  = vbv_maxrate.to_s

data/lib/video_transcoding/version.rb

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

metadata

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