other_video_transcoding 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1982b8ee6d952b01d5c36833c741754ccd37508c0edc34a6b1de1b61daf9a21
-  data.tar.gz: 82d4874af0e4b9d25487a9f49764f920750c18dc7c368d0b8fd06fb35bef5c97
+  metadata.gz: fbe4654304564db44ba76d5b6b4a805a853e4ae2fca1238f69d7ceac6152970b
+  data.tar.gz: 5104621d3963ddacfd90796a2dd9cad57fc04f03c47e6122cc7dccd3794df16c
 SHA512:
-  metadata.gz: aa06c1a7c65f63ff2b3e3ce93d25a9b50588cb7d938b1990100236b973fe832e367ae54fa8cd5d44a582d3e14e050d68ed2f9a5d14a1c4381c1314c4ddd07b5a
-  data.tar.gz: 948c96268b59b5f09dba5314ceea8cbe9a47cbbe7a196128d2d266b2d7949c2a5620aa71eae759ffedd90a1c35bacf934fcfa8d585c04718d957d61418c0cf3b
+  metadata.gz: 6eec714eb59091c7ee48b74a4ac6dba65b3333bfa3dbb76b24ef5afb334e0c7434cc16234fe8e056cb7328eecc820794a8f54433082a49db6e06c02b812c690d
+  data.tar.gz: ff5ee96313996a08b9433e223c64e01b492c7bebc1735c5533d6f263373c56e8202d13e78bd9c07221f6b08c502577d9ae8701a53f5741a4ce57911b8024b826

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 This single document contains all of the notes created for each [release](https://github.com/donmelton/other_video_transcoding/releases).
 
+## [0.2.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.2.0)
+
+Monday, January 13, 2020
+
+* Allow `all` to be used as an argument to the `--add-audio` and `--add-subtitle` options of `other-transcode`, adding all audio tracks or all subtitle tracks. Via [ #3](https://github.com/donmelton/other_video_transcoding/issues/3).
+* Add `original` as a width attribute to the `--main-audio` and `--add-audio` options of `other-transcode`. Unlike `stereo` and `surround`, this disables transcoding and always copies the selected track(s). Via [ #5](https://github.com/donmelton/other_video_transcoding/issues/5).
+* Add a `--copy-video` option to `other-transcode`. This disables transcoding and copies the original video track to the output.
+* No longer ignore any image-based subtitles added to MP4 output. Instead, let `ffmpeg` foolishly add DVD-style subtitles and (currently) fail when adding Blu-ray Disc-style subtitles.
+* Deprecate the `--name` option of `other-transcode` because it doesn't make sense to name only the first output file from a tool which can take multiple inputs. The option still works for now, but using it issues a warning message. It will be removed in a future release.
+* Remove warnings when other options disable the Nvidia video decoder, which could only happen if the `--burn-subtitle` or `--detelecine` options were used with the `--cuvid` option.
+
 ## [0.1.1](https://github.com/donmelton/other_video_transcoding/releases/tag/0.1.1)
 
 Friday, January 3, 2020

data/bin/ask-ffmpeg-log

@@ -16,7 +16,7 @@ module Transcoding
   class Command
     def about
       <<HERE
-ask-ffmpeg-log 0.1.1
+ask-ffmpeg-log 0.2.0
 Copyright (c) 2019-2020 Don Melton
 HERE
     end

data/bin/other-transcode

@@ -18,7 +18,7 @@ module Transcoding
   class Command
     def about
       <<HERE
-other-transcode 0.1.1
+other-transcode 0.2.0
 Copyright (c) 2019-2020 Don Melton
 HERE
     end
@@ -59,8 +59,6 @@ HERE
       <<HERE
     --print-crop    print only detected video crop geometry and exit
     --mp4           output MP4 instead of Matroska `.mkv` format
-    --name STRING   set output filename, excluding format extension
-                      (default: based on input filename) 
     --copy-track-names
                     copy all input audio track names to output
 HERE
@@ -132,6 +130,7 @@ HERE
 
     def usage10
       <<HERE
+    --copy-video    disable transcoding and copy original video track
 
 Apple Video Toolbox encoder options:
     --vt-allow-sw   allow software encoding
@@ -185,9 +184,22 @@ Audio options:
     --main-audio TRACK[=WIDTH]
                     select main audio track by number (default: 1)
                       with optional width (default: surround)
-    --add-audio TRACK|LANGUAGE|STRING[=WIDTH]
+HERE
+    end
+
+    def usage12
+      <<HERE
+                        (use `original` to disable transcoding)
+HERE
+    end
+
+    def usage13
+      <<HERE
+    --add-audio TRACK|all|LANGUAGE|STRING[=WIDTH]
                     add single audio track by number
                       including main audio track
+                    or all audio tracks
+                      excluding main audio track
                     or audio tracks by language code
                       excluding main audio track
                       (in ISO 639-2 format, e.g.: `eng`)
@@ -195,6 +207,17 @@ Audio options:
                       excluding main audio track
                       (comparison is case-insensitve)
                     with optional width (default: stereo)
+HERE
+    end
+
+    def usage14
+      <<HERE
+                      (use `original` to disable transcoding)
+HERE
+    end
+
+    def usage15
+      <<HERE
     --surround-bitrate BITRATE
                     set surround audio bitrate (default: 640)
     --stereo-bitrate BITRATE
@@ -202,15 +225,16 @@ Audio options:
     --eac3          use Enhanced AC-3 format for surround audio
 
 Subtitle options:
-    --add-subtitle TRACK[=forced]|auto|LANGUAGE|STRING
+    --add-subtitle TRACK[=forced]|auto|all|LANGUAGE|STRING
                     add single subtitle track by number
                       optionally setting forced disposition
                     or enable automatic addition of forced subtitle
-                    or add subtitle tracks by language code
+                    or add all subtitle tracks
+                    or subtitle tracks by language code
                       (in ISO 639-2 format, e.g.: `eng`)
                     or subtitle tracks with titles containing string
                       (comparison is case-insensitve)
-                    (all variations exclude any burned track)
+                    (variations exclude any burned track)
     --burn-subtitle TRACK|auto
                     burn subtitle track by number into video
                       or enable automatic burning of forced subtitle
@@ -295,12 +319,13 @@ HERE
             case arg
             when 'full'
               puts  usage1 + usage2 + usage3 + usage4 + usage5 + usage6 +
-                    usage7 + usage8 + usage9 + usage10 + usage11
+                    usage7 + usage8 + usage9 + usage10 + usage11 + usage12 +
+                    usage13 + usage14 + usage15
             when 'more'
               puts  usage1 + usage2 + usage3 + usage4 + usage6 + usage7 +
-                    usage8 + usage9 + usage11
+                    usage8 + usage9 + usage11 + usage13 + usage15
             else
-              puts  usage1 + usage3 + usage6 + usage8 + usage11
+              puts  usage1 + usage3 + usage6 + usage8 + usage11 + usage13 + usage15
             end
 
             exit
@@ -360,6 +385,9 @@ HERE
 
       opts.on '--name ARG' do |arg|
         @name = arg
+        Kernel.warn '**********'
+        Kernel.warn 'Using deprecated option: --name'
+        Kernel.warn '**********'
       end
 
       opts.on '--copy-track-names' do
@@ -411,10 +439,12 @@ HERE
 
       opts.on '--[no-]10-bit' do |arg|
         @ten_bit = arg
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--preset ARG' do |arg|
         @preset = arg
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--decode ARG' do |arg|
@@ -451,6 +481,8 @@ HERE
         else
           @target = [arg.to_i, 1].max
         end
+
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--crop ARG' do |arg|
@@ -462,22 +494,27 @@ HERE
         else
           fail UsageError, "invalid crop geometry: #{arg}"
         end
+
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--720p' do
         @max_width  = 1280
         @max_height = 720
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--1080p' do
         @max_width  = 1920
         @max_height = 1080
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--deinterlace' do
         @deinterlace = true
         @detelecine = false
         @enable_filters = false
+        @encoder = nil if @encoder == 'copy' and @decoder_type != :cuvid
       end
 
       opts.on '--rate ARG' do |arg|
@@ -500,6 +537,7 @@ HERE
 
         @detelecine = false
         @enable_filters = false
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--detelecine' do
@@ -507,12 +545,26 @@ HERE
         @deinterlace = false
         @rate = nil
         @enable_filters = false
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--no-filters' do
         @enable_filters = false
       end
 
+      opts.on '--copy-video' do
+        @encoder = 'copy'
+        @hevc = false
+        @ten_bit = nil
+        @preset = nil
+        @target = nil
+        @crop = nil
+        @rate = nil
+        @detelecine = false
+        @enable_filters = false
+        @burn_subtitle_track = 0
+      end
+
       opts.on '--vt-allow-sw' do
         @encoder = @hevc ? 'hevc_videotoolbox' : 'h264_videotoolbox'
         @vt_allow_sw = true
@@ -603,7 +655,7 @@ HERE
       end
 
       opts.on '--main-audio ARG' do |arg|
-        if arg =~ /^([0-9]+)(?:=(surround|stereo))?$/
+        if arg =~ /^([0-9]+)(?:=(stereo|surround|original))?$/
           @audio_selections[0][:track] = $1.to_i
           @audio_selections[0][:width] = $2.to_sym unless $2.nil?
         else
@@ -612,7 +664,7 @@ HERE
       end
 
       opts.on '--add-audio ARG' do |arg|
-        if arg =~ /^([^=]+)(?:=(surround|stereo))?$/
+        if arg =~ /^([^=]+)(?:=(stereo|surround|original))?$/
           scope = $1
           width = $2
 
@@ -676,6 +728,8 @@ HERE
         else
           fail UsageError, "invalid subtitle track: #{arg}"
         end
+
+        @encoder = nil if @encoder == 'copy'
       end
     end
 
@@ -735,7 +789,7 @@ HERE
       else
         @encoder.sub!(/^h264/, 'hevc') if @hevc
 
-        unless @dry_run or encoders =~ /#{@encoder}/
+        unless @dry_run or @encoder == 'copy' or encoders =~ /#{@encoder}/
           fail "video encoder not available: #{@encoder}"
         end
       end
@@ -1241,13 +1295,7 @@ HERE
         overlay_filter = nil
       else
         overlay_filter = "[0:#{burn_subtitle['index']}]overlay"
-
-        unless cuvid_decoder.nil?
-          Kernel.warn '**********'
-          Kernel.warn "burning subtitle disables video decoder: #{cuvid_decoder}"
-          Kernel.warn '**********'
-          cuvid_decoder = nil
-        end
+        cuvid_decoder = nil
       end
 
       deinterlace = @deinterlace
@@ -1267,7 +1315,7 @@ HERE
 
       if deinterlace
         if cuvid_decoder.nil?
-          frame_rate_filter = 'yadif=deint=interlaced'
+          frame_rate_filter = 'yadif=deint=interlaced' unless @encoder == 'copy'
         else
           cuvid_options += ['-deint:v', 'adaptive']
         end
@@ -1280,14 +1328,8 @@ HERE
       end
 
       if @detelecine
-        unless cuvid_decoder.nil?
-          Kernel.warn '**********'
-          Kernel.warn "detelecine disables video decoder: #{cuvid_decoder}"
-          Kernel.warn '**********'
-          cuvid_decoder = nil
-        end
-
         frame_rate_filter = 'fieldmatch=order=tff:combmatch=none,decimate'
+        cuvid_decoder = nil
       end
 
       width   = video['width'].to_i
@@ -1375,12 +1417,16 @@ HERE
         conversion_filter = nil
       end
 
-      filter =  overlay_filter.nil?     ? '' : overlay_filter
-      filter += frame_rate_filter.nil?  ? '' : ",#{frame_rate_filter}"
-      filter += crop_filter.nil?        ? '' : ",#{crop_filter}"
-      filter += scale_filter.nil?       ? '' : ",#{scale_filter}"
-      filter += conversion_filter.nil?  ? '' : ",#{conversion_filter}"
-      filter.sub!(/^,/, '')
+      if @encoder == 'copy'
+        filter = ''
+      else
+        filter =  overlay_filter.nil?     ? '' : overlay_filter
+        filter += frame_rate_filter.nil?  ? '' : ",#{frame_rate_filter}"
+        filter += crop_filter.nil?        ? '' : ",#{crop_filter}"
+        filter += scale_filter.nil?       ? '' : ",#{scale_filter}"
+        filter += conversion_filter.nil?  ? '' : ",#{conversion_filter}"
+        filter.sub!(/^,/, '')
+      end
 
       if overlay_filter.nil?
         encode_options = [
@@ -1463,8 +1509,12 @@ HERE
       end
 
       Kernel.warn 'Stream mapping:'
-      text = "#{sprintf("%2d", video['index'])} = #{@encoder} / #{bitrate} Kbps"
-      text += " / #{preset}" unless preset.nil?
+      text = "#{sprintf("%2d", video['index'])} = #{@encoder}"
+
+      unless @encoder == 'copy'
+        text += " / #{bitrate} Kbps"
+        text += " / #{preset}" unless preset.nil?
+      end
 
       unless burn_subtitle.nil?
         text += " / #{sprintf("%d", burn_subtitle['index'])} = #{burn_subtitle['codec_name']} / burn"
@@ -1473,7 +1523,7 @@ HERE
       Kernel.warn text
       encode_options += ['-c:v', @encoder]
       encode_options += ['-pix_fmt:v', (@encoder =~ /(nvenc|qsv)$/ ? 'p010le' : 'yuv420p10le')] if @ten_bit
-      encode_options += ['-b:v', "#{bitrate}k"]
+      encode_options += ['-b:v', "#{bitrate}k"] unless @encoder == 'copy'
       encode_options += ['-maxrate:v', "#{maxrate}k"] if @encoder =~ /(nvenc|hevc_qsv|libx26[45])$/
       encode_options += ['-bufsize:v', "#{maxrate}k"] if @encoder =~ /^libx26[45]$/
       encode_options += ['-preset:v', preset] unless preset.nil?
@@ -1544,10 +1594,15 @@ HERE
         encode_options += ['-profile:v', 'high'] if @encoder =~ /^(h264_nvenc|h264_amf|libx264)$/
       end
 
+      unless @encoder == 'copy'
+        encode_options += [
+          '-color_primaries:v', color_primaries,
+          '-color_trc:v', color_trc,
+          '-colorspace:v', colorspace
+        ]
+      end
+
       encode_options += [
-        '-color_primaries:v', color_primaries,
-        '-color_trc:v', color_trc,
-        '-colorspace:v', colorspace,
         '-metadata:s:v', 'title=',
         '-disposition:v', 'default'
       ]
@@ -1577,7 +1632,14 @@ HERE
       audio_tracks = [{
         :stream => main_audio,
         :width => width,
-        :bitrate => width == :surround ? @surround_bitrate : @stereo_bitrate
+        :bitrate => case width
+        when :stereo
+          @stereo_bitrate
+        when :surround
+          @surround_bitrate
+        when :original
+          nil
+        end
       }]
 
       titles = {}
@@ -1590,7 +1652,14 @@ HERE
         end
 
         width = selection[:width]
-        bitrate = width == :surround ? @surround_bitrate : @stereo_bitrate
+        bitrate = case width
+        when :stereo
+          @stereo_bitrate
+        when :surround
+          @surround_bitrate
+        when :original
+          nil
+        end
 
         unless selection[:track].nil?
           audio_track = 0
@@ -1616,7 +1685,8 @@ HERE
           media_info['streams'].each do |stream|
             next if stream['codec_type'] != 'audio'
 
-            if  stream.fetch('tags', {}).fetch('language', '') == selection[:language] and
+            if (selection[:language] == 'all' or
+                stream.fetch('tags', {}).fetch('language', '') == selection[:language]) and
                 stream['index'] != main_audio['index']
               audio_tracks += [{
                 :stream => stream,
@@ -1660,28 +1730,32 @@ HERE
         bitrate = nil
         channels = nil
 
-        if track[:width] == :surround
-          if codec_name == @surround_encoder or codec_name == 'ac3'
+        if track[:width] == :original
             encoder = 'copy'
-          elsif input_channels > 2
-            encoder = @surround_encoder
-            bitrate = @surround_bitrate
+        else
+          if track[:width] == :surround
+            if codec_name == @surround_encoder or codec_name == 'ac3'
+              encoder = 'copy'
+            elsif input_channels > 2
+              encoder = @surround_encoder
+              bitrate = @surround_bitrate
+            end
           end
-        end
 
-        if encoder.nil?
-          if input_channels <= 2 and (codec_name == 'aac' or
-              ((codec_name == @surround_encoder or codec_name == 'ac3') and
-              (track[:stream]['bit_rate'].to_i / 1000) <= @stereo_bitrate))
-            encoder = 'copy'
-          else
-            encoder = @stereo_encoder
-            bitrate = @stereo_bitrate
+          if encoder.nil?
+            if input_channels <= 2 and (codec_name == 'aac' or
+                ((codec_name == @surround_encoder or codec_name == 'ac3') and
+                (track[:stream]['bit_rate'].to_i / 1000) <= @stereo_bitrate))
+              encoder = 'copy'
+            else
+              encoder = @stereo_encoder
+              bitrate = @stereo_bitrate
 
-            if input_channels > 2
-              channels = 2
-            elsif input_channels == 1
-              bitrate = @stereo_bitrate / 2
+              if input_channels > 2
+                channels = 2
+              elsif input_channels == 1
+                bitrate = @stereo_bitrate / 2
+              end
             end
           end
         end
@@ -1764,7 +1838,8 @@ HERE
           media_info['streams'].each do |stream|
             next if stream['codec_type'] != 'subtitle'
 
-            if stream.fetch('tags', {}).fetch('language', '') == selection[:language]
+            if (selection[:language] == 'all' or
+                stream.fetch('tags', {}).fetch('language', '') == selection[:language])
               subtitles += [stream]
             end
           end
@@ -1792,9 +1867,6 @@ HERE
       subtitles.each do |subtitle|
         next if (not burn_subtitle.nil?) and burn_subtitle['index'] == subtitle['index']
 
-        next if @format == :mp4 and
-          (subtitle['codec_name'] == 'hdmv_pgs_subtitle' or subtitle['codec_name'] == 'dvd_subtitle')
-
         force = (index == 0 and not force_subtitle.nil?)
         text = "#{sprintf("%2d", subtitle['index'])} = #{subtitle['codec_name']}"
         text += ' / force' if force

data/other_video_transcoding.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'other_video_transcoding'
-  s.version               = '0.1.1'
+  s.version               = '0.2.0'
   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.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Don Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies: []
 description: "    Other Video Transcoding is a package of tools to transcode videos.\n"
 email: don@blivet.com