other_video_transcoding 0.3.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1384cb7611877537d9ff8d72a42251c40697b73685fabfc57ac5796e9e3ebc
-  data.tar.gz: 813d5df34e4c000f85b0a369acc77b48c57ba66bdcfec8f408dded228a8c5598
+  metadata.gz: 4273472e881f7379241d7ea8f6a3576b861f92c02155ad3c786fbee68cf1a376
+  data.tar.gz: 38e2083ce586a71c114948efccb2877a817012ea0fdfdda1f0fce371070e80ef
 SHA512:
-  metadata.gz: 189041c0f4c25d0c62376db9f8b5eaf55a819a7c647cc21e8d424355b2e525626096dd2620ad46de2afaba1421f90f455cbea08a56c058244c67a0775654f1af
-  data.tar.gz: c0c7b1103fbbd187e951f6f16784f74ec7cd966bb50234fa51469b7f2522de880cab2330b2c32fbe984041b84c2eda87e965d6c8d0da2eb1b97db64f4174885f
+  metadata.gz: f3d2b8f89b14154307b7a89c2f0ecb6368b33f9f9011363b749dac85645fd309f2cf32a8f2b3355736a29f1e74814c47aca2ea81ff70fa2e0d0e1ea0221c3c5d
+  data.tar.gz: 1b593c97ca2097033d068a44a5f924b413f5ead1858592efb05db115631b106500edf887ff032629b9dde6e6d307d652ddcee11af7c020046199c72602f2300f

data/CHANGELOG.md

