video_transcoding 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29eebc020f0cc27788a421b97f279470c878e921
-  data.tar.gz: 9be1bbc36a975368fe8728a90e5f48bb07867ddc
+  metadata.gz: d2a3ee4c7111881f0ca85d612bbb715fc401c3a7
+  data.tar.gz: a7d271b0bea0631b4160a782579f2795cd679e27
 SHA512:
-  metadata.gz: 766b708eed7dce151ced3d97608559d220c184aa190430821338e58732b7d9e246017642e750e2446a2a78127478899c98b5760e048151b767d08bf272b0e260
-  data.tar.gz: 176e9563911cdeddf3ece35049ed91b418317f61fe8287a4c70af476a031afdcd6ef005d01dd2b4f9d6ea4d6ad20e345eadbc28c05a9a82b5198004fd81ea897
+  metadata.gz: deda8c3414b1589cee0b5e4043e50029aae011810ef340b4bdb562b9fd9205295241c009d64a7fb112aaea33964833c8017a31a5fbc15d0be00528524bb9f6b0
+  data.tar.gz: 19e5084afb13b889de1ebb8cc868180184990ad42ff95a412dd3c819ceee711f1c0d4f3b12576dba41954d4b8f969bf878156d793085e15794fbd74b188eea63

data/README.md

@@ -259,17 +259,23 @@ However, be aware that `detect` can fail if HandBrake and MPlayer disagree about
 
 By default, the `transcode-video` tool selects the first audio track in the input as the main audio track. This is the first track in the output and the default track for playback.
 
-But you can select any audio track as the main track. In this case, track number 3:
+But you can select any input audio track as the main track. In this case, track number 3:
 
     transcode-video --main-audio 3 "/path/to/Movie.mkv"
 
+Or you can select the first input audio track in a specific language using a three-letter code instead of a track index number. This command selects the first Spanish language track:
+
+    transcode-video --main-audio spa "/path/to/Movie.mkv"
+
+If no track in the target language is found, then selection defaults to the first audio track in the input.
+
 You can also give the main audio track a custom name:
 
     transcode-video --main-audio 3="Original Stereo" "/path/to/Movie.mkv"
 
 Unlike `HandBrakeCLI`, custom track names are allowed to contain commas.
 
-By default, only one audio track is selected. But you can add additional tracks, also with custom names:
+By default, only one track is selected as the main audio or default track. But you can add additional tracks, also with custom names:
 
     transcode-video --add-audio 4 --add-audio 5="Director Commentary" "/path/to/Movie.mkv"
 
@@ -277,11 +283,9 @@ Or you can add all audio tracks with a single option and argument:
 
     transcode-video --add-audio all "/path/to/Movie.mkv"
 
-You can even add audio tracks selected by their three-letter language code. This command adds all French and Spanish language tracks:
-
-    transcode-video --add-audio language=fre,spa "/path/to/Movie.mkv"
+You can also add audio tracks selected by their three-letter language code. This command adds all French and Spanish language tracks in the same order they're found in the input:
 
-If no main audio track has been selected before adding tracks by language code, the first track added becomes the main audio track.
+    transcode-video --add-audio fra,spa "/path/to/Movie.mkv"
 
 By default, the main audio track is transcoded in AAC format and, if the original is multi-channel surround sound, in Dolby Digital AC-3 format. Meaning the output can contain two tracks from the same source in different formats. So, main audio output is "wide" enough for "double" tracks.
 
@@ -289,23 +293,23 @@ Also by default, any added audio tracks are only transcoded in AAC format. Meani
 
 However, you can change the "width" of main audio or additional audio output using the `--audio-width` option. There are three possible widths: `double`, `surround` and `stereo`.
 
-Use this command to treat any additional audio tracks just like the main audio track:
+Use this command to treat any other additional audio tracks just like the main audio track:
 
-    transcode-video --audio-width all=double "/path/to/Movie.mkv"
+    transcode-video --audio-width other=double "/path/to/Movie.mkv"
 
 Or use this command to make main audio output as a single track but still allow it in surround format:
 
-    transcode-video --audio-width 1=surround "/path/to/Movie.mkv"
+    transcode-video --audio-width main=surround "/path/to/Movie.mkv"
 
 If possible, audio is first passed through in its original format, providing that format is either AC-3 or AAC. This hardly ever works for Blu-ray Discs but it often will for DVDs and other random videos.
 
-However, you can copy the original audio track, provided HandBrake and your selected file format support it:
+However, you can still copy audio tracks and maintain their original format, provided HandBrake and your selected file format support it:
 
-    transcode-video --copy-audio 1 "/path/to/Movie.mkv"
+    transcode-video --copy-audio all "/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:
+The `--copy-audio` option doesn't implicitly add audio tracks to be copied. Since only the main audio track is included by default, the previous command only tries to copy that track. To also copy another track, you must first add it:
 
