other_video_transcoding 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfd039fdab5dca779448614baaf5f0e99b3d7dc883f97693919a016224e4b7aa
-  data.tar.gz: c97d8899ea867a018059d1896c3608e3982f8677f8fe81c7506097171c7591e8
+  metadata.gz: fa5db474ee387172ee779cd57befc925892dde23348ed6376cd35c416662576f
+  data.tar.gz: bd15276c43996afe54cf1bd7ad0f52eb55e5f5a6c1d90ebd36721d206eb17205
 SHA512:
-  metadata.gz: 1915b0bdacf95a0bdfe5e825497f9081571318aaf9423a10df614b0f5ab7a74949ebd6c6039c4ef09c5ce2d567dbe6a851019f996d64284a1ab0525a0a7c10e2
-  data.tar.gz: 64f23ade8dc74a15f8024313b66cd91b3298e80d4e39be391f47630ddd2aa812c67271bfa522794202dd33b4ce18b601c8cbf77a8b46078f288c050afd5eef3a
+  metadata.gz: 577dcc59ee2b7b2304ad59243abd5999851ed5a0407934eccfd25e59d320145428b40a86eb3f6938b30e6c45d2343cc20aa2b62f474e7b4d0c1dd9a99d8dc43e
+  data.tar.gz: 053d07452a33c7d04239e8dee324ec954e08682607871cf8c79e2cdbf0cb6bbca0dff202e8464e2fe49f80c6e7a4adb50c3a9f815636e0fe786e7ac86829ddd6

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 This single document contains all of the notes created for each [release](https://github.com/donmelton/other_video_transcoding/releases).
 
+## [0.4.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.4.0)
+
+Sunday, November 1, 2020
+
+* Modify the behavior and augment the capabilities of both encoding and decoding when using Nvidia hardware with `other-transcode`. This is necessary for compatibility with unleased versions of `ffmpeg` which are now built using the new Nvidia Software Development Kit (SDK) version 11.0. This SDK changes default encoder behavior and adds new presets which allow finer control of the performance/quality trade-off when transcoding video. To allow maximum performance, `other-transcode` no longer enables some quality settings by default:
+    * Multipass mode, now accessible via a new `--nvenc-multipass` option. Be advised that any improved quality from enabling multipass mode is probably not worth the performance impact.
+    * Spatial and temporal adaptive quantization (AQ), accessible via the `--nvenc-spatial-aq` and `--nvenc-temporal-aq` options. While enabling spatial AQ is still useful in reducing color banding for some inputs, be advised that enabling temporal AQ is probably not necessary and can cause some other side effects.
+* Add support for seven new Nvidia encoder presets to `other-transcode`. Use `--preset p1` for best performance and `--preset p7` for best quality. It's not necessary to use `--preset p4` since that's the default. See the [Nvidia preset migration guide](https://docs.nvidia.com/video-technologies/video-codec-sdk/nvenc-preset-migration-guide/index.html) to understand how these presets work and how they map to older behavior.
+* Add a `--nvenc-rc-mode` option to `other-transcode` for backward comaptibility with `ffmpeg` version 4.3.1 and older.
+* Add `--cuda` and `--no-cuda` options to `other-transcode`. These options enable or disable the scoped use of the Nvidia CUDA hardware decoder instead of the generic hardware decoder. By default the CUDA _decoder_ is enabled when using the Nvidia video _encoder_, but disabled when using other encoders.
+* Deprecate the `--cuvid` option in `other-transcode` because the CUDA decoder is faster and more flexible.
+* Deprecate `--preset none` in `other-transcode` because it's no longer necessary.
+* Always use hyphen-based spellings of Nvidia AQ options in `ffmpeg` commands generated by `other-transcode`.
+* Add `--x264-params` and `--x265-params` options to `other-transcode` for _very_ advanced manipulation of the `x264` and `x265` software encoders.
+* Modify `other-transcode` to assume a video input without a `field_order` tag is progressive instead of interlaced so a deinterlace fliter is not automatically and incorrectly applied to that video. This avoids problems with some 4K Ultra HD Blu-ray rips.
+* Update the link to Docker containers for Linux in the "README" document. Thanks, @ttyS0!
+
 ## [0.3.2](https://github.com/donmelton/other_video_transcoding/releases/tag/0.3.2)
 
 Friday, September 11, 2020

data/README.md

@@ -64,9 +64,7 @@ Additional documentation for installing these programs on Windows is available i
 
 [Docker](https://en.wikipedia.org/wiki/Docker_(software)) containers for Linux, including installation instructions, are available here:
 
-https://github.com/ttyS0/docker-transcode-nvidia
-
-https://github.com/ttyS0/docker-transcode-vaapi
+https://github.com/ttyS0/docker-other-transcode
 
 On macOS, all of these programs can be easily installed via [Homebrew](http://brew.sh/), an optional package manager:
 

data/bin/ask-ffmpeg-log

@@ -16,7 +16,7 @@ module Transcoding
   class Command
     def about
       <<-HERE
-ask-ffmpeg-log 0.3.2
+ask-ffmpeg-log 0.4.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.3.2
+other-transcode 0.4.0
 Copyright (c) 2019-2020 Don Melton
       HERE
     end
@@ -93,14 +93,15 @@ Video options:
     --10-bit, --no-10-bit
                     use 10-bit pixel format (default: not used for H.264,
                       used for HEVC with Nvidia, Intel and x265 encoders)
-    --preset NAME|none
-                    apply video encoder preset or disable default settings
+    --preset NAME   apply video encoder preset
     --decode vc1|all|none
                     set scope of automatic hardware decoder acceleration
                       (default: vc1 for VC-1 format only)
-    --cuvid         use Nvidia video decoder
-                      for H.264, VC-1, MPEG-2 and other formats
-                      (ignores scope set by `--decode`)
+    --cuda, --no-cuda
+                    enable or disable scoped use of Nvidia video decoder
+                      instead of generic hardware decoder
+                      (default: enabled when using Nvidia video encoder,
+                                disabled when using other encoders)
       HERE
     end
 
@@ -140,17 +141,20 @@ Apple Video Toolbox encoder options:
     --vt-allow-sw   allow software encoding
 
 Nvidia video encoder options:
-    --nvenc-spatial-aq, --no-nvenc-spatial-aq
-                    enable or disable spatial AQ (default: enabled)
-    --nvenc-temporal-aq, --no-nvenc-temporal-aq
-                    enable or disable temporal AQ
-                      (default: enabled for H.264, disabled for HEVC)
+    --nvenc-spatial-aq
+                    enable spatial adaptive quantization (AQ)
+    --nvenc-temporal-aq
+                    enable temporal adaptive quantization (AQ)
     --nvenc-lookahead FRAMES
                     set number of frames to look ahead for ratecontrol
+    --nvenc-multipass qres|fullres
+                    set multipass encoding resolution
     --nvenc-refs FRAMES
                     set number of reference frames
     --nvenc-bframes FRAMES
                     set maximum number of B-frames
+    --nvenc-rc-mode vbr|vbr_hq
+                    set ratecontrol mode (default: vbr)
 
 Intel Quick Sync video encoder options:
     --qsv-refs FRAMES
@@ -179,6 +183,12 @@ 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)
+    --x264-params KEY=VALUE[:KEY=VALUE]...
+                    override x264 configuration (disables other x264 options)
+
+x265 software video encoder options:
+    --x265-params KEY=VALUE[:KEY=VALUE]...
+                    override x265 configuration
       HERE
     end
 
@@ -299,6 +309,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @ten_bit = nil
       @preset = nil
       @decode_scope = :vc1
+      @decode_method = nil
       @decoder_type = nil
       @target_2160p = nil
       @target_1080p = nil
@@ -315,11 +326,13 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @maxrate = nil
       @bufsize = nil
       @vt_allow_sw = false
-      @nvenc_spatial_aq = nil
-      @nvenc_temporal_aq = nil
+      @nvenc_spatial_aq = false
+      @nvenc_temporal_aq = false
       @nvenc_lookahead = nil
+      @nvenc_multipass = nil
       @nvenc_refs = nil
       @nvenc_bframes = nil
+      @nvenc_rc_mode = 'vbr'
       @qsv_refs = nil
       @qsv_bframes = nil
       @amf_quality = nil
@@ -331,6 +344,8 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @x264_avbr = false
       @x264_mbtree = false
       @x264_quick = false
+      @x264_params = nil
+      @x265_params = nil
       @audio_selections = [{
         :track => 1,
         :language => nil,
@@ -483,7 +498,15 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       end
 
       opts.on '--preset ARG' do |arg|
-        @preset = arg
+        if arg == 'none'
+          Kernel.warn '**********'
+          Kernel.warn 'Using deprecated `--preset` argument: none'
+          Kernel.warn '**********'
+          @preset = nil
+        else
+          @preset = arg
+        end
+
         @encoder = nil if @encoder == 'copy'
       end
 
@@ -496,7 +519,14 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         end
       end
 
+      opts.on '--[no-]cuda' do |arg|
+        @decode_method = arg ? 'cuda' : 'auto'
+      end
+
       opts.on '--cuvid' do
+        Kernel.warn '**********'
+        Kernel.warn 'Using deprecated option: --cuvid'
+        Kernel.warn '**********'
         @decoder_type = :cuvid
       end
 
@@ -621,11 +651,23 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       end
 
       opts.on '--[no-]nvenc-spatial-aq' do |arg|
+        unless arg
+          Kernel.warn '**********'
+          Kernel.warn 'Using deprecated option: --no-nvenc-spatial-aq'
+          Kernel.warn '**********'
+        end
+
         @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
         @nvenc_spatial_aq = arg
       end
 
       opts.on '--[no-]nvenc-temporal-aq' do |arg|
+        unless arg
+          Kernel.warn '**********'
+          Kernel.warn 'Using deprecated option: --no-nvenc-temporal-aq'
+          Kernel.warn '**********'
+        end
+
         @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
         @nvenc_temporal_aq = arg
       end
@@ -635,6 +677,17 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @nvenc_lookahead = [[arg, 0].max, 32].min
       end
 
+      opts.on '--nvenc-multipass ARG' do |arg|
+        @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
+
+        @nvenc_multipass = case arg
+        when 'qres', 'fullres'
+          arg
+        else
+          fail UsageError, "invalid multipass resolution argument: #{arg}"
+        end
+      end
+
       opts.on '--nvenc-refs ARG', Integer do |arg|
         @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
         @nvenc_refs = [arg, 0].max
@@ -645,6 +698,17 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @nvenc_bframes = [[arg, 0].max, 4].min
       end
 
+      opts.on '--nvenc-rc-mode ARG' do |arg|
+        @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
+
+        @nvenc_rc_mode = case arg
+        when 'vbr', 'vbr_hq'
+          arg
+        else
+          fail UsageError, "invalid rate control argument: #{arg}"
+        end
+      end
+
       opts.on '--qsv-refs ARG', Integer do |arg|
         @encoder = @hevc ? 'hevc_qsv' : 'h264_qsv'
         @qsv_refs = [arg, 0].max
@@ -696,6 +760,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @hevc = false
         @x264_avbr = true
         @x264_mbtree = false
+        @x264_params = nil
       end
 
       opts.on '--x264-mbtree' do
@@ -703,15 +768,40 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @hevc = false
         @x264_mbtree = true
         @x264_avbr = false
+        @x264_params = nil
       end
 
       opts.on '--x264-quick' do
         @encoder = 'libx264'
         @hevc = false
         @x264_quick = true
+        @x264_params = nil
         @preset = nil
       end
 
+      opts.on '--x264-params ARG' do |arg|
+        arg.split ':' do |param|
+          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,]+$/
+        end
+
+        @encoder = 'libx264'
+        @hevc = false
+        @x264_params = arg
+        @x264_avbr = false
+        @x264_mbtree = true
+        @x264_quick = false
+      end
+
+      opts.on '--x265-params ARG' do |arg|
+        arg.split ':' do |param|
+          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,]+$/
+        end
+
+        @encoder = 'libx265'
+        @hevc = true
+        @x265_params = arg
+      end
+
       opts.on '--main-audio ARG' do |arg|
         if arg =~ /^([0-9]+)(?:=(stereo|surround|original))?$/
           @audio_selections[0][:track] = $1.to_i
@@ -880,6 +970,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @target_1080p ||= (@hevc and @ten_bit) ? 6000  : 8000
       @target_720p  ||= (@hevc and @ten_bit) ? 3000  : 4000
       @target_480p  ||= (@hevc and @ten_bit) ? 1500  : 2000
+      @decode_method ||= @encoder =~ /nvenc$/ ? 'cuda' : 'auto'
 
       if @stereo_encoder.nil?
         if encoders =~ /aac_at/ or encoders =~ /libfdk_aac/
@@ -948,8 +1039,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         ] + (encoder =~ /vaapi$/ ? ['-filter:v', 'format=nv12,hwupload'] : []) + [
           '-c:v', encoder,
           '-b:v', '1000k'
-        ] + (encoder =~ /nvenc$/ ? ['-rc:v', 'vbr_hq', '-spatial-aq:v', '1'] : []) +
-            (encoder == 'h264_nvenc' ? ['-temporal-aq:v', '1'] : []) +
+        ] + (encoder =~ /nvenc$/ ? ['-rc:v', @nvenc_rc_mode] : []) +
             (encoder == 'h264_qsv' ? ['-look_ahead:v', '1'] : []) +
             (encoder == 'hevc_qsv' ? ['-load_plugin:v', 'hevc_hw'] : []) +
             (encoder =~ /amf$/ ? ['-rc:v', 'vbr_latency'] : []) + [
@@ -1511,7 +1601,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       rate = @rate
 
       if @enable_filters
-        if video['avg_frame_rate'] == '30000/1001' or video['field_order'] != 'progressive'
+        if video['avg_frame_rate'] == '30000/1001' or video.fetch('field_order', 'progressive') != 'progressive'
           deinterlace = true
 
           if video['codec_name'] == 'mpeg2video' and video['avg_frame_rate'] != '25/1'
@@ -1609,7 +1699,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
               '-hwaccel_output_format', 'vaapi'
             ]
           else
-            decode_options += ['-hwaccel', 'auto']
+            decode_options += ['-hwaccel', @decode_method]
           end
         end
       else
@@ -1708,15 +1798,13 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         end
       end
 
-      if @preset.nil? or @preset == 'none'
-        preset = nil
-      else
+      unless @preset.nil?
         valid = false
 
         case @encoder
         when /nvenc$/
           case @preset
-          when 'fast', 'medium', 'slow'
+          when 'fast', 'medium', 'slow', /^p[1-7]$/
             valid = true
           end
         when /qsv$/
@@ -1733,8 +1821,6 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         end
 
         fail "invalid preset for encoder: #{@preset}" unless valid
-
-        preset = @preset
       end
 
       Kernel.warn 'Stream mapping:'
@@ -1742,7 +1828,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       unless @encoder == 'copy'
         text += " / #{bitrate} Kbps"
-        text += " / #{preset}" unless preset.nil?
+        text += " / #{@preset}" unless @preset.nil?
       end
 
       unless burn_subtitle.nil?
@@ -1755,33 +1841,15 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       encode_options += ['-b:v', "#{bitrate}k"] unless @encoder == 'copy'
       encode_options += ['-maxrate:v', "#{maxrate}k"] if maxrate > 0
       encode_options += ['-bufsize:v', "#{bufsize}k"] if bufsize > 0
-      encode_options += ['-preset:v', preset] unless preset.nil?
+      encode_options += ['-preset:v', @preset] unless @preset.nil?
       encode_options += ['-allow_sw:v', '1'] if @encoder =~ /videotoolbox$/ and @vt_allow_sw
 
       if @encoder =~ /nvenc$/
-        spatial_aq  = @nvenc_spatial_aq.nil?  ? false : @nvenc_spatial_aq
-        temporal_aq = @nvenc_temporal_aq.nil? ? false : @nvenc_temporal_aq
-
-        if @hevc
-          spatial_aq_option   = '-spatial_aq:v'
-          temporal_aq_option  = '-temporal_aq:v'
-        else
-          spatial_aq_option   = '-spatial-aq:v'
-          temporal_aq_option  = '-temporal-aq:v'
-        end
-
-        if @preset.nil?
-          encode_options += ['-rc:v', 'vbr_hq']
-          spatial_aq = true if @nvenc_spatial_aq.nil?
-
-          unless @hevc
-            temporal_aq = true if @nvenc_temporal_aq.nil?
-          end
-        end
-
-        encode_options += [spatial_aq_option, '1']                    if spatial_aq
-        encode_options += [temporal_aq_option, '1']                   if temporal_aq
+        encode_options += ['-rc:v', @nvenc_rc_mode]
+        encode_options += ['-spatial-aq:v', '1']                      if @nvenc_spatial_aq
+        encode_options += ['-temporal-aq:v', '1']                     if @nvenc_temporal_aq
         encode_options += ['-rc-lookahead:v', @nvenc_lookahead.to_s]  unless @nvenc_lookahead.nil?
+        encode_options += ['-multipass:v', @nvenc_multipass]          unless @nvenc_multipass.nil?
         encode_options += ['-refs:v', @nvenc_refs.to_s]               unless @nvenc_refs.nil?
         encode_options += ['-bf:v', @nvenc_bframes.to_s]              unless @nvenc_bframes.nil?
       end
@@ -1834,6 +1902,12 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
           encode_options += ['-refs:v', max_refs.to_s] if refs > max_refs
         end
+
+        encode_options += ['-x264-params:v', @x264_params] unless @x264_params.nil?
+      end
+
+      if @encoder == 'libx265'
+        encode_options += ['-x265-params:v', @x265_params] unless @x265_params.nil?
       end
 
       unless @ten_bit

data/other_video_transcoding.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'other_video_transcoding'
-  s.version               = '0.3.2'
+  s.version               = '0.4.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.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Don Melton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-12 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies: []
 description: "    Other Video Transcoding is a package of tools to transcode videos.\n"
 email: don@blivet.com
@@ -30,6 +30,7 @@ files:
 - other_video_transcoding-0.2.0.gem
 - other_video_transcoding-0.3.0.gem
 - other_video_transcoding-0.3.1.gem
+- other_video_transcoding-0.3.2.gem
 - other_video_transcoding.gemspec
 homepage: https://github.com/donmelton/other_video_transcoding
 licenses: