video_transcoding 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2a3ee4c7111881f0ca85d612bbb715fc401c3a7
-  data.tar.gz: a7d271b0bea0631b4160a782579f2795cd679e27
+  metadata.gz: f473590263e13e9651405d29aac6923931e2e7ce
+  data.tar.gz: c106e10d026d8f784e616da4cc983e3ac7fae120
 SHA512:
-  metadata.gz: deda8c3414b1589cee0b5e4043e50029aae011810ef340b4bdb562b9fd9205295241c009d64a7fb112aaea33964833c8017a31a5fbc15d0be00528524bb9f6b0
-  data.tar.gz: 19e5084afb13b889de1ebb8cc868180184990ad42ff95a412dd3c819ceee711f1c0d4f3b12576dba41954d4b8f969bf878156d793085e15794fbd74b188eea63
+  metadata.gz: ab2819953f8ad74407948cc485c4b38eee6a83df9d55c26b34f4f3bd77115b8c7f28f5682b56ce1dcde651410c4c33b78505e2da10a34e440f0918c9931da8b1
+  data.tar.gz: 25a1feffd51663c3d7dc8e1e98c6b3516ff277c2b63168a134deda5b0ac80f7841541389cbedb5df508b744e395b2e4fde497d112257038ca2c05298a0cf860a

data/README.md

@@ -641,6 +641,14 @@ For a few problematic videos, I have to apply options like `--force-rate 23.976
 
 ## History
 
+### [0.10.0](https://github.com/donmelton/video_transcoding/releases/tag/0.10.0)
+
+Friday, May 6, 2016
+
+* Add resolution-specific qualifiers to the `--target` option in `transcode-video`. This allows different video bitrate targets for inputs with different resolutions. For example, you can use `--target 1080p=6500` alone to change the target for Blu-ray Discs and not DVDs. Or you could combine that with `--target 480p=2500` to affect both resolutions. Via [ #68](https://github.com/donmelton/video_transcoding/pull/68) from [@turley](https://github.com/turley).
+* Fix a bug in `transcode-video` where video bitrate targets were not reset when the `--small` or `--small-video` options followed the `--target` option on the command line.
+* Fix a bug where `query-handbrake-log` would fail for `time` or `speed` on OS X or Linux when parsing .log files created on Windows. This was due to a regular expression not expecting a carriage return (CR) before a line feed (LF), i.e. a Windows-style line ending (CRLF). Via [ #67](https://github.com/donmelton/video_transcoding/issues/67) from [@lambdan](https://github.com/lambdan).
+
 ### [0.9.0](https://github.com/donmelton/video_transcoding/releases/tag/0.9.0)
 
 Monday, May 2, 2016

data/bin/query-handbrake-log

@@ -145,7 +145,7 @@ HERE
               if fps_line.nil?
                 fps_line = line
               elsif fps_line_2.nil?
-                if fps_line =~ / ([0.]+) fps$/
+                if fps_line =~ / ([0.]+) fps\r?$/
                   fps_line = line
                 else
                   fps_line_2 = line
@@ -173,7 +173,7 @@ HERE
           else
             Console.debug fps_line
 
-            if fps_line =~ / ([0-9.]+) fps$/
+            if fps_line =~ / ([0-9.]+) fps\r?$/
               fps = $1
             else
               fail "fps not found: #{log}"
@@ -182,7 +182,7 @@ HERE
             unless fps_line_2.nil?
               Console.debug fps_line_2
 
-              if fps_line_2 =~ / ([0-9.]+) fps$/
+              if fps_line_2 =~ / ([0-9.]+) fps\r?$/
                 fps_2 = $1
                 fps = (1 / ((1 / fps.to_f) + (1 / fps_2.to_f))).round(6).to_s
               else

data/bin/transcode-video

@@ -79,9 +79,11 @@ 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
+    --target [1080p=|720p=|480p=]BITRATE
                     set video bitrate target (default: based on input)
+                      or target for specific input resolution
                       (can be exceeded to maintain video quality)
+                      (can be used multiple times)
     --force-rate FPS
                     force constant video frame rate
                       (`23.976` applied automatically for some inputs)
@@ -311,6 +313,7 @@ HERE
         @vbv_maxrate_480p   = 1600
         @ac3_bitrate        = 384
         @pass_ac3_bitrate   = 448
+        @target_bitrate     = nil
       end
 
       opts.on '--small-video' do
@@ -318,6 +321,7 @@ HERE
         @vbv_maxrate_1080p  = 5000
         @vbv_maxrate_720p   = 3000
         @vbv_maxrate_480p   = 1600
+        @target_bitrate     = nil
       end
 
       opts.on '--quick' do
@@ -394,8 +398,31 @@ HERE
         end
       end
 
-      opts.on '--target ARG', Integer do |arg|
-        @target_bitrate = arg
+      opts.on '--target ARG' do |arg|
+        if arg =~ /^([0-9]+p)=([1-9][0-9]*)$/
+          bitrate = $2.to_i
+
+          case $1
+          when '2160p'
+            @vbv_maxrate_2160p = bitrate
+          when '1080p'
+            @vbv_maxrate_1080p = bitrate
+          when '720p'
+            @vbv_maxrate_720p = bitrate
+          when '480p'
+            @vbv_maxrate_480p = bitrate
+          else
+            fail UsageError, "invalid target video bitrate resolution: #{$1}"
+          end
+
+          @target_bitrate = nil
+        else
+          unless arg =~ /^[1-9][0-9]*$/
+            fail UsageError, "invalid rate argument: #{arg}"
+          end
+          @target_bitrate = arg.to_i
+        end
+
         @abr_bitrate = nil
         @vbr_quality = nil
       end

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

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