@@ -2,6 +2,85 @@
 
 This single document contains all of the notes created for each [release](https://github.com/donmelton/other_video_transcoding/releases).
 
+## [0.7.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.7.0)
+
+Monday, January 4, 2021
+
+* Modify `other-transcode` to lower default target bitrates in order to significantly reduce the size of transcoded output at the risk of a slight reduction in perceived quality. Via [ #89](https://github.com/donmelton/other_video_transcoding/issues/89).
+
+H.264 video:
+
+Resolution | old | new
+--- | --- | ---
+1080p (Blu-ray video) | 8000 Kbps | 6000 Kbps
+720p | 4000 Kbps | 3000 Kbps
+480p (DVD video) | 2000 Kbps | 1500 Kbps
+
+HEVC video:
+
+Resolution | old | new
+--- | --- | ---
+1080p (Blu-ray video) | 6000 Kbps | 4000 Kbps
+720p | 3000 Kbps | 2000 Kbps
+480p (DVD video) | 1500 Kbps | 1000 Kbps
+
+Dolby Digital Plus (Enhanced AC-3) audio:
+
+Channels | old | new
+--- | --- | ---
+Surround | 640 Kbps | 384 Kbps
+Stereo | 256 Kbps | 192 Kbps
+Mono | 128 Kbps | 96 Kbps
+
+Note: There are no changes to default target bitrates for Dolby Digital (AC-3) and AAC audio formats.
+
+* Change the `--eac3` option in `other-transcode` to use Dolby Digital Plus format for _all_ transcoded audio instead of just surround output.
+* Deprecate the `--all-eac3` option in `other-transcode` since the `--eac3` option now has the same behavior.
+* Add a `--aac-stereo` option to `other-transcode`. This uses AAC format for transcoded stereo audio output so it can be paired with `--eac3` to get that option's old behavior.
+* Add a `--8-bit-vc1` option. When the color depth is currently 10-bit, this option uses an 8-bit color depth _for video inputs in VC-1 format only_.
+
+## [0.6.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.6.0)
+
+Tuesday, December 22, 2020
+
+* Lower the default target bitrates for 8-bit HEVC video in `other-transcode` to match the defaults for 10-bit HEVC video. This means, for example, the default target for HEVC at a 1080p resolution will be 6000 Kbps no matter the output bit depth.
+* Modify `other-transcode` to set the video buffer size equal to the maximum video bitrate when using an Nvidia encoder, essentially adding `--rc-bufsize 3` to the command line. Previously the buffer size was never explicitly set so `ffmpeg` would use a default value of twice the target bitrate. Since the maximum bitrate is normally three times the target bitrate this meant the buffer size was actually smaller than the maximum. While this didn't cause any known problems, Nvidia recommends a larger buffer size to improve quality. However, using `--rc-bufsize 0` will restore the old behavior and the default value from `ffmpeg`.
+* Ignore the `--nvenc-lookahead` option in `other-transcode` when the argument is `0` since such a value won't change the behavior of an Nvidia encoder anyway.
+* Add a `--limit-ac3-surround` option to `other-transcode` which prevents surround audio in AC-3 or Dolby Digital Plus (Enhanced AC-3) format from being copied instead of transcoded when the orginal bitrate is above the transcoding bitrate. This allows setting a lower target with the `--surround-bitrate` option in order to force higher-bitrate tracks to be transcoded instead of copied. 
+* Reduce the minimum bitrates for Dolby Digital Plus audio in `other-transcode` from 256, 128 and 64 Kbps for surround, stereo and mono layouts to 192, 96 and 48 Kbps. The default bitrates for Dolby Digital Plus audio remain the same and this change does not affect audio output in AC-3 or AAC formats.
+
+## [0.5.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.5.0)
+
+Tuesday, November 24, 2020
+
+* Add `--qsv-decoder` and `--qsv-device` options to `other-transcode`, both of which enable the scoped use of the Intel Quick Sync Video (QSV) decoder instead of the generic hardware decoder. These options can significantly speed operation of the QSV encoder, invoked via `--qsv`. It's recommended that `--decode all` be included when using these options to decode all video input formats. The `--qsv-device` option allows selection of specific hardware by number or path depending on platform. Please note that deinterlacing, cropping, scaling or using other filters will disable QSV's format-specific decoders.
+* Remove all deprecated options and arguments from `other-transcode`.
+
+## [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
+
+* 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/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019-2020 Don Melton
+Copyright (c) 2019-2021 Don Melton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -2,7 +2,7 @@
 #
 # ask-ffmpeg-log
 #
-# Copyright (c) 2019-2020 Don Melton
+# Copyright (c) 2019-2021 Don Melton
 #
 
 require 'abbrev'
@@ -15,14 +15,14 @@ module Transcoding
 
   class Command
     def about
-      <<HERE
-ask-ffmpeg-log 0.3.1
-Copyright (c) 2019-2020 Don Melton
-HERE
+      <<-HERE
+ask-ffmpeg-log 0.7.0
+Copyright (c) 2019-2021 Don Melton
+      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

@@ -2,7 +2,7 @@
 #
 # other-transcode
 #
-# Copyright (c) 2019-2020 Don Melton
+# Copyright (c) 2019-2021 Don Melton
 #
 
 require 'English'
@@ -17,14 +17,14 @@ module Transcoding
 
   class Command
     def about
-      <<HERE
-other-transcode 0.3.1
-Copyright (c) 2019-2020 Don Melton
-HERE
+      <<-HERE
+other-transcode 0.7.0
+Copyright (c) 2019-2021 Don Melton
+      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
@@ -91,21 +91,27 @@ HERE
     --x264          use x264 software video encoder
     --x265          use x265    "       "      "
     --10-bit, --no-10-bit
-                    use 10-bit pixel format (default: not used for H.264,
+                    use 10-bit color depth (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
+    --8-bit-vc1     use 8-bit color depth for VC-1 format only
+    --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`)
-HERE
+    --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)
+    --qsv-decoder   enable scoped use of Intel Quick Sync video decoder
+                      instead of generic hardware decoder
+    --qsv-device DEVICE
+                    enable scoped use of QSV decoder for specific device
+      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 +119,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 +132,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
@@ -140,17 +146,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,27 +188,33 @@ 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
+    --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
 
     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 +227,53 @@ 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
-    --eac3          use Enhanced AC-3 format for surround audio
-HERE
+      <<-HERE
+    --eac3          use Dolby Digital Plus (E-AC-3) format for all audio
+                      (default bitrates: 384 for surround, 192 for stereo)
+      HERE
     end
 
     def usage18
-      <<HERE
-    --all-eac3       "     "      "     "     "  all audio
+      <<-HERE
+    --aac-stereo    use AAC format for stereo audio
+    --limit-ac3-surround
+                    don't copy surround audio in AC-3 format
+                      when orginal bitrate is above transcoding bitrate
     --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 +298,7 @@ Other options:
     --version       output version information and exit
 
 Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
-HERE
+      HERE
     end
 
     def initialize
@@ -290,15 +309,18 @@ HERE
       @detect = false
       @preview = false
       @format = :mkv
+      @mkv_options = []
       @copy_track_names = false
       @max_muxing_queue_size = nil
       @dry_run = false
       @hevc = false
       @encoder = nil
       @ten_bit = nil
+      @eight_bit_vc1 = false
       @preset = nil
       @decode_scope = :vc1
-      @decoder_type = nil
+      @decode_method = nil
+      @qsv_device = nil
       @target_2160p = nil
       @target_1080p = nil
       @target_720p  = nil
@@ -314,11 +336,13 @@ HERE
       @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
@@ -330,17 +354,20 @@ HERE
       @x264_avbr = false
       @x264_mbtree = false
       @x264_quick = false
+      @x264_params = nil
+      @x265_params = nil
       @audio_selections = [{
         :track => 1,
         :language => nil,
         :title => nil,
         :width => :surround
       }]
-      @surround_bitrate = 640
-      @stereo_bitrate = 256
+      @surround_bitrate = nil
+      @stereo_bitrate = nil
       @mono_bitrate = nil
       @surround_encoder = 'ac3'
       @stereo_encoder = nil
+      @keep_ac3_surround = true
       @keep_ac3_stereo = false
       @pass_dts = false
       @subtitle_selections = []
@@ -478,6 +505,12 @@ HERE
 
       opts.on '--[no-]10-bit' do |arg|
         @ten_bit = arg
+        @eight_bit_vc1 = false
+        @encoder = nil if @encoder == 'copy'
+      end
+
+      opts.on '--8-bit-vc1' do
+        @eight_bit_vc1 = true
         @encoder = nil if @encoder == 'copy'
       end
 
@@ -495,8 +528,17 @@ HERE
         end
       end
 
-      opts.on '--cuvid' do
-        @decoder_type = :cuvid
+      opts.on '--[no-]cuda' do |arg|
+        @decode_method = arg ? 'cuda' : 'auto'
+      end
+
+      opts.on '--qsv-decoder' do
+        @decode_method = 'qsv'
+      end
+
+      opts.on '--qsv-device ARG' do |arg|
+        @qsv_device = arg
+        @decode_method = 'qsv'
       end
 
       opts.on '--target ARG' do |arg|
@@ -553,7 +595,7 @@ HERE
         @deinterlace = true
         @detelecine = false
         @enable_filters = false
-        @encoder = nil if @encoder == 'copy' and @decoder_type != :cuvid
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--rate ARG' do |arg|
@@ -619,19 +661,35 @@ HERE
         @vt_allow_sw = true
       end
 
-      opts.on '--[no-]nvenc-spatial-aq' do |arg|
+      opts.on '--nvenc-spatial-aq' do
         @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
-        @nvenc_spatial_aq = arg
+        @nvenc_spatial_aq = true
       end
 
-      opts.on '--[no-]nvenc-temporal-aq' do |arg|
+      opts.on '--nvenc-temporal-aq' do
         @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
-        @nvenc_temporal_aq = arg
+        @nvenc_temporal_aq = true
       end
 
       opts.on '--nvenc-lookahead ARG', Integer do |arg|
         @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
-        @nvenc_lookahead = [[arg, 0].max, 32].min
+
+        if arg > 0
+          @nvenc_lookahead = [arg, 32].min
+        else
+          @nvenc_lookahead = nil
+        end
+      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|
@@ -644,6 +702,17 @@ HERE
         @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
@@ -695,6 +764,7 @@ HERE
         @hevc = false
         @x264_avbr = true
         @x264_mbtree = false
+        @x264_params = nil
       end
 
       opts.on '--x264-mbtree' do
@@ -702,15 +772,40 @@ HERE
         @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
@@ -762,13 +857,25 @@ HERE
 
       opts.on '--eac3' do
         @surround_encoder = 'eac3'
+        @stereo_encoder   = 'eac3'
       end
 
       opts.on '--all-eac3' do
+        Kernel.warn '**********'
+        Kernel.warn 'Using deprecated option: --all-eac3'
+        Kernel.warn '**********'
         @surround_encoder = 'eac3'
         @stereo_encoder   = 'eac3'
       end
 
+      opts.on '--aac-stereo' do
+        @stereo_encoder = nil
+      end
+
+      opts.on '--limit-ac3-surround' do
+        @keep_ac3_surround = false
+      end
+
       opts.on '--keep-ac3-stereo' do
         @keep_ac3_stereo = true
       end
@@ -827,13 +934,31 @@ HERE
     def configure(path)
       @audio_selections.uniq!
       @subtitle_selections.uniq!
-      @surround_bitrate = [[@surround_bitrate, 256].max, (@surround_encoder == 'ac3' ? 640 : 768)].min
-      @stereo_bitrate = [[@stereo_bitrate, 128].max, (@stereo_encoder == 'eac3' ? 768 : 320)].min
+
+      if @surround_encoder == 'eac3'
+        @surround_bitrate ||= 384
+        @surround_bitrate = [[@surround_bitrate, 192].max, 768].min
+      else
+        @surround_bitrate ||= 640
+        @surround_bitrate = [[@surround_bitrate, 256].max, 640].min
+      end
+
+      if @stereo_encoder == 'eac3'
+        @stereo_bitrate ||= 192
+        @stereo_bitrate = [[@stereo_bitrate, 96].max, 768].min
+      else
+        @stereo_bitrate ||= 256
+        @stereo_bitrate = [[@stereo_bitrate, 128].max, 320].min
+      end
 
       if @mono_bitrate.nil?
         @mono_bitrate = @stereo_bitrate / 2
       else
-        @mono_bitrate = [[@mono_bitrate, 64].max, (@stereo_encoder == 'eac3' ? 768 : 256)].min
+        if @stereo_encoder == 'eac3'
+          @mono_bitrate = [[@mono_bitrate, 48].max, 768].min
+        else
+          @mono_bitrate = [[@mono_bitrate, 64].max, 256].min
+        end
       end
 
       [
@@ -875,10 +1000,11 @@ HERE
       end
 
       @ten_bit = (@hevc and @encoder =~ /(nvenc|qsv|x265)$/ ? true : false) if @ten_bit.nil?
-      @target_2160p ||= (@hevc and @ten_bit) ? 12000 : 16000
-      @target_1080p ||= (@hevc and @ten_bit) ? 6000  : 8000
-      @target_720p  ||= (@hevc and @ten_bit) ? 3000  : 4000
-      @target_480p  ||= (@hevc and @ten_bit) ? 1500  : 2000
+      @target_2160p ||= @hevc ? 8000 : 12000
+      @target_1080p ||= @hevc ? 4000 :  6000
+      @target_720p  ||= @hevc ? 2000 :  3000
+      @target_480p  ||= @hevc ? 1000 :  1500
+      @decode_method ||= @encoder =~ /nvenc$/ ? 'cuda' : 'auto'
 
       if @stereo_encoder.nil?
         if encoders =~ /aac_at/ or encoders =~ /libfdk_aac/
@@ -887,6 +1013,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)
@@ -942,8 +1073,7 @@ HERE
         ] + (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'] : []) + [
@@ -964,6 +1094,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 +1188,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
       ]
 
@@ -1443,45 +1597,17 @@ HERE
     end
 
     def get_video_options(media_info, video, burn_subtitle, crop)
-      if @decoder_type == :cuvid
-        cuvid_decoder = case video['codec_name']
-        when 'mpeg1video'
-          'mpeg1_cuvid'
-        when 'mpeg2video'
-          'mpeg2_cuvid'
-        when 'mjpeg'
-          'mjpeg_cuvid'
-        when 'mpeg4'
-          'mpeg4_cuvid'
-        when 'h264'
-          'h264_cuvid'
-        when 'vc1'
-          'vc1_cuvid'
-        when 'vp8'
-          'vp8_cuvid'
-        when 'vp9'
-          'vp9_cuvid'
-        when 'hevc'
-          'hevc_cuvid'
-        end
-      else
-        cuvid_decoder = nil
-      end
-
-      cuvid_options = []
-
       if burn_subtitle.nil?
         overlay_filter = nil
       else
         overlay_filter = "[0:#{burn_subtitle['index']}]overlay"
-        cuvid_decoder = nil
       end
 
       deinterlace = @deinterlace
       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'
@@ -1493,11 +1619,7 @@ HERE
       frame_rate_filter = nil
 
       if deinterlace
-        if cuvid_decoder.nil?
-          frame_rate_filter = 'yadif=deint=interlaced' unless @encoder == 'copy'
-        else
-          cuvid_options += ['-deint:v', 'adaptive']
-        end
+        frame_rate_filter = 'yadif=deint=interlaced' unless @encoder == 'copy'
       end
 
       unless rate.nil?
@@ -1508,7 +1630,6 @@ HERE
 
       if @detelecine
         frame_rate_filter = 'fieldmatch=order=tff:combmatch=none,decimate'
-        cuvid_decoder = nil
       end
 
       width   = video['width'].to_i
@@ -1523,21 +1644,9 @@ HERE
       if crop.nil? or (crop == {:width => width, :height => height, :x => 0, :y => 0})
         crop_filter = nil
       else
-        media_width   = width
-        media_height  = height
-        width         = crop[:width]
-        height        = crop[:height]
-
-        if cuvid_decoder.nil?
-          crop_filter = "crop=#{width}:#{height}:#{crop[:x]}:#{crop[:y]}"
-        else
-          crop_filter = nil
-          top     = crop[:y]
-          bottom  = media_height - (top + height)
-          left    = crop[:x]
-          right   = media_width - (left + width)
-          cuvid_options += ['-crop:v', "#{top}x#{bottom}x#{left}x#{right}"]
-        end
+        width       = crop[:width]
+        height      = crop[:height]
+        crop_filter = "crop=#{width}:#{height}:#{crop[:x]}:#{crop[:y]}"
       end
 
       if @hevc
@@ -1552,14 +1661,8 @@ HERE
         scale = [(max_width.to_f / width), (max_height.to_f / height)].min
         width   = ((width   * scale).ceil / 2) * 2
         height  = ((height  * scale).ceil / 2) * 2
-
-        if cuvid_decoder.nil?
-          scale_filter = "scale=#{width}:#{height}"
-          scale_filter += ':flags=bicubic' unless overlay_filter.nil?
-        else
-          scale_filter = nil
-          cuvid_options += ['-resize:v', "#{width}x#{height}"]
-        end
+        scale_filter = "scale=#{width}:#{height}"
+        scale_filter += ':flags=bicubic' unless overlay_filter.nil?
       else
         scale_filter = nil
       end
@@ -1570,24 +1673,52 @@ HERE
         decode_options = []
       end
 
-      if cuvid_decoder.nil?
-        if (@decode_scope == :vc1 and video['codec_name'] == 'vc1') or @decode_scope == :all
-          if @encoder =~ /vaapi$/
-            decode_options = [
-              '-hwaccel', 'vaapi',
-              '-hwaccel_device', '/dev/dri/renderD128',
-              '-hwaccel_output_format', 'vaapi'
-            ]
+      if (@decode_scope == :vc1 and video['codec_name'] == 'vc1') or @decode_scope == :all
+        if @encoder =~ /vaapi$/
+          decode_options = [
+            '-hwaccel', 'vaapi',
+            '-hwaccel_device', '/dev/dri/renderD128',
+            '-hwaccel_output_format', 'vaapi'
+          ]
+        else
+          if @decode_method == 'qsv' and @encoder != 'h264_qsv'
+            decode_method = 'auto'
           else
-            decode_options += ['-hwaccel', 'auto']
+            decode_method = @decode_method
           end
-        end
-      else
-        Kernel.warn "video decoder = #{cuvid_decoder}"
 
-        decode_options += [
-          '-c:v', cuvid_decoder
-        ] + cuvid_options
+          decode_options += ['-hwaccel', decode_method]
+
+          if  decode_method == 'qsv' and
+              overlay_filter.nil? and
+              frame_rate_filter.nil? and
+              crop_filter.nil? and
+              scale_filter.nil?
+            qsv_decoder = case video['codec_name']
+            when 'av1'
+              'av1_qsv'
+            when 'h264'
+              'h264_qsv'
+            when 'hevc'
+              'hevc_qsv'
+            when 'mjpeg'
+              'mjpeg_qsv'
+            when 'mpeg2video'
+              'mpeg2_qsv'
+            when 'vc1'
+              'vc1_qsv'
+            when 'vp8'
+              'vp8_qsv'
+            when 'vp9'
+              'vp9_qsv'
+            else
+              nil
+            end
+
+            decode_options += ['-qsv_device', @qsv_device] unless @qsv_device.nil?
+            decode_options += ['-c:v', qsv_decoder] unless qsv_decoder.nil?
+          end
+        end
       end
 
       if @encoder =~ /vaapi$/ and not decode_options.include?('-hwaccel')
@@ -1624,7 +1755,8 @@ HERE
         ]
       end
 
-      hdr = ((video.fetch('pix_fmt', 'yuv420p') == 'yuv420p10le') and @ten_bit)
+      ten_bit = (@ten_bit ? (@eight_bit_vc1 ? (video['codec_name'] != 'vc1') : true) : false)
+      hdr = ((video.fetch('pix_fmt', 'yuv420p') == 'yuv420p10le') and ten_bit)
 
       if hdr
         color_primaries = 'bt2020'
@@ -1672,21 +1804,21 @@ HERE
         end
 
         if @bufsize.nil?
-          bufsize = maxrate if @encoder =~ /^libx26[45]$/
+          bufsize = maxrate if @encoder =~ /(nvenc|libx26[45])$/
         else
-          bufsize = [[(bitrate * @bufsize).to_i, bitrate].max, bitrate * 4].min
+          unless @bufsize == 0 and @encoder =~ /nvenc$/
+            bufsize = [[(bitrate * @bufsize).to_i, bitrate].max, bitrate * 4].min
+          end
         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$/
@@ -1703,8 +1835,6 @@ HERE
         end
 
         fail "invalid preset for encoder: #{@preset}" unless valid
-
-        preset = @preset
       end
 
       Kernel.warn 'Stream mapping:'
@@ -1712,7 +1842,7 @@ HERE
 
       unless @encoder == 'copy'
         text += " / #{bitrate} Kbps"
-        text += " / #{preset}" unless preset.nil?
+        text += " / #{@preset}" unless @preset.nil?
       end
 
       unless burn_subtitle.nil?
@@ -1721,37 +1851,19 @@ HERE
 
       Kernel.warn text
       encode_options += ['-c:v', @encoder]
-      encode_options += ['-pix_fmt:v', (@encoder =~ /(nvenc|qsv)$/ ? 'p010le' : 'yuv420p10le')] if @ten_bit
+      encode_options += ['-pix_fmt:v', (@encoder =~ /(nvenc|qsv)$/ ? 'p010le' : 'yuv420p10le')] if ten_bit
       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
@@ -1804,9 +1916,15 @@ HERE
 
           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
 
-      unless @ten_bit
+      if @encoder == 'libx265'
+        encode_options += ['-x265-params:v', @x265_params] unless @x265_params.nil?
+      end
+
+      unless ten_bit
         encode_options += ['-profile:v', 'high'] if @encoder =~ /^(h264_nvenc|h264_amf|libx264)$/
       end
 
@@ -1823,6 +1941,8 @@ HERE
         '-disposition:v', 'default'
       ]
 
+      encode_options += ['-tag:v', 'hvc1'] if @format == :mp4 and @hevc
+
       [decode_options, encode_options]
     end
 
@@ -1953,8 +2073,8 @@ HERE
           dts = (codec_name == 'dts' and track[:stream].fetch('profile', 'DTS') =~ /^DTS(?:-ES)?$/)
 
           if track[:width] == :surround
-            if  codec_name == @surround_encoder or
-                codec_name == 'ac3' or
+            if  ((codec_name == @surround_encoder or codec_name == 'ac3') and
+                (@keep_ac3_surround or (track[:stream]['bit_rate'].to_i / 1000) <= @surround_bitrate)) or
                 (@pass_dts and dts)
               encoder = 'copy'
             elsif input_channels > 2
@@ -2095,7 +2215,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.7.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.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Don Melton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2021-01-04 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,21 @@ 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-0.3.2.gem
+- other_video_transcoding-0.4.0.gem
+- other_video_transcoding-0.5.0.gem
+- other_video_transcoding-0.6.0.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 +55,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: []