video_transcoding 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38697aabb50a4a188972d30c2685e4bed420b665
-  data.tar.gz: 38281c797f61207aeda01ba7726b4bd1d0084459
+  metadata.gz: ea1e5f908d34e4290159cef2ead3dc50c75f6f4e
+  data.tar.gz: 699559bd07d8e133272ac7222520cc5d14d3183e
 SHA512:
-  metadata.gz: 9d54dc4115b8b30d6c081a95fa65907df09415a49acc5bb32d0850ed5fd228a152a061c1c206407da818a05c95ab1cdeaede34f73ca18e4c50db7221ba532ecd
-  data.tar.gz: 471c07eec8486705658046d480919a81aa118c357dcb021948e26ad332de5c3ae1b566aa70e123dd8706c6c9dab0add3717e161c38e732ecfb6d894f54530539
+  metadata.gz: bd714b6cd993f10849fccd7d24ce15143fc16577ffe3809bf0b4ec7958965aca47ae4813b38aacc150bd475db56d754aea3bf675a43c5ef807f206907161edf4
+  data.tar.gz: 6db85f92780f16e2d5d88de5fd298c44f52f55bdef3b47c2153cec0ceacf9e051c7eb9ebdf899ac70cff1fa46796d0ff182ad58f9adda3c4022cdbbba2be6d7c

data/README.md

@@ -12,16 +12,16 @@ This package is based on my original collection of [Video Transcoding Scripts](h
 
 Most of the tools in this package are essentially intelligent wrappers around Open Source software like [HandBrake](https://handbrake.fr/), [MKVToolNix](https://www.bunkus.org/videotools/mkvtoolnix/), [MPlayer](http://mplayerhq.hu/), [FFmpeg](http://ffmpeg.org/), and [MP4v2](https://code.google.com/p/mp4v2/). And they're all designed to be executed from the command line shell:
 
-* [`transcode-video`](#whytranscode-video)
+* [`transcode-video`](#why-transcode-video)
 Transcode video file or disc image directory into format and size similar to popular online downloads.
 
-* [`detect-crop`](#whydetect-crop)
+* [`detect-crop`](#why-detect-crop)
 Detect optimal crop values for video file or disc image directory.
 
-* [`convert-video`](#whyconvert-video)
+* [`convert-video`](#why-convert-video)
 Convert video file from Matroska to MP4 format or from MP4 to Matroksa format without transcoding video.
 
-* [`query-handbrake-log`](#whyquery-handbrake-log)
+* [`query-handbrake-log`](#why-query-handbrake-log)
 Report information from HandBrake-generated `.log` files.
 
 Even if you don't try any of my tools, you may find this "README" document helpful:
@@ -300,6 +300,10 @@ However, you can copy the original audio track, provided HandBrake and your sele
 
     transcode-video --copy-audio 1 "/path/to/Movie.mkv"
 
+The `--copy-audio` option doesn't implicitly add the audio track to be copied. The previous command works because `1` identifies the main audio track and it's included by default. To copy a different track, you must first add it:
+
+    transcode-video --add-audio 4 --copy-audio 4 "/path/to/Movie.mkv"
+
 Be aware that copying audio tracks in their original format will likely defeat two very important goals of transcoding: portability and compression.
 
 #### Understanding subtitles

data/bin/transcode-video

@@ -978,7 +978,7 @@ HERE
     def prepare_subtitle(media, handbrake_options)
       return if media.info[:subtitle].empty?
 
-      if @auto_burn
+      if @auto_burn and not media.info[:mp4]
         burn_track, _ = media.info[:subtitle].find { |_, info| info[:forced] }
       else
         burn_track = @burn_subtitle

data/lib/video_transcoding/media.rb

@@ -51,9 +51,9 @@ module VideoTranscoding
       @info = {}
 
       if @title.nil?
-        if @scan =~ /\+ title ([0-9]+):\n  \+ Main Feature/m
+        if @scan =~ /\+ title ([0-9]+):\r?\n  \+ Main Feature/m
           @title = $1.to_i
-        elsif @scan =~ /^\+ title ([0-9]+):$/
+        elsif @scan =~ /^\+ title ([0-9]+):/
           @title = $1.to_i
         else
           @title = 1
@@ -70,7 +70,7 @@ module VideoTranscoding
       @info[:size]      = @stat.size
       @info[:directory] = @stat.directory?
 
-      unless @scan =~ /^  \+ duration: ([0-9]{2}):([0-9]{2}):([0-9]{2})$/
+      unless @scan =~ /^  \+ duration: ([0-9]{2}):([0-9]{2}):([0-9]{2})/
         fail 'media duration not found'
       end
 
@@ -92,7 +92,7 @@ module VideoTranscoding
 
       return @info unless @extended
 
-      unless @scan =~ /  \+ audio tracks:\n(.*)  \+ subtitle tracks:\n(.*)HandBrake has exited./m
+      unless @scan =~ /  \+ audio tracks:\r?\n(.*)  \+ subtitle tracks:\r?\n(.*)\r?\nHandBrake has exited./m
         fail 'audio and subtitle information not found'
       end
 
@@ -101,7 +101,7 @@ module VideoTranscoding
       @info[:audio]     = {}
       @info[:subtitle]  = {}
 
-      audio.each_line do |line|
+      audio.gsub(/\r/, '').each_line do |line|
         if line =~ /^    \+ ([0-9.]+), [^(]+\(([^)]+)\) .*\(([0-9.]+) ch\) .*\(iso639-2: ([a-z]{3})\)/
           track                 = $1.to_i
           track_info            = {}
@@ -121,7 +121,7 @@ module VideoTranscoding
         end
       end
 
-      subtitle.each_line do |line|
+      subtitle.gsub(/\r/, '').each_line do |line|
         if line =~ /^    \+ ([0-9.]+), .*\(iso639-2: ([a-z]{3})\) \((?:Text|Bitmap)\)\(([^)]+)\)/
           track                   = $1.to_i
           track_info              = {}
@@ -166,7 +166,7 @@ module VideoTranscoding
               track_info[:default] = false
             end
 
-            if @scan =~ /[ ]+Stream #0\.#{stream}[^ ]*: Audio: [^\n]+\n[ ]+Metadata:\n^[ ]+title[ ]+: ([^\n]+)/m
+            if @scan =~ /[ ]+Stream #0\.#{stream}[^ ]*: Audio: [^\n]+\n[ ]+Metadata:\r?\n^[ ]+title[ ]+: ([^\r\n]+)/m
               track_info[:name] = $1
             else
               track_info[:name] = nil
@@ -188,7 +188,7 @@ module VideoTranscoding
               track_info[:forced] = false
             end
 
-            if @scan =~ /[ ]+Stream #0\.#{stream}[^ ]*: Subtitle: [^\n]+\n[ ]+Metadata:\n^[ ]+title[ ]+: ([^\n]+)/m
+            if @scan =~ /[ ]+Stream #0\.#{stream}[^ ]*: Subtitle: [^\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.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Don Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Video Transcoding is a package of tools to transcode, inspect
@@ -46,6 +46,7 @@ files:
 - lib/video_transcoding/tool.rb
 - lib/video_transcoding/version.rb
 - video_transcoding-0.1.0.gem
+- video_transcoding-0.1.1.gem
 - video_transcoding.gemspec
 homepage: https://github.com/donmelton/video_transcoding
 licenses: