video_transcoding 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eee67d682d1fca2bcf4fc34cf8fe9e3c5d907af8a92bfb31f5d260378992f14c
-  data.tar.gz: a4dbf00b048a9e123d519dffe6b2ffdd99a7d44019ce39f4c95be83e5e5156e0
+  metadata.gz: 6d5b8d915baa00f225ed048693db2d56211f11be8b8ed7fde1a67a71ee90abb7
+  data.tar.gz: c5cb49798fcea529d7ec5a0903f088e726a54b97bec98f2a48bc918777279136
 SHA512:
-  metadata.gz: 91d460a5108997257acbbfab99d4249a492928d2b449314ad18f82159206332bc48283866c7e1f079ac766faf63ef4d00f3a5f6b87e8cb059c8a44f454896076
-  data.tar.gz: 1b23cf95baea10e7fa91f3fd88602de7864a2c33716a180cc9fa04e32cc4a87a7ea1654c053cc48c06489785289f89bef407e539f8315185a8c5ca06aaafc59a
+  metadata.gz: 0771776f309d423d0fc2e324521c8484adf18bd1b3b348df23c856cc9d1439ee2135c53122ddb4eeb6f58aa8f6160b036a8bc3535e4ae217471d0c7db18d7862
+  data.tar.gz: a7b1508028c17f07e1ac9da18c4a2ddb06d5bd5d56d08965739b66ce64fb3f22bb5a4ab17152830715934ff5e58cb40ace75d60c2d3bce991813b69702a0be99

data/README.md

@@ -689,6 +689,14 @@ For a few problematic videos, I have to apply options like `--force-rate 23.976
 
 ## History
 
+### [0.21.1](https://github.com/donmelton/video_transcoding/releases/tag/0.21.1)
+
+Sunday, December 2, 2018
+
+* Fix a bug in `transcode-video` creating MP3 instead of AAC audio in MKV output on Windows. This was caused by a previous optimization not passing a named AAC audio encoder to `HandBrakeCLI`, i.e. `ca_aac` or `av_aac`. Apparently the default is different on Windows. Go figure. Thanks, [@samhutchins](https://github.com/samhutchins)! Via [ #235](https://github.com/donmelton/video_transcoding/issues/235).
+* Add a workaround in `transcode-video` for HandBrake nightly builds not setting the mixdown of multichannel audio track inputs to Dolby Pro Logic II format at 160 Kbps when the output is AAC stereo. Apparently the new default for that type of input is 5.1 channels at 384 Kbps, which wouldn't play on most Roku or Apple TV devices without re-transcoding or non-standard software. Again, go figure.
+* Add a workaround in `transcode-video` and `convert-video` for HandBrake nightly builds not copying mono or stereo audio track inputs which are already in AAC format.
+
 ### [0.21.0](https://github.com/donmelton/video_transcoding/releases/tag/0.21.0)
 
 Friday, November 9, 2018

data/bin/convert-video

@@ -130,7 +130,7 @@ HERE
         if @double and media.info[:audio][1][:channels] > 2.0
           if  track_order.size > 1 and
               media.info[:audio][1][:language] == media.info[:audio][2][:language] and
-              media.info[:audio][2][:format] == 'AAC' and
+              media.info[:audio][2][:format] =~ /^AAC/ and
               media.info[:audio][2][:channels] <= 2.0
             first = track_order[0]
             track_order[0] = track_order[1]
@@ -161,7 +161,7 @@ HERE
               "-b:a:#{stream}", '640k'
             ])
           elsif media.info[:audio][track][:channels] <= 2.0 and
-                media.info[:audio][track][:format] != 'AAC' and
+                not media.info[:audio][track][:format] =~ /^AAC/ and
                 not ac3_format?(media.info[:audio][track][:format])
             copy_options.concat([
               "-ac:a:#{stream}", '2',
@@ -294,7 +294,7 @@ HERE
         if  @double and
             track_order.size > 1 and
             media.info[:audio][1][:language] == media.info[:audio][2][:language] and
-            media.info[:audio][1][:format] == 'AAC' and
+            media.info[:audio][1][:format] =~ /^AAC/ and
             media.info[:audio][1][:channels] <= 2.0 and
             media.info[:audio][2][:channels] > 2.0
           first = track_order[0]

data/bin/transcode-video

@@ -1031,7 +1031,7 @@ HERE
         end
       end
 
-      tracks, encoders, bitrates, names = [], [], [], []
+      tracks, encoders, bitrates, mixdowns, names = [], [], [], [], []
 
       add_surround = ->(info, copy) do
         bitrate = info[:bps].nil? ? 640 : info[:bps] / 1000
@@ -1052,14 +1052,18 @@ HERE
             bitrates << @ac3_bitrate.to_s
           end
         end
+
+        mixdowns << ''
       end
 
       add_stereo = ->(info, copy) do
-        if copy or (info[:format] == 'AAC' and info[:channels] <= 2.0)
+        if copy or (info[:format] =~ /^AAC/ and info[:channels] <= 2.0)
           encoders << 'copy'
+          mixdowns << ''
         else
-          @aac_encoder ||= ''
+          @aac_encoder ||= HandBrake.aac_encoder
           encoders << @aac_encoder
+          mixdowns << (info[:channels] > 2.0 ? 'dpl2' : '')
         end
 
         bitrates << ''
@@ -1112,6 +1116,8 @@ HERE
       handbrake_options['audio-fallback'] = @ac3_encoder unless @copy_audio.empty?
       bitrates = bitrates.join(',')
       handbrake_options['ab'] = bitrates if bitrates.gsub(/,/, '') != ''
+      mixdowns = mixdowns.join(',')
+      handbrake_options['mixdown'] = mixdowns if mixdowns.gsub(/,/, '') != ''
       names = names.join(',')
       handbrake_options['aname'] = names if names.gsub(/,/, '') != ''
     end

data/lib/video_transcoding/handbrake.rb

@@ -26,5 +26,41 @@ module VideoTranscoding
     def command_name
       Tool.use(COMMAND_NAME)
     end
+
+    def aac_encoder
+      properties = Tool.properties(COMMAND_NAME)
+
+      unless properties.has_key? :aac_encoder
+        if help_text =~ /ca_aac/
+          properties[:aac_encoder] = 'ca_aac'
+        else
+          properties[:aac_encoder] = 'av_aac'
+        end
+      end
+
+      properties[:aac_encoder]
+    end
+
+    private
+
+    def help_text
+      properties = Tool.properties(COMMAND_NAME)
+
+      unless properties.has_key? :help_text
+        properties[:help_text] = ''
+
+        begin
+          IO.popen([Tool.use(COMMAND_NAME), '--help'], :err=>[:child, :out]) do |io|
+            properties[:help_text] = io.read
+          end
+        rescue SystemCallError => e
+          raise "#{COMMAND_NAME} help text unavailable: #{e}"
+        end
+
+        fail "#{COMMAND_NAME} failed during execution" unless $CHILD_STATUS.exitstatus == 0
+      end
+
+      properties[:help_text]
+    end
   end
 end

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.21.0'
+  VERSION = '0.21.1'
 end

metadata

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