-    transcode-video --add-audio 4 --copy-audio 4 "/path/to/Movie.mkv"
+    transcode-video --add-audio 4 --copy-audio all "/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.
 
@@ -637,39 +641,59 @@ For a few problematic videos, I have to apply options like `--force-rate 23.976
 
 ## History
 
-### 0.8.1
+### [0.9.0](https://github.com/donmelton/video_transcoding/releases/tag/0.9.0)
+
+Monday, May 2, 2016
+
+* Revise the syntax and behavior of the `--main-audio`, `--add-audio` and `--audio-width` options in `transcode-video`:
+    * Allow selecting the main audio output track by finding the first input track in a specific language. For example, `--main-audio spa` can now use a language code to select the first Spanish track. Previously, only track numbers were allowed as main audio selection arguments. Via [ #8](https://github.com/donmelton/video_transcoding/issues/8) from [@JMoVS](https://github.com/JMoVS).
+    * Allow assignment of an optional name to the main audio track when using a language code. For example, `--main-audio spa="Other Dialogue"` sets the track name in the same manner as using a track number.
+    * Restrict the default main audio track to the first track, i.e. track number `1`, if the `--main-audio` option is not used. Previously, the default main audio track could be the first track selected by the `--add-audio` option when a language code argument was used. This was a hack because, at that time, the `--main-audio` option itself couldn't select by language.
+    * No longer require or even allow `language=` to prefix a language code argument when using the `--add-audio` option. For example, use `--add-audio fra` to add all the French language tracks. This is much easier to type.
+    * Add argument shortcuts to select the `main` track or `other` non-main tracks when using the `--audio-width` option. Previously, tracks were selected only by track number or `all` at once. The `main` shortcut is useful when the main audio track number is unknown because it was selected using a language code. The `other` shortcut is useful when `all` would also modify the main audio track.
+* Revise the syntax of the `--add-subtitle` option in `transcode-video` to match the change to the `--add-audio` option which no longer requires or even allows `language=` to prefix a language code argument.
+* Add a `--tabular` option to `query-handbrake-log` in order to better format its output report for later import into a spreadsheet application. This uses a tab character instead of a single space as the field delimiter and suppresses the `fps` and `kbps` labels. Via [ #64](https://github.com/donmelton/video_transcoding/issues/64).
+* Fix a bug where `query-handbrake-log time` reported the wrong result when parsing .log files from output using a forced frame rate. It's possible this was a regression due to a change in HandBrake.
+* Remove a stray "TODO" comment line in `query-handbrake-log`.
+* Update the "README" document to:
+    * Revise the "Understanding audio" section to reflect new syntax and behavior in `transcode-video`.
+    * Add links to the "History" section for release numbers, pull requests, issues and contributors.
+    * Correct the release date for version 0.4.0 in the "History" section.
+    * Insert a missing "Via" and period in the 0.8.1 release information.
+
+### [0.8.1](https://github.com/donmelton/video_transcoding/releases/tag/0.8.1)
 
 Thursday, April 28, 2016
 
-* Fix a bug where `query-handbrake-log` reported the wrong `time` or `speed` when parsing .log files containing output from HandBrake subtitle scan mode, i.e. when using `--burn-subtitle scan` or `--force-subtitle scan` from `transcode-video`. Via #46 from @martinpickett.
-* Fix a bug where `query-handbrake-log ratefactor` failed if the number it was searching for was less than 10. This was due to HandBrake unexpectedly inserting a space before that number. Honestly, I doubt this ever happend before the new ratecontrol system debuted in 0.6.0. That's how good the new ratecontrol system is. #61 from @bmhayward
+* Fix a bug where `query-handbrake-log` reported the wrong `time` or `speed` when parsing .log files containing output from HandBrake subtitle scan mode, i.e. when using `--burn-subtitle scan` or `--force-subtitle scan` from `transcode-video`. Via [ #46](https://github.com/donmelton/video_transcoding/issues/46) from [@martinpickett](https://github.com/martinpickett).
+* Fix a bug where `query-handbrake-log ratefactor` failed if the number it was searching for was less than 10. This was due to HandBrake unexpectedly inserting a space before that number. Honestly, I doubt this ever happend before the new ratecontrol system debuted in 0.6.0. That's how good the new ratecontrol system is. Via [ #61](https://github.com/donmelton/video_transcoding/issues/61) from [@bmhayward](https://github.com/bmhayward).
 
-### 0.8.0
+### [0.8.0](https://github.com/donmelton/video_transcoding/releases/tag/0.8.0)
 
 Sunday, April 24, 2016
 
 * Add a `--no-constrain-crop` option to `transcode-video`. This changes the behavior of `--crop detect` to mimic the `--no-constrain` option in the `detect-crop` tool.
-* Add a `--fallback-crop` option to `transcode-video`. This selects fallback crop values, from HandBrake, MPlayer or no crop at all, if `--crop detect` fails. This makes the new `--no-constrain-crop` option more useful since failure is more likely without constraints. Via #56 from @cameronks.
-* Add a `--aac-encoder` option to `transcode-video`. This gives Windows and Linux users access to the Fraunhofer FDK AAC encoder if it's compiled into their version of `HandBrakeCLI`. Via #35 from @cnrd.
-* Allow a colon (":") instead of a just period (".") to separate the two numerical components of a stream identifier when parsing scan output from `HandBrakeCLI`. This ensures compatibility with different versions of libavcodec and should fix several mysterious bugs on some Linux configurations. Via #30 and #41 from @dgibbs64.
+* Add a `--fallback-crop` option to `transcode-video`. This selects fallback crop values, from HandBrake, MPlayer or no crop at all, if `--crop detect` fails. This makes the new `--no-constrain-crop` option more useful since failure is more likely without constraints. Via [ #56](https://github.com/donmelton/video_transcoding/issues/56) from [@cameronks](https://github.com/cameronks).
+* Add a `--aac-encoder` option to `transcode-video`. This gives Windows and Linux users access to the Fraunhofer FDK AAC encoder if it's compiled into their version of `HandBrakeCLI`. Via [ #35](https://github.com/donmelton/video_transcoding/pull/35) from [@cnrd](https://github.com/cnrd).
+* Allow a colon (":") instead of a just period (".") to separate the two numerical components of a stream identifier when parsing scan output from `HandBrakeCLI`. This ensures compatibility with different versions of libavcodec and should fix several mysterious bugs on some Linux configurations. Via [ #30](https://github.com/donmelton/video_transcoding/issues/30) and [ #41](https://github.com/donmelton/video_transcoding/issues/41) from [@dgibbs64](https://github.com/dgibbs64).
 * Maintain 480p video bitrate targets in `transcode-video` when scaling down to 480p using `--max-width 854 --max-height 480`. Via #58 from @mschout.
 * Remove the deprecated `--old-behavior` option in `transcode-video`.
 * Clarify the purpose of `--abr` and `--vbr` in the `--help` output of `transcode-video`.
 * Update the "README" document to:
-    * Add "FAQ" section. Via #26 from @reiesu and #59 from @dgibbs64.
+    * Add "FAQ" section. Via [ #26](https://github.com/donmelton/video_transcoding/issues/26) from [@reiesu](https://github.com/reiesu) and [ #59](https://github.com/donmelton/video_transcoding/issues/59) from [@dgibbs64](https://github.com/dgibbs64).
     * Add this "History" section.
     * Spell "rate control" as one word, like a real transcoding geek.
     * Insert a missing "you" in the first paragraph of the "Installation" section.
     * Mention and link to Linuxbrew in the "Requirements" section.
     * Describe the default ratecontrol system as a "modified constrained variable bitrate (CVBR) mode."
-    * Add example output when HandBrake and MPlayer disagree to the "Using `detect-crop`" section. Via #18 from @alanwsmith.
+    * Add example output when HandBrake and MPlayer disagree to the "Using `detect-crop`" section. Via [ #18](https://github.com/donmelton/video_transcoding/issues/18) from [@alanwsmith](https://github.com/alanwsmith).
     * Update the status of DTS-HD decoding for HandBrake and MakeMKV in the "Why convert lossless audio?" section.
 
-### 0.7.0
+### [0.7.0](https://github.com/donmelton/video_transcoding/releases/tag/0.7.0)
 
 Thursday, April 7, 2016
 
-* Once again, lower the video bitrate targets for 480p and 720p output in `transcode-video`. Note that 1080p and 2160p targets still remain unchanged.
+* Once again, lower the video bitrate targets for 480p and 720p output in `transcode-video`. Note that 1080p and 2160p targets still remain unchanged. Via [ #55](https://github.com/donmelton/video_transcoding/issues/55).
 * Update the "README" document to:
     * Reflect changes to the 480p and 720p video bitrate targets.
     * Revise description of and recommendation for the `--quick` option.
@@ -679,7 +703,7 @@ Thursday, April 7, 2016
 * Remove the deprecated `--big` option in `transcode-video`.
 * Separate `--small` and `--small-video` in the `--help` output of `transcode-video`.
 
-### 0.6.0
+### [0.6.0](https://github.com/donmelton/video_transcoding/releases/tag/0.6.0)
 
 Sunday, April 3, 2016
 
@@ -689,46 +713,46 @@ Sunday, April 3, 2016
     * Lower the video bitrate targets for 480p and 720p output to keep bitrates and file sizes closer to that produced by the old ratecontrol system. Note that 1080p and 2160p targets remain unchanged.
     * Add an `--old-behavior` option to restore the old ratecontrol system and video bitrate targets for users not yet wanting to change over. This option is only temporary and will soon be deprecated and then removed.
     * Update the "README" document to reflect changes to the 480p and 720p video bitrate targets.
-* Remove an obsolete `brew install caskroom/cask/brew-cask` line from the "README" document. Via #54 from @timsutton.
+* Remove an obsolete `brew install caskroom/cask/brew-cask` line from the "README" document. Via [ #54](https://github.com/donmelton/video_transcoding/pull/54) from [@timsutton](https://github.com/timsutton).
 
-### 0.5.1
+### [0.5.1](https://github.com/donmelton/video_transcoding/releases/tag/0.5.1)
 
 Thursday, February 25, 2016
 
-* Don't fail if the `ffmpeg` version string can't be parsed. Via #43 from @rementis, @Lambdafive and @kford.
+* Don't fail if the `ffmpeg` version string can't be parsed. Via [ #43](https://github.com/donmelton/video_transcoding/issues/43) from [@rementis](https://github.com/rementis), [@Lambdafive](https://github.com/Lambdafive) and [@kford](https://github.com/kford).
 * Remove the deprecated `--cvbr` option in `transcode-video`.
 
-### 0.5.0
+### [0.5.0](https://github.com/donmelton/video_transcoding/releases/tag/0.5.0)
 
 Thursday, January 14, 2016
 
 * Raise the default video bitrate targets and AC-3 audio bitrate limits in `transcode-video`:
     * Deprecate the `--big` option since its behavior is now the default. An informal survey via Twitter and Facebook showed that about 90% of users (including myself) responding were always using the `--big` option anyway to get higher quality.
     * Add a `--small` option to restore the old video bitrate targets and AC-3 audio bitrate limits.
-    * Add a `--small-video` option to restore only the old video bitrate targets. Via Facebook from @DaveHamilton.
+    * Add a `--small-video` option to restore only the old video bitrate targets. Via Facebook from [@DaveHamilton](https://github.com/DaveHamilton).
     * Update the "README" document to reflect all these changes.
 * Move `--abr` and `--vbr` to the advanced options section in the `--help` output of `transcode-video`.
 * Deprecate the experimental `--cvbr` option in `transcode-video`.
 
-### 0.4.0
+### [0.4.0](https://github.com/donmelton/video_transcoding/releases/tag/0.4.0)
 
-Monday, January 1, 2016
+Monday, January 11, 2016
 
 * Add a `--cvbr` option to `transcode-video`. This implements a very experimental variation of the default ratecontrol system with a target bitrate as its single argument. Use it for evaluation purposes only.
 
-### 0.3.1
+### [0.3.1](https://github.com/donmelton/video_transcoding/releases/tag/0.3.1)
 
 Friday, January 8, 2016
 
 * Fix compatibility with development/nightly builds of `HandBrakeCL` in `transcode-video`:
-    * Always force the x264 `medium` preset to override the new `veryfast` default value. Via #36 from @cnrd.
+    * Always force the x264 `medium` preset to override the new `veryfast` default value. Via [ #36](https://github.com/donmelton/video_transcoding/pull/36) from [@cnrd](https://github.com/cnrd).
     * Explicitly set the encoder profile to `high` to override the new `main` default value.
     * Explicitly (and dynamically) set the encoder level to override the new `4.0` default value. 
-* Fix a stupid regression from version 0.2.8 caused by a typo in the patch for the SubRip-format text file offset fix to `transcode-video`. Via #37 from @bpharriss.
+* Fix a stupid regression from version 0.2.8 caused by a typo in the patch for the SubRip-format text file offset fix to `transcode-video`. Via [ #37](https://github.com/donmelton/video_transcoding/issues/37) from [@bpharriss](https://github.com/bpharriss).
 * Be more lenient about `--encoder-option` arguments in `transcode-video` so `8x8dct` is allowed.
 * Always print the `HandBrakeCLI` version string to diagnostic output even if it can't be parsed.
 
-### 0.3.0
+### [0.3.0](https://github.com/donmelton/video_transcoding/releases/tag/0.3.0)
 
 Tuesday, January 5, 2016
 
@@ -736,58 +760,58 @@ Tuesday, January 5, 2016
 * Add a `--vbr` option to `transcode-video`. This implements a true VBR ratecontrol system with a constant ratefactor as its single argument, much like HandBrake's default behavior when using its `--quality` option. It's useful mostly for comparison testing against the default ratecontrol system.
 * Update all copyright notices to the year 2016.
 
-### 0.2.8
+### [0.2.8](https://github.com/donmelton/video_transcoding/releases/tag/0.2.8)
 
 Tuesday, January 5, 2016
 
-* Prevent the `--bind-srt-language` option in `transcode-video` from also setting the SubRip-format text file offset to the same value. This was a stupid copy and paste error since the initial project version. Via #25 from @arikalish.
-* Don't fail if the `HandBrakeCLI` version string can't be parsed. Via #29 from @paulbailey.
-* Don't fail if the `mp4track` version string can't be parsed. Via #27 from @dgibbs64.
-* Add a missing preposition to the last bullet point of the "Why MakeMKV?" section in the "README" document. Via #32 from @eventualbuddha.
+* Prevent the `--bind-srt-language` option in `transcode-video` from also setting the SubRip-format text file offset to the same value. This was a stupid copy and paste error since the initial project version. Via [ #25](https://github.com/donmelton/video_transcoding/pull/25) from [@arikalish](https://github.com/arikalish).
+* Don't fail if the `HandBrakeCLI` version string can't be parsed. Via [ #29](https://github.com/donmelton/video_transcoding/issues/29) from [@paulbailey](https://github.com/paulbailey).
+* Don't fail if the `mp4track` version string can't be parsed. Via [ #27](https://github.com/donmelton/video_transcoding/issues/27) from [@dgibbs64](https://github.com/dgibbs64).
+* Add a missing preposition to the last bullet point of the "Why MakeMKV?" section in the "README" document. Via [ #32](https://github.com/donmelton/video_transcoding/pull/32) from [@eventualbuddha](https://github.com/eventualbuddha).
 
-### 0.2.7
+### [0.2.7](https://github.com/donmelton/video_transcoding/releases/tag/0.2.7)
 
 Tuesday, July 7, 2015
 
-* Apply the `--subtitle-forced` option when scanning subtitles in `transcode-video`. Via #20 from @rhapsodians.
+* Apply the `--subtitle-forced` option when scanning subtitles in `transcode-video`. Via [ #20](https://github.com/donmelton/video_transcoding/issues/20) from [@rhapsodians](https://github.com/rhapsodians).
 
-### 0.2.6
+### [0.2.6](https://github.com/donmelton/video_transcoding/releases/tag/0.2.6)
 
 Wednesday, May 20, 2015
 
-* Prevent the user's file format choice from corrupting the output path in `transcode-video` and `convert-video`. Via #5 from @arikalish.
+* Prevent the user's file format choice from corrupting the output path in `transcode-video` and `convert-video`. Via [ #5](https://github.com/donmelton/video_transcoding/issues/5) from [@arikalish](https://github.com/arikalish).
 
-### 0.2.5
+### [0.2.5](https://github.com/donmelton/video_transcoding/releases/tag/0.2.5)
 
 Sunday, May 17, 2015
 
 * Simplify the calculation of `vbv-bufsize` in `transcode-video`.
 
-### 0.2.4
+### [0.2.4](https://github.com/donmelton/video_transcoding/releases/tag/0.2.4)
 
 Friday, May 15, 2015
 
-* Prevent an undefined method error if `HandBrakeCLI` removes tracks during scan. Via #15 from @blackoctopus.
+* Prevent an undefined method error if `HandBrakeCLI` removes tracks during scan. Via [ #15](https://github.com/donmelton/video_transcoding/issues/15) from [@blackoctopus](https://github.com/blackoctopus).
 
-### 0.2.3
+### [0.2.3](https://github.com/donmelton/video_transcoding/releases/tag/0.2.3)
 
 Tuesday, May 12, 2015
 
-* No longer fail on invalid audio and subtitle track information when parsing scan output from `HandBrakeCLI`. Via #11 from @eltito51 and #13 from @tchjunky.
+* No longer fail on invalid audio and subtitle track information when parsing scan output from `HandBrakeCLI`. Via [ #11](https://github.com/donmelton/video_transcoding/issues/11) from [@eltito51](https://github.com/eltito51) and [ #13](https://github.com/donmelton/video_transcoding/issues/13) from [@tchjunky](https://github.com/tchjunky).
 
-### 0.2.2
+### [0.2.2](https://github.com/donmelton/video_transcoding/releases/tag/0.2.2)
 
 Monday, May 11, 2015
 
 * Ensure the AC-3 passthru bitrate in `transcode-video` is never below the AC-3 encoding bitrate.
 
-### 0.2.1
+### [0.2.1](https://github.com/donmelton/video_transcoding/releases/tag/0.2.1)
 
 Sunday, May 10, 2015
 
-* Fix the `--main-audio` option in `transcode-video` by ensuring the `resolve_main_audio` method actually returns a result. Via #9 from @JMoVS.
+* Fix the `--main-audio` option in `transcode-video` by ensuring the `resolve_main_audio` method actually returns a result. Via [ #9](https://github.com/donmelton/video_transcoding/issues/9) from [@JMoVS](https://github.com/JMoVS).
 
-### 0.2.0
+### [0.2.0](https://github.com/donmelton/video_transcoding/releases/tag/0.2.0)
 
 Saturday, May 9, 2015
 
@@ -796,34 +820,34 @@ Saturday, May 9, 2015
 * Ignore the sometimes missing patch version when checking MPlayer.
 * Mention in the "README" document that custom track names and external subtitle file names are allowed to contain commas.
 
-### 0.1.4
+### [0.1.4](https://github.com/donmelton/video_transcoding/releases/tag/0.1.4)
 
 Friday, May 8, 2015
 
-* Fix a stupid regression from version 0.1.2 caused by the line endings fix on Windows. Via #7 from @brandonedling.
+* Fix a stupid regression from version 0.1.2 caused by the line endings fix on Windows. Via [ #7](https://github.com/donmelton/video_transcoding/issues/7) from [@brandonedling](https://github.com/brandonedling).
 
-### 0.1.3
+### [0.1.3](https://github.com/donmelton/video_transcoding/releases/tag/0.1.3)
 
 Friday, May 8, 2015
 
-* Check the extra version number for MPlayer to accept all builds. Via #6 from @CallumKerrEdwards.
+* Check the extra version number for MPlayer to accept all builds. Via [ #6](https://github.com/donmelton/video_transcoding/issues/6) from [@CallumKerrEdwards](https://github.com/CallumKerrEdwards).
 
-### 0.1.2
+### [0.1.2](https://github.com/donmelton/video_transcoding/releases/tag/0.1.2)
 
 Thursday, May 7, 2015
 
-* Fix handling of DOS-style line endings when parsing scan output from `HandBrakeCLI` on Windows. Via #4 from @CallumKerrEdwards and @commandtab.
+* Fix handling of DOS-style line endings when parsing scan output from `HandBrakeCLI` on Windows. Via [ #4](https://github.com/donmelton/video_transcoding/issues/4) from [@CallumKerrEdwards](https://github.com/CallumKerrEdwards) and [@commandtab](https://github.com/commandtab).
 * Disable automatic subtitle burning in `transcode-video` when input is MP4 format.
-* Clarify usage of `--copy-audio` option in the "README" document.
-* Fix some section links in the "README" document. Via #3 from @vitorgalvao.
+* Clarify usage of `--copy-audio` option in the "README" document. Via [ #5](https://github.com/donmelton/video_transcoding/issues/5) from [@arikalish](https://github.com/arikalish).
+* Fix some section links in the "README" document. Via [ #3](https://github.com/donmelton/video_transcoding/pull/3) from [@vitorgalvao](https://github.com/vitorgalvao).
 
-### 0.1.1
+### [0.1.1](https://github.com/donmelton/video_transcoding/releases/tag/0.1.1)
 
 Wednesday, May 6, 2015
 
-* Add a workaround in the `Media` class `initialize` method for no required keyword arguments in Ruby 2.0. Via #1 from @cadonau and #2 from @CallumKerrEdwards.
+* Add a workaround in the `Media` class `initialize` method for no required keyword arguments in Ruby 2.0. Via [ #1](https://github.com/donmelton/video_transcoding/pull/1) from [@cadonau](https://github.com/cadonau) and [ #2](https://github.com/donmelton/video_transcoding/issues/2) from [@CallumKerrEdwards](https://github.com/CallumKerrEdwards).
 
-### 0.1.0
+### [0.1.0](https://github.com/donmelton/video_transcoding/releases/tag/0.1.0)
 
 Tuesday, May 5, 2015
 

data/bin/query-handbrake-log

@@ -39,6 +39,7 @@ r,  ratefactor      average P-frame quantizer for transcoding
 
 Options:
     --reverse       reverse direction of sort
+    --tabular       use tab character as field delimiter and surpress labels
 
 -v, --verbose       increase diagnostic information
 -q, --quiet         decrease     "           "
@@ -51,6 +52,7 @@ HERE
     def initialize
       super
       @reverse  = false
+      @tabular  = false
       @info     = nil
       @logs     = []
       @paths    = []
@@ -58,6 +60,7 @@ HERE
 
     def define_options(opts)
       opts.on('--reverse') { @reverse = true }
+      opts.on('--tabular') { @tabular = true }
     end
 
     def configure
@@ -105,6 +108,16 @@ HERE
         prefix = ''
       end
 
+      if @tabular
+        delimiter = "\t"
+        fps_label = ''
+        kbps_label = ''
+      else
+        delimiter = ' '
+        fps_label = ' fps'
+        kbps_label = ' kbps'
+      end
+
       report = []
 
       @logs.each do |log|
@@ -153,9 +166,9 @@ HERE
         when :time, :speed
           if fps_line.nil?
             if @info == :time
-              report << "00:00:00 #{video}"
+              report << "00:00:00#{delimiter}#{video}"
             else
-              report << "00.000000 fps #{video}"
+              report << "00.000000#{fps_label}#{delimiter}#{video}"
             end
           else
             Console.debug fps_line
@@ -185,40 +198,39 @@ HERE
                 duration = ($1.to_i * 60 * 60) + ($2.to_i * 60) + $3.to_i
                 fail "frame rate not found: #{log}" if rate_line.nil?
                 Console.debug rate_line
-                rate = rate_line.sub(/^.*: /, '').sub(/^.*constant /, '').sub(/ fps.*$/, '').to_f
+                rate = rate_line.sub(/^.*: [^0-9]*/, '').sub(/ fps.*$/, '').to_f
                 seconds = ((duration * rate) / fps.to_f).to_i
                 hours   = seconds / (60 * 60)
                 minutes = (seconds / 60) % 60
                 seconds = seconds % 60
-                report << format("%02d:%02d:%02d %s", hours, minutes, seconds, video)
+                report << format("%02d:%02d:%02d%s%s", hours, minutes, seconds, delimiter, video)
               else
                 fail "duration not found: #{log}"
               end
-              # TODO
             else
-              report << "#{fps} fps #{video}"
+              report << "#{fps}#{fps_label}#{delimiter}#{video}"
             end
           end
         when :bitrate
           if bitrate_line.nil?
-            report << "0000.00 kbps #{video}"
+            report << "0000.00#{kbps_label}#{delimiter}#{video}"
           else
             Console.debug bitrate_line
 
-            if bitrate_line =~ /[0-9.]+ kbps/
-              report << "#{$MATCH} #{video}"
+            if bitrate_line =~ /([0-9.]+) kbps/
+              report << "#{$1}#{kbps_label}#{delimiter}#{video}"
             else
               fail "bitrate not found: #{log}"
             end
           end
         when :ratefactor
           if ratefactor_line.nil?
-            report << "00.00 #{video}"
+            report << "00.00#{delimiter}#{video}"
           else
             Console.debug ratefactor_line
 
             if ratefactor_line =~ /Avg QP: ?([0-9.]+)/
-              report << "#{$1} #{video}"
+              report << "#{$1}#{delimiter}#{video}"
             else
               fail "ratefactor not found: #{log}"
             end

data/bin/transcode-video

@@ -95,22 +95,25 @@ Video options:
                       (can be used multiple times)
 
 Audio options:
-    --main-audio TRACK[=NAME]
-                    select main audio track with optional name
-                      (default: 1 or first in selected language)
+    --main-audio TRACK[=NAME]|LANGUAGE[=NAME]
+                    select main track by number or first with language code
+                      assigning it an optional name
+                      (default: first track, i.e. 1)
+                      (language code must be ISO 639-2 format, e.g.: `eng`)
                       (default output can be two audio tracks,
                         both surround and stereo, i.e. "width" is `double`)
-    --add-audio TRACK[=NAME]|language[=CODE[,...]]|all
+    --add-audio TRACK[=NAME]|LANGUAGE[,LANGUAGE,...]|all
                     add track selected by number assigning it an optional name
-                      or add tracks selected by one or more languages
+                      or add tracks selected with one or more language codes
                       or add all tracks
-                      (language is indicated by ISO 639-2 code, e.g.: `eng`)
+                      (language code must be ISO 639-2 format, e.g.: `eng`)
                       (multiple languages are separated by commas)
                       (default output is single AAC audio track,
                         i.e. "width" is `stereo`)
                       (can be used multiple times)
-    --audio-width TRACK|all=double|surround|stereo
-                    set audio output "width" for specific track or all tracks
+    --audio-width TRACK|main|other|all=double|surround|stereo
+                    set audio output "width" for specific track by number
+                      or main track or other non-main tracks or all tracks
                       with `double` to allow room for two output tracks
                       with `surround` to allow single surround or stereo track
                       with `stereo` to allow only single stereo track
@@ -142,11 +145,11 @@ Subtitle options:
     --force-subtitle TRACK|scan
                     add track selected by number and set forced flag
                       or scan for forced track in same language as main audio
-    --add-subtitle TRACK|language[=CODE[,...]]|all
+    --add-subtitle TRACK|LANGUAGE[,LANGUAGE,...]|all
                     add track selected by number
-                      or add tracks selected by one or more languages
+                      or add tracks selected with one or more language codes
                       or add all tracks
-                      (language is indicated by ISO 639-2 code, e.g.: `eng`)
+                      (language code must be ISO 639-2 format, e.g.: `eng`)
                       (multiple languages are separated by commas)
                       (can be used multiple times)
     --no-auto-burn  don't automatically burn first forced subtitle
@@ -224,6 +227,7 @@ HERE
       @fallback_crop              = nil
       @target_bitrate             = nil
       @main_audio                 = nil
+      @main_audio_language        = nil
       @extra_audio                = []
       @audio_name                 = {}
       @audio_language             = []
@@ -432,29 +436,34 @@ HERE
       end
 
       opts.on '--main-audio ARG' do |arg|
-        if arg =~ /^([1-9][0-9]*)(?:=(.+))?$/
-          track = $1.to_i
-          @main_audio = track
-          @audio_name[track] = $2 unless $2.nil?
+        if arg =~ /^(?:([1-9][0-9]*)(?:=(.+))?|([a-z]{3})(?:=(.+))?)$/
+          if $3.nil?
+            track = $1.to_i
+            @main_audio = track
+            @audio_name[track] = $2 unless $2.nil?
+            @main_audio_language = nil
+          else
+            @main_audio_language = $3
+            @audio_name[:main] = $4 unless $4.nil?
+            @main_audio = nil
+          end
         else
           fail UsageError, "invalid main audio argument: #{arg}"
         end
       end
 
       opts.on '--add-audio ARG' do |arg|
-        if arg =~ /^(?:([1-9][0-9]*)(?:=(.+))?|lang(?:uage)?=([a-z]{3}(?:,[a-z]{3})*)|(all))$/
-          if $4.nil?
-            if $3.nil?
-              track = $1.to_i
-              @extra_audio << track unless @extra_audio.first.is_a? Symbol
-              @audio_name[track] = $2 unless $2.nil?
-            elsif @extra_audio.first != :all
-              @extra_audio = [:language] 
-              @audio_language = $3.split(',')
-            end
-          else
+        if arg =~ /^(?:([1-9][0-9]*)(?:=(.+))?|([a-z]{3}(?:,[a-z]{3})*))$/
+          if $3.nil?
+            track = $1.to_i
+            @extra_audio << track unless @extra_audio.first.is_a? Symbol
+            @audio_name[track] = $2 unless $2.nil?
+          elsif $3 == 'all'
             @extra_audio = [:all]
             @audio_language = []
+          elsif @extra_audio.first != :all
+            @extra_audio = [:language]
+            @audio_language = $3.split(',')
           end
         else
           fail UsageError, "invalid add audio argument: #{arg}"
@@ -462,10 +471,15 @@ HERE
       end
 
       opts.on '--audio-width ARG' do |arg|
-        if arg =~ /^([1-9][0-9]*|all)=(double|surround|stereo)$/
+        if arg =~ /^([1-9][0-9]*|main|other|all)=(double|surround|stereo)$/
           width = $2.to_sym
 
-          if $1 == 'all'
+          case $1
+          when 'main'
+            @audio_width[:main] = width
+          when 'other'
+            @audio_width[:other] = width
+          when 'all'
             @audio_width[:main] = width
             @audio_width[:other] = width
           else
@@ -563,19 +577,15 @@ HERE
       end
 
       opts.on '--add-subtitle ARG' do |arg|
-        if arg =~ /^(?:([1-9][0-9]*)|lang(?:uage)?=([a-z]{3}(?:,[a-z]{3})*)|(all))$/
-          if $3.nil?
-            if $2.nil?
-              unless @extra_subtitle.first.is_a? Symbol
-                @extra_subtitle << $1.to_i
-              end
-            elsif @extra_subtitle.first != :all
-              @extra_subtitle = [:language] 
-              @subtitle_language = $2.split(',')
-            end
-          else
+        if arg =~ /^(?:([1-9][0-9]*)|([a-z]{3}(?:,[a-z]{3})*))$/
+          if $2.nil?
+            @extra_subtitle << $1.to_i unless @extra_subtitle.first.is_a? Symbol
+          elsif $2 == 'all'
             @extra_subtitle = [:all]
             @subtitle_language = []
+          elsif @extra_subtitle.first != :all
+            @extra_subtitle = [:language]
+            @subtitle_language = $2.split(',')
           end
         else
           fail UsageError, "invalid add subtitle argument: #{arg}"
@@ -1059,9 +1069,13 @@ HERE
       track = @main_audio
 
       if track.nil?
-        unless @audio_language.empty?
+        unless @main_audio_language.nil?
           track, _ = media.info[:audio].find do |_, info|
-            @audio_language.include? info[:language]
+            @main_audio_language == info[:language]
+          end
+
+          unless track.nil?
+            @audio_name[track] = @audio_name[:main] if @audio_name.include? :main
           end
         end
 

data/lib/video_transcoding/version.rb

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

metadata

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