video_transcoding 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faea1ae1a2ac6a14167270f2ae3776edb72f7bbd
-  data.tar.gz: bba58ce4331c8d14e65d7de0b23518d2d89c4a73
+  metadata.gz: ebf08cb980d1fb3fbeea65f3785825cba62a2072
+  data.tar.gz: b72309cbf62bf637f18651cb725c62226ec21c1d
 SHA512:
-  metadata.gz: 0fb6446277b35dfaf6891f1065fa64f3c51e8b99d3e9370f8509de265202e19191c286a46db4f65945ff1a1a42ef44b0f27619764ce1dc18435fba740193e94b
-  data.tar.gz: e753397f951b625b6a9f297472dcfbab34b691db7238809cb77c7e1c61feb862e65091e0f87ff226217cd64e657a80f1ca5ebd0bf88696fd52c6672ce0be6900
+  metadata.gz: ee60f14f84e2776ca015a94b8baffb97e27d1c379fe30925bbc0ab4ccb765478db832ffa4966b406df3787e32f5cad084db54129701c152fda791c9a10221fc2
+  data.tar.gz: cd49f7bbc29897be2afa3c927530af7685a65d9bf6aa27b25567e4b926591b5c56a886afd223a91e269604f8e7ccacbf5e7a461683a5922910e28b9d44458b3b

data/README.md

@@ -659,6 +659,13 @@ For a few problematic videos, I have to apply options like `--force-rate 23.976
 
 ## History
 
+### [0.14.0](https://github.com/donmelton/video_transcoding/releases/tag/0.14.0)
+
+Wednesday, January 4, 2017
+
+* Add a `--prefer-ac3` option to `transcode-video`. This prefers Dolby Digital AC-3 over AAC format when encoding or copying audio, even when the original track channel layout is stereo or mono. It also sets the audio output "width" for all tracks to `surround`. Via [ #112](https://github.com/donmelton/video_transcoding/issues/112).
+* Fix a bug in the parsing of audio and subtitle track names that was introduced by the integration of Libav version 12.0 in HandBrake on December 17, 2016, affecting `HandBrakeCLI` versions 1.0.0 and later. This caused `transcode-video` to substitute any commas with underscores in added audio track names when used with those versions of `HandBrakeCLI`.
+
 ### [0.13.0](https://github.com/donmelton/video_transcoding/releases/tag/0.13.0)
 
 Monday, January 2, 2017

data/bin/transcode-video

@@ -124,6 +124,9 @@ Audio options:
                       with `surround` to allow single surround or stereo track
                       with `stereo` to allow only single stereo track
                       (can be used multiple times)
+    --prefer-ac3    prefer AC-3 over AAC format when encoding or copying audio
+                      even when original track channel layout is stereo or mono
+                      (sets audio output "width" for all tracks to `surround`)
     --ac3-bitrate 384|448|640
                     set AC-3 audio bitrate (default: 640)
     --pass-ac3-bitrate 384|448|640
@@ -239,6 +242,7 @@ HERE
       @audio_name                 = {}
       @audio_language             = []
       @audio_width                = {:main => :double, :other => :stereo}
+      @prefer_ac3                 = false
       @ac3_bitrate                = 640
       @pass_ac3_bitrate           = 640
       @copy_audio                 = []
@@ -533,6 +537,12 @@ HERE
         end
       end
 
+      opts.on '--prefer-ac3' do
+        @prefer_ac3 = true
+        @audio_width[:main] = :surround
+        @audio_width[:other] = :surround
+      end
+
       opts.on '--ac3-bitrate ARG', Integer do |arg|
         @ac3_bitrate = case arg
         when 384, 448, 640
@@ -1090,7 +1100,7 @@ HERE
             add_stereo.call info, copy
           end
         when :surround
-          if info[:channels] > 2.0
+          if @prefer_ac3 or (info[:channels] > 2.0)
             add_surround.call info, copy
           else
             add_stereo.call info, copy

data/lib/video_transcoding/media.rb

@@ -164,7 +164,7 @@ module VideoTranscoding
                 track_info[:default] = false
               end
 
-              if @scan =~ /[ ]+Stream #0[.:]#{stream}[^ ]*: Audio: [^\n]+\n[ ]+Metadata:\r?\n^[ ]+title[ ]+: ([^\r\n]+)/m
+              if @scan =~ /[ ]+Stream #0[.:]#{stream}[^ ]*: Audio: [^\n]+\n(?:[^\n]+\n)?[ ]+Metadata:\r?\n^[ ]+title[ ]+: ([^\r\n]+)/m
                 track_info[:name] = $1
               else
                 track_info[:name] = nil
@@ -189,7 +189,7 @@ module VideoTranscoding
                 track_info[:forced] = false
               end
 
-              if @scan =~ /[ ]+Stream #0[.:]#{stream}[^ ]*: Subtitle: [^\n]+\n[ ]+Metadata:\r?\n^[ ]+title[ ]+: ([^\r\n]+)/m
+              if @scan =~ /[ ]+Stream #0[.:]#{stream}[^ ]*: Subtitle: [^\n]+\n(?:[^\n]+\n)?[ ]+Metadata:\r?\n^[ ]+title[ ]+: ([^\r\n]+)/m
                 track_info[:name] = $1
               else
                 track_info[:name] = nil

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

metadata

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