other_video_transcoding 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 325b662c56c03a0cac33994a3ab165381fe801615072c87188de4b8f6bd954f7
-  data.tar.gz: c26a3551deed5d3966168b881da8730672024b8363fc1e0e8611a27ca5ec9426
+  metadata.gz: 34125313312fdd2df4d4ee02edb1bf215d30f84aec152beed03e4a5652ed9168
+  data.tar.gz: b2d1e94d78b4a4ad4957586f432eb011f7a20b77f07669ec997b1e7bf1ea5eb6
 SHA512:
-  metadata.gz: dafd0f33a13e2b0f90db7e8ab8d0d7db19577177128dd133538593f762daddbf06c1ebf2735f05828b96255fc7970ce091434b78d9d80780598e9f18555ec5b1
-  data.tar.gz: 8d294809aceafa52a1b73007593d9e36ca966e4aa15a43b4a4ca99c74f9df23bfb8c0c892b9ddba6d3fe009798f8de35480c942cbb26db2b3fd7c8b913022e6a
+  metadata.gz: a8211a1898a41add509c7be63dcef1a639f597f0a21ff1b97164a3a71c14a939480a657fb6412cbe5caf99ba4b5e213fdd04d2a3432b316e768920c3882b1105
+  data.tar.gz: b933a52ab07ff31ba495f94a02c18f1d3a985685c0ea69ab7a7b9b6fa040897068ef0642c0ab15b09c7a618ac9846a73f8b3f5ce728b19023d59bb40cc3c5a51

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 This single document contains all of the notes created for each [release](https://github.com/donmelton/other_video_transcoding/releases).
 
+## [0.12.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.12.0)
+
+Wednesday, October 12, 2022
+
+* Modify `other-transcode` to explicitly set the output layout for AC-3 and Dolby Digital Plus (Enhanced AC-3) surround audio formats to six channels when the input has more than six channels, typically with 7.1 surround audio. Otherwise new versions of `ffmpeg` will only create five channels and drop the LFE channel. Via [ #167](https://github.com/donmelton/other_video_transcoding/issues/167).
+
+## [0.11.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.11.0)
+
+Saturday, July 16, 2022
+
+* Modify `other-transcode` to copy 10-bit high-dynamic-range (HDR10) metadata, extracting content light level and mastering display metadata from a HDR10 video frame input and tagging a 10-bit video stream output in Matroska (MKV) format with that information. This will also copy static HDR10 metadata from Dolby Vision and HDR10+ video streams but it will _not_ copy additional dynamic metadata from those formats.
+* Add a `--overlay-params` option to `other-transcode` to override the `overlay` filter configuration applied when burning subtitles. This is useful when cropping to move a subtitle within the output boundary.
+* Add a `--fdk-vbr` option to `other-transcode` to set the numeric variable bitrate (VBR) mode for the Fraunhofer `libfdk_aac` audio encoder, disabling constant bitrate (CBR) ratecontrol. VBR mode `1` selects the lowest quality and `5` the highest. Please note that the `libfdk_aac` encoder is not normally included with `ffmpeg` due to licensing restrictions and the `--fdk-vbr` option has no effect if that encoder is not available. Via [ #127](https://github.com/donmelton/other_video_transcoding/issues/127).
+
 ## [0.10.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.10.0)
 
 Thursday, January 27, 2022

data/bin/ask-ffmpeg-log

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

data/bin/other-transcode

@@ -18,7 +18,7 @@ module Transcoding
   class Command
     def about
       <<-HERE
-other-transcode 0.10.0
+other-transcode 0.12.0
 Copyright (c) 2019-2022 Don Melton
       HERE
     end
@@ -137,6 +137,8 @@ Video options:
 
     def usage10
       <<-HERE
+    --overlay-params KEY=VALUE[:KEY=VALUE]...
+                    override subtitle overlay filter configuration
     --yadif-params KEY=VALUE[:KEY=VALUE]...
                     override yadif deinterlace filter configuration
     --rc-maxrate FACTOR, --rc-bufsize FACTOR|BITRATE
@@ -294,6 +296,14 @@ Audio options:
     def usage19
       <<-HERE
 
+Fraunhofer FDK AAC audio encoder options:
+    --fdk-vbr MODE  set numeric variable bitrate (VBR) mode, from 1 to 5
+      HERE
+    end
+
+    def usage20
+      <<-HERE
+
 Subtitle options:
     --add-subtitle TRACK[=forced]|auto|all|LANGUAGE|STRING
                     add single subtitle track by number
@@ -351,6 +361,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @rate = nil
       @detelecine = false
       @enable_filters = true
+      @overlay_params = nil
       @yadif_params = nil
       @maxrate = nil
       @bufsize = nil
@@ -392,6 +403,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @keep_ac3_surround = true
       @keep_ac3_stereo = false
       @pass_dts = false
+      @fdk_vbr_mode = nil
       @subtitle_selections = []
       @auto_add_subtitle = false
       @burn_subtitle_track = 0
@@ -408,14 +420,14 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
               puts  usage1 + usage2 + usage3 + usage4 + usage5 + usage6 +
                     usage7 + usage8 + usage9 + usage10 + usage11 + usage12 +
                     usage13 + usage14 + usage15 + usage16 + usage17 +
-                    usage18 + usage19
+                    usage18 + usage19 + usage20
             when 'more'
               puts  usage1 + usage2 + usage3 + usage4 + usage6 + usage7 +
                     usage8 + usage9 + usage11 + usage13 + usage15 + usage16 +
-                    usage17 + usage18 + usage19
+                    usage17 + usage18 + usage20
             else
               puts  usage1 + usage3 + usage6 + usage8 + usage11 + usage13 +
-                    usage15 + usage17 + usage19
+                    usage15 + usage17 + usage20
             end
 
             exit
@@ -656,6 +668,14 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @enable_filters = false
       end
 
+      opts.on '--overlay-params ARG' do |arg|
+        arg.split ':' do |param|
+          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,\(\)]+$/
+        end
+
+        @overlay_params = arg
+      end
+
       opts.on '--yadif-params ARG' do |arg|
         arg.split ':' do |param|
           fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,\(\)]+$/
@@ -945,6 +965,10 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @surround_encoder ||= 'ac3'
       end
 
+      opts.on '--fdk-vbr ARG', Integer do |arg|
+        @fdk_vbr_mode = [[arg, 1].max, 5].min.to_s
+      end
+
       opts.on '--add-subtitle ARG' do |arg|
         if arg =~ /^([0-9]+)(?:=(forced))?$|^(auto)$|^([a-z]{3})$|^(.*)$/
           @subtitle_selections += [{
@@ -1258,6 +1282,11 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         Kernel.warn 'Done.'
       else
         add_track_statistics_tags output_path
+        ten_bit = (@ten_bit ? (@eight_bit_vc1 ? (video['codec_name'] != 'vc1') : true) : false)
+
+        if (video.fetch('pix_fmt', 'yuv420p') == 'yuv420p10le') and ten_bit
+          add_hdr_info path, output_path
+        end
       end
 
       Kernel.warn "\nElapsed time: #{seconds_to_time(Time.now.tv_sec - seconds)}\n\n"
@@ -1621,6 +1650,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         overlay_filter = nil
       else
         overlay_filter = "[0:#{burn_subtitle['index']}]overlay"
+        overlay_filter += "=#{@overlay_params}" unless @overlay_params.nil?
       end
 
       deinterlace = @deinterlace
@@ -2093,6 +2123,8 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
               if encoder =~ /aac/
                 encoder = @aac_fallback_encoder if encoder == 'aac_at'
                 channels = 6
+              elsif input_channels > 6
+                channels = 6
               end
             end
           end
@@ -2128,8 +2160,17 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         next if configurations[input_index] == configuration
 
         configurations[input_index] = configuration
+
+        if encoder == 'libfdk_aac' and not @fdk_vbr_mode.nil?
+          bitrate = nil
+          fdk_vbr_mode = @fdk_vbr_mode
+        else
+          fdk_vbr_mode = nil
+        end
+
         text = "#{sprintf("%2d", input_index)} = #{encoder}"
         text += " / #{bitrate} Kbps" unless bitrate.nil?
+        text += " / VBR mode #{fdk_vbr_mode}" unless fdk_vbr_mode.nil?
         text += ' / stereo' unless channels.nil? or channels > 2
         text += " / #{titles[input_index]}" if titles.has_key?(input_index)
         Kernel.warn text
@@ -2140,6 +2181,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
           "-c:a:#{index}", encoder,
           *(encoder == 'aac_at' ? ["-aac_at_mode:a:#{index}", 'cvbr'] : []),
           *(bitrate.nil? ? [] : ["-b:a:#{index}", "#{bitrate}k"]),
+          *(fdk_vbr_mode.nil? ? [] : ["-vbr:a:#{index}", fdk_vbr_mode]),
           *(channels.nil? ? [] : ["-ac:a:#{index}", "#{channels}"]),
           *((encoder != 'copy' and track[:stream]['sample_rate'] != '48000') ? ["-ar:a:#{index}", '48000'] : []),
           *(copy_track_name ? [] : ["-metadata:s:a:#{index}", 'title=']),
@@ -2284,6 +2326,80 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       fail "adding track statistics tags failed: #{output_path}" unless $CHILD_STATUS.exitstatus == 0
     end
+
+    def add_hdr_info(path, output_path)
+      hdr_info = ''
+
+      IO.popen([
+        'ffprobe',
+        '-loglevel', 'quiet',
+        '-select_streams', 'v:0',
+        '-show_frames',
+        '-read_intervals', '%+#1',
+        '-show_entries', 'frame=side_data_list',
+        '-print_format', 'json',
+        path
+      ]) do |io|
+        hdr_info = io.read
+      end
+
+      fail "scanning media failed: #{path}" unless $CHILD_STATUS.exitstatus == 0
+
+      begin
+        hdr_info = JSON.parse(hdr_info)
+      rescue JSON::JSONError
+        fail "media information not found: #{path}"
+      end
+
+      md = nil
+      cll = nil
+
+      hdr_info['frames'].each do |frame|
+        frame.fetch('side_data_list', []).each do |side_data|
+          if side_data['side_data_type'] == 'Mastering display metadata'
+            md = side_data if md.nil?
+          elsif side_data['side_data_type'] == 'Content light level metadata'
+            cll = side_data if cll.nil?
+          end
+        end
+      end
+
+      return if md.nil? or cll.nil?
+
+      Kernel.warn 'Adding HDR information...'
+
+      begin
+        IO.popen([
+          'mkvpropedit',
+          output_path,
+          '--edit', 'track:v1',
+          '--set', "max-content-light=#{cll['max_content']}",
+          '--set', "max-frame-light=#{cll['max_average']}",
+          '--set', "chromaticity-coordinates-red-x=#{eval md['red_x'] + '.0'}",
+          '--set', "chromaticity-coordinates-red-y=#{eval md['red_y'] + '.0'}",
+          '--set', "chromaticity-coordinates-green-x=#{eval md['green_x'] + '.0'}",
+          '--set', "chromaticity-coordinates-green-y=#{eval md['green_y'] + '.0'}",
+          '--set', "chromaticity-coordinates-blue-x=#{eval md['blue_x'] + '.0'}",
+          '--set', "chromaticity-coordinates-blue-y=#{eval md['blue_y'] + '.0'}",
+          '--set', "white-coordinates-x=#{eval md['white_point_x'] + '.0'}",
+          '--set', "white-coordinates-y=#{eval md['white_point_y'] + '.0'}",
+          '--set', "max-luminance=#{eval md['max_luminance'] + '.0'}",
+          '--set', "min-luminance=#{eval md['min_luminance'] + '.0'}"
+        ], 'rb') do |io|
+          Signal.trap 'INT' do
+            Process.kill 'INT', io.pid
+          end
+
+          io.each_char do |char|
+            STDERR.print char
+          end
+        end
+      rescue SystemCallError => e
+        raise "adding HDR information failed: #{e}"
+      end
+
+      fail "adding HDR information failed: #{output_path}" unless $CHILD_STATUS.exitstatus == 0
+    end
   end
 end
 

data/other_video_transcoding.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'other_video_transcoding'
-  s.version               = '0.10.0'
+  s.version               = '0.12.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.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Don Melton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies: []
 description: "    Other Video Transcoding is a package of tools to transcode videos.\n"
 email: don@blivet.com
@@ -27,6 +27,8 @@ files:
 - bin/other-transcode
 - other_video_transcoding-0.1.0.gem
 - other_video_transcoding-0.1.1.gem
+- other_video_transcoding-0.10.0.gem
+- other_video_transcoding-0.11.0.gem
 - other_video_transcoding-0.2.0.gem
 - other_video_transcoding-0.3.0.gem
 - other_video_transcoding-0.3.1.gem
@@ -57,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Other tools to transcode videos.