video_transcoding 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf08cb980d1fb3fbeea65f3785825cba62a2072
-  data.tar.gz: b72309cbf62bf637f18651cb725c62226ec21c1d
+  metadata.gz: a80da681f701c9145241ab7427a34189885db02d
+  data.tar.gz: bb82f1a8edb1bb6ee6da02362146fa8cdbbf2b4f
 SHA512:
-  metadata.gz: ee60f14f84e2776ca015a94b8baffb97e27d1c379fe30925bbc0ab4ccb765478db832ffa4966b406df3787e32f5cad084db54129701c152fda791c9a10221fc2
-  data.tar.gz: cd49f7bbc29897be2afa3c927530af7685a65d9bf6aa27b25567e4b926591b5c56a886afd223a91e269604f8e7ccacbf5e7a461683a5922910e28b9d44458b3b
+  metadata.gz: 587f0b77d7804f4a65a5aa1aee7c802cd34b5ea25248b5d78ab02b9c44efbdbaca6db6ccec57b770a6a81070b3799100e599364d03bb83d7f538798388de3f66
+  data.tar.gz: dcdb174cfdd6fe0f379169ca569195efc6df074315c4cc3b39253caf92311e71016d0ea44e3cf46fe98fac16bb8da5d24b4bca7ea9256dc5a4c379b1480901b7

data/README.md

@@ -62,7 +62,6 @@ Most of the tools in this package require other software to function properly, s
 
 * `HandBrakeCLI`
 * `ffmpeg`
-* `mkvmerge`
 * `mkvpropedit`
 * `mp4track`
 * `mplayer`
@@ -370,7 +369,7 @@ Which creates this Matroska file in the current working directory:
 
 If necessary, the `convert-video` tool may transcode audio tracks to AAC or Dolby Digital AC-3 format when converting to MP4 format.
 
-Chapter markers and metadata such as track titles are preserved. However, be aware that subtitle tracks are not converted.
+Chapter markers, metadata such as track titles and most subtitles are converted. However, be aware that any Blu-ray Disc-format subtitles are ignored.
 
 ### Using `query-handbrake-log`
 
@@ -659,6 +658,25 @@ For a few problematic videos, I have to apply options like `--force-rate 23.976
 
 ## History
 
+### [0.15.0](https://github.com/donmelton/video_transcoding/releases/tag/0.15.0)
+
+Sunday, January 15, 2017
+
+* Modify `convert-video`, via [ #114](https://github.com/donmelton/video_transcoding/issues/114), to:
+    * Add support for text-based and DVD-style image-based subtitles. Please note that Blu-ray Disc-style image-based subtitles are _not_ supported due to MP4 format restrictions. 
+    * Add a `--no-double` option which no longer assumes input files might contain two main audio tracks whose order needs to be swapped, or that a "missing" stereo AAC audio track needs to be added to MP4 output.
+    * Change the algoritm deciding when a "missing" stereo AAC audio track is added. Previously that only happened when the first track of the input MKV file was in surround format and there were no other audio tracks. Now it won't matter how many audio tracks are in the input.
+    * Use `ffmpeg` and `mkvpropedit` for conversion to MKV format instead of just `mkvmerge` which could not convert subtitle formats.
+    * Remove the dependency on `mkvmerge` and add a dependency on `mkvpropedit`.
+    * No longer pass the `-strict experimental` arguments to `ffmpeg` when using the built-in, native AAC encoder.
+* Fix a bug preventing the detection of whether an audio track had the "default" flag set when parsing scan output from `HandBrakeCLI` versions 1.0.0 and later. This was caused by the integration of Libav version 12.0 in HandBrake on December 17, 2016.
+* Fix a long-standing bug preventing the detection of all subtitles and disambiguation with chapter information in MP4 files when parsing scan output from `mp4track`.
+* Remove support for the Freeware Advanced Audio Coder (FAAC) from the "FFmpeg" module since it's no longer included with `ffmpeg`.
+* Remove the "mkvmerge.rb" source file and any references to the "MKVmerge" module since `convert-video` no longer needs it.
+* Update the "README" document to:
+    * Remove `mkvmerge` from the "Requirements" section.
+    * Clarify subtitle support in the "Using `convert-video`" section.
+
 ### [0.14.0](https://github.com/donmelton/video_transcoding/releases/tag/0.14.0)
 
 Wednesday, January 4, 2017

data/bin/convert-video

@@ -32,6 +32,8 @@ Usage: #{$PROGRAM_NAME} [OPTION]... [FILE]...
                       (default: input filename with output format extension
                         in current working directory)
     --use-m4v       use `.m4v` extension instead of `.mp4` for MP4 output
+    --no-double     don't swap order of first two audio tracks
+                      or add stereo copy of main surround track
 
 -v, --verbose       increase diagnostic information
 -q, --quiet         decrease     "           "
@@ -39,7 +41,7 @@ Usage: #{$PROGRAM_NAME} [OPTION]... [FILE]...
 -h, --help          display this help and exit
     --version       output version information and exit
 
-Requires `HandBrakeCLI`, `mp4track`, `ffmpeg` and `mkvmerge`.
+Requires `HandBrakeCLI`, `mp4track`, `ffmpeg` and `mkvpropedit`.
 HERE
     end
 
@@ -47,11 +49,13 @@ HERE
       super
       @output   = nil
       @use_m4v  = false
+      @double   = true
     end
 
     def define_options(opts)
       opts.on('-o', '--output ARG') { |arg| @output = arg }
       opts.on('--use-m4v')          { @use_m4v = true }
+      opts.on('--no-double')        { @double = false }
     end
 
     def configure
@@ -62,7 +66,7 @@ HERE
       HandBrake.setup
       MP4track.setup
       FFmpeg.setup
-      MKVmerge.setup
+      MKVpropedit.setup
     end
 
     def process_input(arg)
@@ -111,26 +115,18 @@ HERE
         track_order = media.info[:audio].keys
         stream = 0
 
-        if media.info[:audio][1][:channels] > 2.0
-          if track_order.size > 1
-            if  media.info[:audio][1][:language] == media.info[:audio][2][:language] 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]
-              track_order[1] = first
-            end
+        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][:channels] <= 2.0
+            first = track_order[0]
+            track_order[0] = track_order[1]
+            track_order[1] = first
           else
             map_options.concat([
               '-map', "0:#{media.info[:audio][1][:stream]}"
             ])
-
-            if FFmpeg.aac_encoder == 'aac'
-              copy_options.concat([
-                '-strict', 'experimental'
-              ])
-            end
-
             copy_options.concat([
               '-ac', '2',
               '-c:a:0', FFmpeg.aac_encoder,
@@ -150,17 +146,11 @@ HERE
             copy_options.concat([
               '-ac', '6',
               "-c:a:#{stream}", 'ac3',
-              "-b:a:#{stream}", '384k'
+              "-b:a:#{stream}", '640k'
             ])
           elsif media.info[:audio][track][:channels] <= 2.0 and
                 media.info[:audio][track][:format] != 'AAC' and
                 media.info[:audio][track][:format] != 'AC3'
-            if FFmpeg.aac_encoder == 'aac'
-              copy_options.concat([
-                '-strict', 'experimental'
-              ])
-            end
-
             copy_options.concat([
               '-ac', '2',
               "-c:a:#{stream}", FFmpeg.aac_encoder,
@@ -176,35 +166,49 @@ HERE
         end
       end
 
-      ffmpeg_command = [
-        FFmpeg.command_name,
-        '-hide_banner',
-        '-nostdin',
-        '-i', media.path,
-        *map_options,
-        *copy_options,
-        output
-      ]
-      Console.debug ffmpeg_command
-      Console.info 'Converting with ffmpeg...'
+      forced_subtitle_track = 0
 
-      begin
-        IO.popen(ffmpeg_command, :err=>[:child, :out]) do |io|
-          Signal.trap 'INT' do
-            Process.kill 'INT', io.pid
+      unless media.info[:subtitle].empty?
+        track_order = media.info[:subtitle].keys
+        stream = 0
+
+        track_order.each do |track|
+          break unless media.info[:subtitle][track].has_key? :stream
+
+          subtitle_encoder = case media.info[:subtitle][track][:format]
+          when 'Text'
+            'mov_text'
+          when 'Bitmap'
+            if media.info[:subtitle][track][:encoding] == 'VOBSUB'
+              'copy'
+            else
+              nil
+            end
+          else
+            nil
           end
 
-          io.each_char do |char|
-            print char
+          unless subtitle_encoder.nil?
+            map_options.concat([
+              '-map', "0:#{media.info[:subtitle][track][:stream]}"
+            ])
+            copy_options.concat([
+              "-c:s:#{stream}", subtitle_encoder
+            ])
+            stream += 1
+
+            if forced_subtitle_track == 0 and media.info[:subtitle][track][:forced]
+              forced_subtitle_track = stream
+            end
           end
         end
-      rescue SystemCallError => e
-        raise "conversion failed: #{e}"
       end
 
-      fail "conversion failed: #{media.path}" unless $CHILD_STATUS.exitstatus == 0
+      convert media, output, ['-movflags', 'disable_chpl', *map_options, *copy_options]
       mp4_media = Media.new(path: output, allow_directory: false)
-      Console.debug media.info
+      Console.debug mp4_media.info
+
+      last_track = 0
 
       mp4_media.info[:audio].each do |track, info|
         if track == 1 and not info[:default]
@@ -215,61 +219,198 @@ HERE
           enabled = nil
         end
 
-        unless enabled.nil?
-          begin
-            IO.popen([
-              MP4track.command_name,
-              '--track-index', track.to_s,
-              '--enabled', enabled,
-              output,
-            ], :err=>[:child, :out]) do |io|
-              io.each do |line|
-                Console.debug line
-              end
+        mp4_track_enable output, track, enabled
+        last_track += 1
+      end
+
+      mp4_media.info[:subtitle].each do |track, info|
+        if track == forced_subtitle_track and not info[:default]
+          enabled = 'true'
+        elsif track != forced_subtitle_track and info[:default]
+          enabled = 'false'
+        else
+          enabled = nil
+        end
+
+        mp4_track_enable output, last_track + track, enabled
+      end
+    end
+
+    def mp4_track_enable(output, track, enabled)
+      unless enabled.nil?
+        begin
+          IO.popen([
+            MP4track.command_name,
+            '--track-index', track.to_s,
+            '--enabled', enabled,
+            output,
+          ], :err=>[:child, :out]) do |io|
+            io.each do |line|
+              Console.debug line
             end
-          rescue SystemCallError => e
-            raise "adjusting audio enabled failed: #{e}"
           end
-
-          fail "adjusting audio enabled failed: #{output}" unless $CHILD_STATUS.exitstatus == 0
+        rescue SystemCallError => e
+          raise "adjusting audio enabled failed: #{e}"
         end
+
+        fail "adjusting audio enabled failed: #{output}" unless $CHILD_STATUS.exitstatus == 0
       end
     end
 
     def convert_to_mkv(media, output)
-      track_order = ['0:' + media.info[:stream].to_s]
-      track_name_options = []
+      map_options = [
+        '-map', "0:#{media.info[:stream]}"
+      ]
+      copy_options = [
+        '-c:v', 'copy'
+      ]
+      audio_track_names = {}
+
+      unless media.info[:audio].empty?
+        track_order = media.info[:audio].keys
+        stream = 0
+
+        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][:channels] <= 2.0 and
+            media.info[:audio][2][:channels] > 2.0
+          first = track_order[0]
+          track_order[0] = track_order[1]
+          track_order[1] = first
+        end
 
-      media.info[:audio].each do |_, info|
-        track_order << '0:' + info[:stream].to_s
-        track_name_options.concat([
-          '--track-name', "#{info[:stream]}:#{info[:name]}"
+        track_order.each do |track|
+          map_options.concat([
+            '-map', "0:#{media.info[:audio][track][:stream]}"
+          ])
+          copy_options.concat([
+            "-c:a:#{stream}", 'copy'
+          ])
+          stream += 1
+          audio_track_names[stream] = media.info[:audio][track][:name]
+        end
+      end
+
+      subtitle_track_names = {}
+      forced_subtitle_track = 0
+
+      unless media.info[:subtitle].empty?
+        track_order = media.info[:subtitle].keys
+        stream = 0
+
+        track_order.each do |track|
+          subtitle_encoder = case media.info[:subtitle][track][:format]
+          when 'Text'
+            'text'
+          when 'Bitmap'
+            if media.info[:subtitle][track][:encoding] == 'VOBSUB'
+              'dvdsub'
+            else
+              nil
+            end
+          else
+            nil
+          end
+
+          unless subtitle_encoder.nil?
+            map_options.concat([
+              '-map', "0:#{media.info[:subtitle][track][:stream]}"
+            ])
+            copy_options.concat([
+              "-c:s:#{stream}", subtitle_encoder
+            ])
+            stream += 1
+            subtitle_track_names[stream] = media.info[:subtitle][track][:name]
+
+            if forced_subtitle_track == 0 and media.info[:subtitle][track][:forced]
+              forced_subtitle_track = stream
+            end
+          end
+        end
+      end
+
+      convert media, output, [*map_options, *copy_options]
+      mkv_media = Media.new(path: output, allow_directory: false)
+      Console.debug mkv_media.info
+      mkvpropedit_options = [
+        '--tags', 'all:'
+      ]
+
+      mkv_media.info[:audio].each do |track, info|
+        unless audio_track_names[track].nil?
+          mkvpropedit_options.concat([
+            '--edit', "track:a#{track}",
+            '--set', "name=#{audio_track_names[track]}"
+          ])
+        end
+
+        if track == 1 and not info[:default]
+          default = 1
+        elsif track != 1 and info[:default]
+          default = 0
+        else
+          default = nil
+        end
+
+        unless default.nil?
+          mkvpropedit_options.concat([
+            '--edit', "track:a#{track}",
+            '--set', "flag-default=#{default}"
+          ])
+        end
+      end
+
+      mkv_media.info[:subtitle].each do |track, info|
+        unless subtitle_track_names[track].nil?
+          mkvpropedit_options.concat([
+            '--edit', "track:s#{track}",
+            '--set', "name=#{subtitle_track_names[track]}"
+          ])
+        end
+      end
+
+      if forced_subtitle_track != 0
+        mkvpropedit_options.concat([
+          '--edit', "track:s#{forced_subtitle_track}",
+          '--set', 'flag-forced=1'
         ])
       end
 
-      if  track_order.size > 2 and
-          media.info[:audio][1][:language] == media.info[:audio][2][:language] 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[1]
-        track_order[1] = track_order[2]
-        track_order[2] = first
+      Console.info 'Adjusting properties and tags with mkvpropedit...'
+
+      begin
+        IO.popen([
+          MKVpropedit.command_name,
+          *mkvpropedit_options,
+          output,
+        ], :err=>[:child, :out]) do |io|
+          io.each do |line|
+            Console.debug line
+          end
+        end
+      rescue SystemCallError => e
+        raise "Adjusting properties and tags failed: #{e}"
       end
 
-      mkvmerge_command = [
-        MKVmerge.command_name,
-        '--output', output,
-        '--track-order', track_order.join(','),
-        '--disable-track-statistics-tags'
+      fail "Adjusting properties and tags failed: #{output}" if $CHILD_STATUS.exitstatus == 2
+    end
+
+    def convert(media, output, ffmpeg_options)
+      ffmpeg_command = [
+        FFmpeg.command_name,
+        '-hide_banner',
+        '-nostdin',
+        '-i', media.path,
+        *ffmpeg_options,
+        output
       ]
-      mkvmerge_command += track_name_options unless track_name_options.empty?
-      mkvmerge_command << media.path
-      Console.debug mkvmerge_command
-      Console.info 'Converting with mkvmerge...'
+      Console.debug ffmpeg_command
+      Console.info 'Converting with ffmpeg...'
 
       begin
-        IO.popen(mkvmerge_command, :err=>[:child, :out]) do |io|
+        IO.popen(ffmpeg_command, :err=>[:child, :out]) do |io|
           Signal.trap 'INT' do
             Process.kill 'INT', io.pid
           end
@@ -282,7 +423,7 @@ HERE
         raise "conversion failed: #{e}"
       end
 
-      fail "conversion failed: #{media.path}" if $CHILD_STATUS.exitstatus == 2
+      fail "conversion failed: #{media.path}" unless $CHILD_STATUS.exitstatus == 0
     end
   end
 end

data/lib/video_transcoding/ffmpeg.rb

@@ -23,8 +23,6 @@ module VideoTranscoding
 
         if output =~ /--enable-libfdk-aac/
           properties[:aac_encoder] = 'libfdk_aac'
-        elsif output =~ /--enable-libfaac/
-          properties[:aac_encoder] = 'libfaac'
         else
           properties[:aac_encoder] = 'aac'
         end

data/lib/video_transcoding/media.rb

@@ -120,11 +120,12 @@ module VideoTranscoding
       end
 
       subtitle.gsub(/\r/, '').each_line do |line|
-        if line =~ /^    \+ ([0-9]+), .*\(iso639-2: ([a-z]{3})\) \((?:Text|Bitmap)\)\(([^)]+)\)/
+        if line =~ /^    \+ ([0-9]+), .*\(iso639-2: ([a-z]{3})\) \((Text|Bitmap)\)\(([^)]+)\)/
           track                   = $1.to_i
           track_info              = {}
           track_info[:language]   = $2
           track_info[:format]     = $3
+          track_info[:encoding]   = $4
           @info[:subtitle][track] = track_info
         end
       end
@@ -158,7 +159,7 @@ module VideoTranscoding
               track_info = @info[:audio][audio_track]
               track_info[:stream] = stream
 
-              if attributes =~ /\(default\)/
+              if @scan =~ /[ ]+Stream #0[.:]#{stream}[^ ]*: Audio: [^\n]+(?:\n[^\n]+)?\(default\)/m
                 track_info[:default] = true
               else
                 track_info[:default] = false
@@ -257,7 +258,7 @@ module VideoTranscoding
               track_info[:default] = flags[index]
               track_info[:name] = names[index]
             end
-          when 'text'
+          when '(sbtl)', '(subp)', 'text'
             subtitle_track += 1
 
             if @info[:subtitle].has_key? subtitle_track
@@ -270,6 +271,10 @@ module VideoTranscoding
 
           index += 1
         end
+
+        if subtitle_track > 0 and @scan =~ /[ ]+Chapter #0[.:]0: start /
+          @info[:subtitle].delete subtitle_track
+        end
       end
 
       @info

data/lib/video_transcoding/version.rb

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

data/lib/video_transcoding.rb

@@ -13,7 +13,6 @@ require 'video_transcoding/errors'
 require 'video_transcoding/ffmpeg'
 require 'video_transcoding/handbrake'
 require 'video_transcoding/media'
-require 'video_transcoding/mkvmerge'
 require 'video_transcoding/mkvpropedit'
 require 'video_transcoding/mp4track'
 require 'video_transcoding/mplayer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Don Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Video Transcoding is a package of tools to transcode, inspect
@@ -39,7 +39,6 @@ files:
 - lib/video_transcoding/ffmpeg.rb
 - lib/video_transcoding/handbrake.rb
 - lib/video_transcoding/media.rb
-- lib/video_transcoding/mkvmerge.rb
 - lib/video_transcoding/mkvpropedit.rb
 - lib/video_transcoding/mp4track.rb
 - lib/video_transcoding/mplayer.rb

data/lib/video_transcoding/mkvmerge.rb

@@ -1,35 +0,0 @@
-#
-# mkvmerge.rb
-#
-# Copyright (c) 2013-2017 Don Melton
-#
-
-module VideoTranscoding
-  module MKVmerge
-    extend self
-
-    COMMAND_NAME = 'mkvmerge'
-
-    def setup
-      Tool.provide(COMMAND_NAME, ['--version']) do |output, status, _|
-        fail "#{COMMAND_NAME} failed during execution" unless status == 0
-
-        unless output =~ /^mkvmerge v([0-9.]+)/
-          Console.debug output
-          fail "#{COMMAND_NAME} version unknown"
-        end
-
-        version = $1
-        Console.info "#{$MATCH} found..."
-
-        unless version =~ /^([0-9]+)\.([0-9]+)/ and (($1.to_i * 100) + $2.to_i) >= 700
-          fail "#{COMMAND_NAME} version 7.0.0 or later required"
-        end
-      end
-    end
-
-    def command_name
-      Tool.use(COMMAND_NAME)
-    end
-  end
-end