other_video_transcoding 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1384cb7611877537d9ff8d72a42251c40697b73685fabfc57ac5796e9e3ebc
-  data.tar.gz: 813d5df34e4c000f85b0a369acc77b48c57ba66bdcfec8f408dded228a8c5598
+  metadata.gz: cfd039fdab5dca779448614baaf5f0e99b3d7dc883f97693919a016224e4b7aa
+  data.tar.gz: c97d8899ea867a018059d1896c3608e3982f8677f8fe81c7506097171c7591e8
 SHA512:
-  metadata.gz: 189041c0f4c25d0c62376db9f8b5eaf55a819a7c647cc21e8d424355b2e525626096dd2620ad46de2afaba1421f90f455cbea08a56c058244c67a0775654f1af
-  data.tar.gz: c0c7b1103fbbd187e951f6f16784f74ec7cd966bb50234fa51469b7f2522de880cab2330b2c32fbe984041b84c2eda87e965d6c8d0da2eb1b97db64f4174885f
+  metadata.gz: 1915b0bdacf95a0bdfe5e825497f9081571318aaf9423a10df614b0f5ab7a74949ebd6c6039c4ef09c5ce2d567dbe6a851019f996d64284a1ab0525a0a7c10e2
+  data.tar.gz: 64f23ade8dc74a15f8024313b66cd91b3298e80d4e39be391f47630ddd2aa812c67271bfa522794202dd33b4ce18b601c8cbf77a8b46078f288c050afd5eef3a

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 This single document contains all of the notes created for each [release](https://github.com/donmelton/other_video_transcoding/releases).
 
+## [0.3.2](https://github.com/donmelton/other_video_transcoding/releases/tag/0.3.2)
+
+Friday, September 11, 2020
+
+* Modify `other-transcode` to use a new `ffmpeg` Matroksa muxer option so the `-disposition` option is once again honored when using `ffmpeg` version 4.3 and later.
+* Change the codec ID from the default of `hev1` to `hvc1` for HEVC video in MP4 output from `other-transcode` to enable playback in QuickTime on macOS. Via [ #50](https://github.com/donmelton/other_video_transcoding/issues/50).
+* Convert added SRT format subtitles to MOV-compatible format in MP4 output from `other-transcode`. Via [ #55](https://github.com/donmelton/other_video_transcoding/issues/55).
+
 ## [0.3.1](https://github.com/donmelton/other_video_transcoding/releases/tag/0.3.1)
 
 Tuesday, May 26, 2020

data/bin/ask-ffmpeg-log

@@ -15,14 +15,14 @@ module Transcoding
 
   class Command
     def about
-      <<HERE
-ask-ffmpeg-log 0.3.1
+      <<-HERE
+ask-ffmpeg-log 0.3.2
 Copyright (c) 2019-2020 Don Melton
-HERE
+      HERE
     end
 
     def usage
-      <<HERE
+      <<-HERE
 Report temporal information from ffmpeg-generated `.log` files
 containing encoding statistics.
 
@@ -34,7 +34,7 @@ Options:
     --tabular       use tab character as field delimiter and suppress labels
 -h, --help          display this help and exit
     --version       output version information and exit
-HERE
+      HERE
     end
 
     def initialize

data/bin/other-transcode

@@ -17,14 +17,14 @@ module Transcoding
 
   class Command
     def about
-      <<HERE
-other-transcode 0.3.1
+      <<-HERE
+other-transcode 0.3.2
 Copyright (c) 2019-2020 Don Melton
-HERE
+      HERE
     end
 
     def usage1
-      <<HERE
+      <<-HERE
 Transcode Blu-ray Disc or DVD rip into a smaller, more portable format
 while remaining high enough quality to be mistaken for the original.
 
@@ -34,55 +34,55 @@ Creates Matroska `.mkv` format file in current working directory.
 
 Automatically selects a platform-specific hardware video encoder.
 
-HERE
+      HERE
     end
 
     def usage2
-      <<HERE
+      <<-HERE
 Input options:
     --position TIME, --duration TIME
                     start transcoding at position and/or limit to duration
                       in seconds[.milliseconds] or [HH:]MM:SS[.m...] format
 
-HERE
+      HERE
     end
 
     def usage3
-      <<HERE
+      <<-HERE
 Output options:
     --debug         increase diagnostic information
     --scan          print media information and exit
     --preview-crop  show commands to preview detected video crop and exit
-HERE
+      HERE
     end
 
     def usage4
-      <<HERE
+      <<-HERE
     --print-crop    print only detected video crop geometry and exit
     --mp4           output MP4 instead of Matroska `.mkv` format
     --copy-track-names
                     copy all input audio track names to output
-HERE
+      HERE
     end
 
     def usage5
-      <<HERE
+      <<-HERE
     --max-muxing-queue-size SIZE
                     set maximum number of packets to buffer when muxing
-HERE
+      HERE
     end
 
     def usage6
-      <<HERE
+      <<-HERE
 -n, --dry-run       don't transcode, just show `ffmpeg` command and exit
 
 Video options:
     --hevc          use HEVC version of platform-specific video encoder
-HERE
+      HERE
     end
 
     def usage7
-      <<HERE
+      <<-HERE
     --vt            use Apple Video Toolbox encoder
     --nvenc         use Nvidia video encoder
     --qsv           use Intel Quick Sync video encoder
@@ -101,11 +101,11 @@ HERE
     --cuvid         use Nvidia video decoder
                       for H.264, VC-1, MPEG-2 and other formats
                       (ignores scope set by `--decode`)
-HERE
+      HERE
     end
 
     def usage8
-      <<HERE
+      <<-HERE
     --target [2160p=|1080p=|720p=|480p=]BITRATE
                     set video bitrate target (default: based on input)
                       or target for specific input resolution
@@ -113,11 +113,11 @@ HERE
                     set video crop geometry (default: none)
                       or automatically detect it
     --720p          fit video within 1280x720 pixel bounds
-HERE
+      HERE
     end
 
     def usage9
-      <<HERE
+      <<-HERE
     --1080p          "    "     "    1920x1080  "     "
     --deinterlace   reduce interlace artifacts without changing frame rate
                       (applied automatically for some inputs)
@@ -126,11 +126,11 @@ HERE
     --detelecine    drop duplicate frames to restore original frame rate
                       (disables any deinterlacing and forced frame rate)
     --no-filters    disable any automatic adjustments via filters
-HERE
+      HERE
     end
 
     def usage10
-      <<HERE
+      <<-HERE
     --rc-maxrate FACTOR, --rc-bufsize FACTOR
                     set ratecontrol maximum rate and/or buffer size
                       as multiple of video bitrate target
@@ -179,27 +179,27 @@ x264 software video encoder options:
     --x264-quick    increase encoding speed by 70-80%
                       with no easily perceptible loss in video quality
                       (avoids quality problems with some encoder presets)
-HERE
+      HERE
     end
 
     def usage11
-      <<HERE
+      <<-HERE
 
 Audio options:
     --main-audio TRACK[=WIDTH]
                     select main audio track by number (default: 1)
                       with optional width (default: surround)
-HERE
+      HERE
     end
 
     def usage12
-      <<HERE
+      <<-HERE
                         (use `original` to disable transcoding)
-HERE
+      HERE
     end
 
     def usage13
-      <<HERE
+      <<-HERE
     --add-audio TRACK|all|LANGUAGE|STRING[=WIDTH]
                     add single audio track by number
                       including main audio track
@@ -212,49 +212,49 @@ HERE
                       excluding main audio track
                       (comparison is case-insensitve)
                     with optional width (default: stereo)
-HERE
+      HERE
     end
 
     def usage14
-      <<HERE
+      <<-HERE
                       (use `original` to disable transcoding)
-HERE
+      HERE
     end
 
     def usage15
-      <<HERE
+      <<-HERE
     --surround-bitrate BITRATE
                     set surround audio bitrate (default: 640)
     --stereo-bitrate BITRATE
                     set stereo audio bitrate (default: 256)
-HERE
+      HERE
     end
 
     def usage16
-      <<HERE
+      <<-HERE
     --mono-bitrate BITRATE
                     set mono audio bitrate (default: 50% of stereo bitrate)
-HERE
+      HERE
     end
 
     def usage17
-      <<HERE
+      <<-HERE
     --eac3          use Enhanced AC-3 format for surround audio
-HERE
+      HERE
     end
 
     def usage18
-      <<HERE
+      <<-HERE
     --all-eac3       "     "      "     "     "  all audio
     --keep-ac3-stereo
                     copy stereo and mono audio in AC-3 format
                       even when orginal bitrate is above transcoding bitrate
     --pass-dts      enable passthrough of audio in DTS and DTS-ES formats
-HERE
+      HERE
     end
 
     def usage19
-      <<HERE
+      <<-HERE
 
 Subtitle options:
     --add-subtitle TRACK[=forced]|auto|all|LANGUAGE|STRING
@@ -279,7 +279,7 @@ Other options:
     --version       output version information and exit
 
 Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
-HERE
+      HERE
     end
 
     def initialize
@@ -290,6 +290,7 @@ HERE
       @detect = false
       @preview = false
       @format = :mkv
+      @mkv_options = []
       @copy_track_names = false
       @max_muxing_queue_size = nil
       @dry_run = false
@@ -887,6 +888,11 @@ HERE
           @stereo_encoder = 'aac'
         end
       end
+
+      if @format == :mkv
+        capabilities = get_muxer_capabilities
+        @mkv_options = ['-default_mode', 'passthrough'] if capabilities =~ /passthrough/
+      end
     end
 
     def verify_tool_availability(command)
@@ -964,6 +970,30 @@ HERE
       $CHILD_STATUS.exitstatus == 0
     end
 
+    def get_muxer_capabilities
+      Kernel.warn 'Getting muxer capabilities...'
+      output = ''
+
+      begin
+        IO.popen([
+          'ffmpeg',
+          '-loglevel', 'quiet',
+          '-h', 'muxer=matroska'
+        ], :err=>[:child, :out]) do |io|
+          io.each do |line|
+            Kernel.warn line if @debug
+            output += line
+          end
+        end
+      rescue SystemCallError => e
+        raise "getting muxer capabilities failed: #{e}"
+      end
+
+      fail 'getting muxer capabilities failed' unless $CHILD_STATUS.exitstatus == 0
+
+      output
+    end
+
     def process_input(path)
       seconds = Time.now.tv_sec
 
@@ -1034,7 +1064,7 @@ HERE
           get_audio_options(media_info) +
           get_subtitle_options(media_info, burn_subtitle) + [
         '-metadata:g', 'title='
-      ] + (@format == :mp4 ? ['-movflags', 'disable_chpl'] : []) + [
+      ] + (@format == :mkv ? @mkv_options : ['-movflags', 'disable_chpl']) + [
         output_path
       ]
 
@@ -1823,6 +1853,8 @@ HERE
         '-disposition:v', 'default'
       ]
 
+      encode_options += ['-tag:v', 'hvc1'] if @format == :mp4 and @hevc
+
       [decode_options, encode_options]
     end
 
@@ -2095,7 +2127,7 @@ HERE
 
         options += [
           '-map', "0:#{subtitle['index']}",
-          "-c:s:#{index}", 'copy',
+          "-c:s:#{index}", ((@format == :mp4 and subtitle['codec_name'] == 'subrip') ? 'mov_text' : 'copy'),
           "-disposition:s:#{index}", (force ? 'default+forced' : '0')
         ]
 

data/other_video_transcoding.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'other_video_transcoding'
-  s.version               = '0.3.1'
+  s.version               = '0.3.2'
   s.required_ruby_version = '>= 2.0'
   s.summary               = 'Other tools to transcode videos.'
   s.description           = <<-HERE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: other_video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Don Melton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies: []
 description: "    Other Video Transcoding is a package of tools to transcode videos.\n"
 email: don@blivet.com
@@ -25,12 +25,17 @@ files:
 - README.md
 - bin/ask-ffmpeg-log
 - bin/other-transcode
+- other_video_transcoding-0.1.0.gem
+- other_video_transcoding-0.1.1.gem
+- other_video_transcoding-0.2.0.gem
+- other_video_transcoding-0.3.0.gem
+- other_video_transcoding-0.3.1.gem
 - other_video_transcoding.gemspec
 homepage: https://github.com/donmelton/other_video_transcoding
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -46,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Other tools to transcode videos.
 test_files: []