other_video_transcoding 0.6.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e35c9d638ce45ae7407b8a3d88f0a785b515683c30e55b2d325e3cc243c15431
-  data.tar.gz: ae7a7405f0b57be44ee16dfc6b48c877730b4b6cd6933410a6ec3828bea124ef
+  metadata.gz: 325b662c56c03a0cac33994a3ab165381fe801615072c87188de4b8f6bd954f7
+  data.tar.gz: c26a3551deed5d3966168b881da8730672024b8363fc1e0e8611a27ca5ec9426
 SHA512:
-  metadata.gz: 15c29bac8aa3f7cb7ba9dcf6cf5c22e2c99f3b8ab8a709652166c885c5e2207873abdd2319c86cc5745aac977bab6911e50407356caa730976af465a88089dcb
-  data.tar.gz: 56d94453fda02a51ac29ddbdc904192874712f4ea3457a647383c2628bd54ebe636447771940e80ee6335a74e16ccef0fd14d6785e9a2998a22acf7b12c2f027
+  metadata.gz: dafd0f33a13e2b0f90db7e8ab8d0d7db19577177128dd133538593f762daddbf06c1ebf2735f05828b96255fc7970ce091434b78d9d80780598e9f18555ec5b1
+  data.tar.gz: 8d294809aceafa52a1b73007593d9e36ca966e4aa15a43b4a4ca99c74f9df23bfb8c0c892b9ddba6d3fe009798f8de35480c942cbb26db2b3fd7c8b913022e6a

data/CHANGELOG.md

@@ -2,6 +2,103 @@
 
 This single document contains all of the notes created for each [release](https://github.com/donmelton/other_video_transcoding/releases).
 
+## [0.10.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.10.0)
+
+Thursday, January 27, 2022
+
+* Add a `--nvenc-gpu-only` option to `other-transcode` to keep data on the GPU for greater speed, if possible. Deinterlacing is allowed but cropping, scaling, detelecining, setting frame rates and burning subtitles will prevent this from working and may actually slow things down. Performance can also be affected negatively depending on PC configuration. Please note that the `--nvenc-gpu-only` option requires `ffmpeg` version 5.0 or later.
+* Add a `--x264-cbr` option to `other-transcode` to simplify access to constant bitrate (CBR) ratecontrol. Despite the name, actual output bitrates from the `x264` encoder are variable and below what might be expected. So, default video bitrate targets are raised to accommodate this.
+* Enable proper crop detection in `other-transcode` for 4K UHD Blu-ray rips and other media with a 10-bit color depth. This was done by changing the `limit` value passed to the `cropdetect` filter from an integer constant to a floating point equation. Via [ #52](https://github.com/donmelton/other_video_transcoding/issues/52).
+* Modify `other-transcode` to add a workaround for the mapping of BT.470 M and BT.470 BG color transfer characteristics from values returned from `ffprobe` to values actually used by `ffmpeg`. Via [ #112](https://github.com/donmelton/other_video_transcoding/issues/112).
+* Modify `other-transcode` to allow parentheses within the argument to the `--yadif-params`, `--x264-params` and `--x265-params` options. Via [ #119](https://github.com/donmelton/other_video_transcoding/issues/119).
+* Modify `ask-ffmpeg-log` to fix detection of frame counts less than five digits within `.log` files from very short duration videos. Via [ #126](https://github.com/donmelton/other_video_transcoding/issues/126).
+* Modify `ask-ffmpeg-log` to fix detection of statistics within `.log` files not generated by `other-transcode`.
+* Remove the deprecated `--nvenc-rc-mode` and `--aac-stereo` options from `other-transcode`.
+* Update all copyright notices to the year 2022.
+
+## [0.9.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.9.0)
+
+Saturday, June 5, 2021
+
+Nvidia encoders:
+
+* Add a `--nvenc-recommended` option to `other-transcode` which easily and optimally configures the Nvidia H.264 and HEVC video encoders, equivalent to using:
+    * `--nvenc-spatial-aq --nvenc-lookahead 32 --nvenc-bframe-refs middle`
+* The `--nvenc-bframe-refs` option is also new and using `middle` as its argument increases compression efficiency. However, it's not supported on all Nvidia hardware. Which means, neither is the `--nvenc-recommended` option.
+* So, using `--nvenc-recommended` for H.264 encoding requires at minimum a fourth generation Pascal-based GPU like the GTX 1080. And using it for HEVC encoding requires at minimum a more recent sixth generation Turing-based model like the GTX 1660 or RTX 2070.
+* Add a `--nvenc-cq` option to `other-transcode` to allow constant quality (CQ) ratecontrol. This option ignores the target video bitrate and takes a single numerical argument between `1` and `51` with lower values indicating higher quality. However, only values between `25` and `30` are really practical for 1080p content. It's recommended to start with `--nvenc-cq 28` and adjust as needed. Fractional values are also supported.
+* While CQ ratecontrol can adapt better to extremely dynamic content compared to the default average bitrate (ABR) ratecontrol system, the output bitrates produced by CQ can vary significantly and it can be slightly more prone to color banding with the H.264 encoder. So, for now, consider the `--nvenc-cq` option an experimental feature.
+* Deprecate the `--nvenc-rc-mode` option in `other-transcode` because maximum rate and buffer size values are already specified so an explicit ratecontrol mode is not required.
+
+Audio:
+
+* Modify `other-transcode` to no longer explicitly set audio bitrates and instead rely on the defaults from the audio encoders included with `ffmpeg`. This is being done to both simplify the code in `other-transcode` and to leverage the judgement of the audio encoder developers, which means:
+    * AC-3 surround audio is lowered from 640 Kbps to 448 Kbps.
+    * Dolby Digital Plus (Enhanced AC-3) surround audio is raised from 384 Kbps to 448 Kbps.
+    * AAC stereo audio is lowered from 256 Kbps to 128 Kbps when using the native `ffmpeg` or Apple AudioToolbox encoders.
+* If desired, use the `--surround-bitrate` and `--stereo-bitrate` options to restore the previous default audio bitrates.
+* Add a `--aac-only` option to `other-transcode` to force transcoding of all audio into AAC format, copying only tracks which are already in that format. Surround tracks are converted to a 5.1-channel AAC format at 341 Kbps when using the native `ffmpeg` encoder. This channel layout is compatible with most playback devices. Allowing more than 5.1 channels would significantly reduce playback compatibility.
+* Deprecate the `--aac-stereo` option in `other-transcode` and replace with a new `--eac3-aac` option, which uses Dolby Digital Plus format only for surround audio with AAC format for stereo audio. Since the `--aac-stereo` option only made sense when used in combination with the `--eac3` option, this makes `--eac3-aac` more convenient.
+
+Other changes:
+
+* Change the default ratecontrol maximum rate and buffer size values in `other-transcode`, as well as how those values increased when the target video bitrate is increased. The default values now also differ depending on whether the output video is in H.264 or HEVC format.
+* Modify the `--rc-maxrate` and `--rc-bufsize` options in `other-transcode` to allow specific bitrates as arguments and not just multiples of the video bitrate target. These options are most useful for lowering maximum rate and buffer size values. To raise those values, increase the target video bitrate instead.
+* Change the pixel format and force a Main 10 video profile in `other-transcode` when using the Apple VideoToolbox encoder to create output with a 10-bit color depth. Correct generation of 10-bit output requires macOS Big Sur or later.
+* Modify `other-transcode` to copy the three basic color properties (primaries, transer and space) from the input to the output when those properties are availabe. Otherwise use some sensible defaults.
+* Modify `other-transcode` to force a H.264 level when using `--x264` with slower presets. This ensures that the `x264` encoder continues to generate a video stream compatible with most playback devices when those presets are used.
+* Modify `other-transcode` to remove the hack which avoids using the Matroksa muxer `-disposition` option in old versions of `ffmpeg`. This means version 4.3 or later of `ffmpeg` is now required to run `other-transcode`.
+
+## [0.8.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.8.0)
+
+Saturday, February 13, 2021
+
+* Modify `other-transcode` to:
+    * No longer automatically deinterlace video with a frame rate of 29.97 FPS.
+    * No longer change the frame rate of any video in MPEG-2 format which was automatically deinterlaced.
+    * Only automatically deinterlace non-progressive video.
+    * Apply any automatic or explicit deinterlacing to all frames of the video, not just the interlaced frames.
+    * Force a constant frame rate for any video in MPEG-2 format at 29.97 FPS.
+* Add a `--yadif-params` option to `other-transcode` to allow customization of the `yadif` filter used for deinterlacing.
+* Remove the deprecated `--all-eac3` option of `other-transcode`.
+
+## [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
@@ -9,7 +106,7 @@ 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. 
+* 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)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019-2020 Don Melton
+Copyright (c) 2019-2022 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/bin/ask-ffmpeg-log

@@ -2,7 +2,7 @@
 #
 # ask-ffmpeg-log
 #
-# Copyright (c) 2019-2020 Don Melton
+# Copyright (c) 2019-2022 Don Melton
 #
 
 require 'abbrev'
@@ -16,8 +16,8 @@ module Transcoding
   class Command
     def about
       <<-HERE
-ask-ffmpeg-log 0.6.0
-Copyright (c) 2019-2020 Don Melton
+ask-ffmpeg-log 0.10.0
+Copyright (c) 2019-2022 Don Melton
       HERE
     end
 
@@ -138,9 +138,9 @@ Options:
           fail "not a ffmpeg-generated `.log` file: #{log}"
         end
 
-        stats = content.match(/^frame=.*[.0-9]+x */m).to_s.lines.last.to_s.rstrip
+        stats = content.match(/^frame=.* speed= *[.0-9]+x */m).to_s.lines.last.to_s.rstrip
 
-        if stats =~ /frame=([0-9]+) fps=( *[.0-9]+)/
+        if stats =~ /frame=( *[0-9]+) fps=( *[.0-9]+)/
           frames = $1
           fps = $2
           seconds = frames.to_f / fps.lstrip.to_f

data/bin/other-transcode

@@ -2,7 +2,7 @@
 #
 # other-transcode
 #
-# Copyright (c) 2019-2020 Don Melton
+# Copyright (c) 2019-2022 Don Melton
 #
 
 require 'English'
@@ -18,8 +18,8 @@ module Transcoding
   class Command
     def about
       <<-HERE
-other-transcode 0.6.0
-Copyright (c) 2019-2020 Don Melton
+other-transcode 0.10.0
+Copyright (c) 2019-2022 Don Melton
       HERE
     end
 
@@ -91,8 +91,9 @@ Video options:
     --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)
+    --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
@@ -127,7 +128,7 @@ Video options:
     --deinterlace   reduce interlace artifacts without changing frame rate
                       (applied automatically for some inputs)
     --rate FPS      force constant video frame rate
-                      (`24000/1001` applied automatically for some inputs)
+                      (disables automatic deinterlacing)
     --detelecine    drop duplicate frames to restore original frame rate
                       (disables any deinterlacing and forced frame rate)
     --no-filters    disable any automatic adjustments via filters
@@ -136,15 +137,23 @@ Video options:
 
     def usage10
       <<-HERE
-    --rc-maxrate FACTOR, --rc-bufsize FACTOR
+    --yadif-params KEY=VALUE[:KEY=VALUE]...
+                    override yadif deinterlace filter configuration
+    --rc-maxrate FACTOR, --rc-bufsize FACTOR|BITRATE
                     set ratecontrol maximum rate and/or buffer size
-                      as multiple of video bitrate target
+                      as multiple of video bitrate target or specific bitrate
     --copy-video    disable transcoding and copy original video track
 
 Apple Video Toolbox encoder options:
     --vt-allow-sw   allow software encoding
 
 Nvidia video encoder options:
+    --nvenc-recommended
+                    apply optimal quality settings, equivalent to using:
+                      `--nvenc-spatial-aq`
+                      `--nvenc-lookahead 32`
+                      `--nvenc-bframe-refs middle`
+                      (not supported on all Nvidia hardware)
     --nvenc-spatial-aq
                     enable spatial adaptive quantization (AQ)
     --nvenc-temporal-aq
@@ -157,8 +166,12 @@ Nvidia video encoder options:
                     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)
+    --nvenc-bframe-refs each|middle
+                    set mode for using B-frames as reference frames
+    --nvenc-cq QUALITY
+                    use constant quality (CQ) ratecontrol at target quality
+    --nvenc-gpu-only
+                    keep data on GPU for greater speed, if possible
 
 Intel Quick Sync video encoder options:
     --qsv-refs FRAMES
@@ -182,6 +195,9 @@ Video Acceleration API encoder options:
                     set numeric level of compression
 
 x264 software video encoder options:
+    --x264-cbr      use constant bitrate (CBR) ratecontrol
+                      with variable bitrate output
+                      (raises default video bitrate targets)
     --x264-avbr     use average variable bitrate (AVBR) ratecontrol
     --x264-mbtree   use macroblock-tree ratecontrol (disables AVBR if in use)
     --x264-quick    increase encoding speed by 70-80%
@@ -238,34 +254,39 @@ Audio options:
     def usage15
       <<-HERE
     --surround-bitrate BITRATE
-                    set surround audio bitrate (default: 640)
+                    set surround audio bitrate (default: 448)
     --stereo-bitrate BITRATE
-                    set stereo audio bitrate (default: 256)
+                    set stereo audio bitrate (default: 128)
       HERE
     end
 
     def usage16
       <<-HERE
     --mono-bitrate BITRATE
-                    set mono audio bitrate (default: 50% of stereo bitrate)
+                    set mono audio bitrate (default: ~50% of stereo bitrate)
       HERE
     end
 
     def usage17
       <<-HERE
-    --eac3          use Enhanced AC-3 format for surround audio
+    --eac3          use Dolby Digital Plus (E-AC-3) format for all audio
+                      (default bitrates: 448 for surround, 192 for stereo)
       HERE
     end
 
     def usage18
       <<-HERE
-    --all-eac3       "     "      "     "     "  all audio
+    --eac3-aac      use Dolby Digital Plus format only for surround audio
+                      with AAC format for stereo audio
+    --aac-only      use AAC format for all audio,
+                      disabling passthrough of audio in other formats
+                      (default bitrates: 341 for surround, 128 for stereo)
     --limit-ac3-surround
                     don't copy surround audio in AC-3 format
-                      when orginal bitrate is above transcoding bitrate
+                      when orginal bitrate is above passthrough bitrate
     --keep-ac3-stereo
                     copy stereo and mono audio in AC-3 format
-                      even when orginal bitrate is above transcoding bitrate
+                      even when orginal bitrate is above passthrough bitrate
     --pass-dts      enable passthrough of audio in DTS and DTS-ES formats
       HERE
     end
@@ -307,13 +328,13 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @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
       @decode_method = nil
@@ -330,6 +351,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @rate = nil
       @detelecine = false
       @enable_filters = true
+      @yadif_params = nil
       @maxrate = nil
       @bufsize = nil
       @vt_allow_sw = false
@@ -339,7 +361,9 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @nvenc_multipass = nil
       @nvenc_refs = nil
       @nvenc_bframes = nil
-      @nvenc_rc_mode = 'vbr'
+      @nvenc_bframe_refs = nil
+      @nvenc_cq = nil
+      @nvenc_gpu_only = false
       @qsv_refs = nil
       @qsv_bframes = nil
       @amf_quality = nil
@@ -359,11 +383,12 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         :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
+      @aac_fallback_encoder = 'aac'
       @keep_ac3_surround = true
       @keep_ac3_stereo = false
       @pass_dts = false
@@ -502,6 +527,12 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       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
 
@@ -554,6 +585,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
           @target = [arg.to_i, 1].max
         end
 
+        @nvenc_cq = nil
         @encoder = nil if @encoder == 'copy'
       end
 
@@ -624,6 +656,14 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @enable_filters = false
       end
 
+      opts.on '--yadif-params ARG' do |arg|
+        arg.split ':' do |param|
+          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,\(\)]+$/
+        end
+
+        @yadif_params = arg
+      end
+
       opts.on '--rc-maxrate ARG', Float do |arg|
         @maxrate = arg
         @encoder = nil if @encoder == 'copy'
@@ -652,6 +692,13 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @vt_allow_sw = true
       end
 
+      opts.on '--nvenc-recommended' do
+        @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
+        @nvenc_spatial_aq = true
+        @nvenc_lookahead = 32
+        @nvenc_bframe_refs = 'middle'
+      end
+
       opts.on '--nvenc-spatial-aq' do
         @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
         @nvenc_spatial_aq = true
@@ -693,17 +740,29 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @nvenc_bframes = [[arg, 0].max, 4].min
       end
 
-      opts.on '--nvenc-rc-mode ARG' do |arg|
+      opts.on '--nvenc-bframe-refs ARG' do |arg|
         @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
 
-        @nvenc_rc_mode = case arg
-        when 'vbr', 'vbr_hq'
+        @nvenc_bframe_refs = case arg
+        when 'each', 'middle'
           arg
         else
-          fail UsageError, "invalid rate control argument: #{arg}"
+          fail UsageError, "invalid B-frames as references argument: #{arg}"
         end
       end
 
+      opts.on '--nvenc-cq ARG', Float do |arg|
+        @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
+        @nvenc_cq = [[arg, 1].max, 51].min.to_s.sub(/\.0$/, '')
+      end
+
+      opts.on '--nvenc-gpu-only' do
+        @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
+        @decode_scope = :all
+        @decode_method = 'cuda'
+        @nvenc_gpu_only = true
+      end
+
       opts.on '--qsv-refs ARG', Integer do |arg|
         @encoder = @hevc ? 'hevc_qsv' : 'h264_qsv'
         @qsv_refs = [arg, 0].max
@@ -750,6 +809,16 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @vaapi_compression = [arg, 0].max
       end
 
+      opts.on '--x264-cbr' do
+        @encoder = 'libx264'
+        @hevc = false
+        @x264_mbtree = true
+        @x264_avbr = false
+        @x264_params = nil
+        @maxrate = 1.0
+        @bufsize = nil
+      end
+
       opts.on '--x264-avbr' do
         @encoder = 'libx264'
         @hevc = false
@@ -776,7 +845,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       opts.on '--x264-params ARG' do |arg|
         arg.split ':' do |param|
-          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,]+$/
+          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,\(\)]+$/
         end
 
         @encoder = 'libx264'
@@ -789,7 +858,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       opts.on '--x265-params ARG' do |arg|
         arg.split ':' do |param|
-          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,]+$/
+          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,\(\)]+$/
         end
 
         @encoder = 'libx265'
@@ -840,6 +909,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       opts.on '--stereo-bitrate ARG', Integer do |arg|
         @stereo_bitrate = arg
+        @mono_bitrate ||= @stereo_bitrate / 2
       end
 
       opts.on '--mono-bitrate ARG', Integer do |arg|
@@ -848,11 +918,17 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       opts.on '--eac3' do
         @surround_encoder = 'eac3'
+        @stereo_encoder   = 'eac3'
       end
 
-      opts.on '--all-eac3' do
+      opts.on '--eac3-aac' do
         @surround_encoder = 'eac3'
-        @stereo_encoder   = 'eac3'
+        @stereo_encoder = nil
+      end
+
+      opts.on '--aac-only' do
+        @surround_encoder = nil
+        @stereo_encoder   = nil
       end
 
       opts.on '--limit-ac3-surround' do
@@ -861,10 +937,12 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       opts.on '--keep-ac3-stereo' do
         @keep_ac3_stereo = true
+        @surround_encoder ||= 'ac3'
       end
 
       opts.on '--pass-dts' do
         @pass_dts = true
+        @surround_encoder ||= 'ac3'
       end
 
       opts.on '--add-subtitle ARG' do |arg|
@@ -917,15 +995,6 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
     def configure(path)
       @audio_selections.uniq!
       @subtitle_selections.uniq!
-      min_bitrate = @surround_encoder == 'eac3' ? 192 : 256
-      @surround_bitrate = [[@surround_bitrate, min_bitrate].max, (@surround_encoder == 'ac3' ? 640 : 768)].min
-      @stereo_bitrate = [[@stereo_bitrate, min_bitrate / 2].max, (@stereo_encoder == 'eac3' ? 768 : 320)].min
-
-      if @mono_bitrate.nil?
-        @mono_bitrate = @stereo_bitrate / 2
-      else
-        @mono_bitrate = [[@mono_bitrate, min_bitrate / 4].max, (@stereo_encoder == 'eac3' ? 768 : 256)].min
-      end
 
       [
         ['ffprobe', '-loglevel', 'quiet', '-version'],
@@ -965,24 +1034,32 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         end
       end
 
+      @nvenc_cq = nil unless @encoder =~ /nvenc$/
       @ten_bit = (@hevc and @encoder =~ /(nvenc|qsv|x265)$/ ? true : false) if @ten_bit.nil?
-      @target_2160p ||= @hevc ? 12000 : 16000
-      @target_1080p ||= @hevc ? 6000  : 8000
-      @target_720p  ||= @hevc ? 3000  : 4000
-      @target_480p  ||= @hevc ? 1500  : 2000
+
+      if @encoder == 'libx264' and @x264_mbtree and @maxrate == 1.0
+        @target_2160p ||= 15000
+        @target_1080p ||= 7500
+        @target_720p  ||= 4500
+        @target_480p  ||= 2250
+      else
+        @target_2160p ||= @hevc ? 8000 : 12000
+        @target_1080p ||= @hevc ? 4000 :  6000
+        @target_720p  ||= @hevc ? 2000 :  3000
+        @target_480p  ||= @hevc ? 1000 :  1500
+      end
+
       @decode_method ||= @encoder =~ /nvenc$/ ? 'cuda' : 'auto'
 
       if @stereo_encoder.nil?
         if encoders =~ /aac_at/ or encoders =~ /libfdk_aac/
           @stereo_encoder = $MATCH
+          @aac_fallback_encoder = 'libfdk_aac' if encoders =~ /libfdk_aac/
         else
           @stereo_encoder = 'aac'
         end
-      end
 
-      if @format == :mkv
-        capabilities = get_muxer_capabilities
-        @mkv_options = ['-default_mode', 'passthrough'] if capabilities =~ /passthrough/
+        @surround_encoder ||= @stereo_encoder
       end
     end
 
@@ -1032,17 +1109,17 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         IO.popen([
           'ffmpeg',
           '-loglevel', 'quiet',
-          '-nostdin'
-        ] + (encoder =~ /vaapi$/ ? ['-vaapi_device', '/dev/dri/renderD128'] : []) + [
+          '-nostdin',
+          *(encoder =~ /vaapi$/ ? ['-vaapi_device', '/dev/dri/renderD128'] : []),
           '-i', path,
-          '-frames:v', '1'
-        ] + (encoder =~ /vaapi$/ ? ['-filter:v', 'format=nv12,hwupload'] : []) + [
+          '-frames:v', '1',
+          *(encoder =~ /vaapi$/ ? ['-filter:v', 'format=nv12,hwupload'] : []),
           '-c:v', encoder,
-          '-b:v', '1000k'
-        ] + (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'] : []) + [
+          '-b:v', '1000k',
+          *(encoder =~ /nvenc$/ ? ['-rc:v', 'vbr'] : []),
+          *(encoder == 'h264_qsv' ? ['-look_ahead:v', '1'] : []),
+          *(encoder == 'hevc_qsv' ? ['-load_plugin:v', 'hevc_hw'] : []),
+          *(encoder =~ /amf$/ ? ['-rc:v', 'vbr_latency'] : []),
           '-an',
           '-sn',
           '-ignore_unknown',
@@ -1060,30 +1137,6 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       $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
 
@@ -1145,16 +1198,16 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       ffmpeg_command = [
         'ffmpeg',
         '-loglevel', (@debug ? 'verbose' : 'error'),
-        '-stats'
-      ] + time_options +
-          decode_options + [
-        '-i', path
-      ] + (@max_muxing_queue_size.nil? ? [] : ['-max_muxing_queue_size', @max_muxing_queue_size.to_s]) +
-          encode_options +
-          get_audio_options(media_info) +
-          get_subtitle_options(media_info, burn_subtitle) + [
-        '-metadata:g', 'title='
-      ] + (@format == :mkv ? @mkv_options : ['-movflags', 'disable_chpl']) + [
+        '-stats',
+        *time_options,
+        *decode_options,
+        '-i', path,
+        *(@max_muxing_queue_size.nil? ? [] : ['-max_muxing_queue_size', @max_muxing_queue_size.to_s]),
+        *encode_options,
+        *get_audio_options(media_info),
+        *get_subtitle_options(media_info, burn_subtitle),
+        '-metadata:g', 'title=',
+        *(@format == :mkv ? ['-default_mode', 'passthrough'] : ['-movflags', 'disable_chpl']),
         output_path
       ]
 
@@ -1314,10 +1367,11 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         index += 1
         puts "\##{index} subtitle:"
         print "      format = #{stream['codec_name']}"
-        frames = stream.fetch('tags', {}).fetch('NUMBER_OF_FRAMES-eng', '')
+        tags = stream.fetch('tags', {})
+        frames = tags.fetch('NUMBER_OF_FRAMES', tags.fetch('NUMBER_OF_FRAMES-eng', ''))
         puts frames.empty? ? '' : " / #{frames} " + (frames == 1 ? 'frame' : 'frames')
-        puts "    language = #{stream.fetch('tags', {}).fetch('language', '')}"
-        title = stream.fetch('tags', {}).fetch('title', '')
+        puts "    language = #{tags.fetch('language', '')}"
+        title = tags.fetch('title', '')
         puts "       title = #{title}" unless title.empty?
         default = (stream['disposition']['default'] == 1)
         forced  = (stream['disposition']['forced'] == 1)
@@ -1332,8 +1386,8 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
     end
 
     def get_bitrate(stream)
-      bitrate = stream.fetch('bit_rate', '')
-      bitrate = stream.fetch('tags', {}).fetch('BPS-eng', '') if bitrate.empty?
+      tags = stream.fetch('tags', {})
+      bitrate = stream.fetch('bit_rate', tags.fetch('BPS', tags.fetch('BPS-eng', '')))
       return nil if bitrate.empty?
 
       bitrate.to_i / 1000
@@ -1398,7 +1452,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
             '-ss', position.to_s,
             '-i', path,
             '-frames:v', '15',
-            '-filter:v', 'cropdetect=24:2',
+            '-filter:v', 'cropdetect=24.0/255:2',
             '-an',
             '-sn',
             '-ignore_unknown',
@@ -1570,28 +1624,22 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       end
 
       deinterlace = @deinterlace
-      rate = @rate
-
-      if @enable_filters
-        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'
-            rate = '24000/1001'
-          end
-        end
+      if @enable_filters and video.fetch('field_order', 'progressive') != 'progressive'
+        deinterlace = true
       end
 
       frame_rate_filter = nil
 
-      if deinterlace
-        frame_rate_filter = 'yadif=deint=interlaced' unless @encoder == 'copy'
+      if deinterlace and @encoder != 'copy'
+        frame_rate_filter = 'yadif'
+        frame_rate_filter += "=#{@yadif_params}" unless @yadif_params.nil?
       end
 
-      unless rate.nil?
+      unless @rate.nil?
         frame_rate_filter = '' if frame_rate_filter.nil?
         frame_rate_filter += ',' unless frame_rate_filter.empty?
-        frame_rate_filter += "fps=#{rate}"
+        frame_rate_filter += "fps=#{@rate}"
       end
 
       if @detelecine
@@ -1601,12 +1649,6 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       width   = video['width'].to_i
       height  = video['height'].to_i
 
-      if width == 720 and height == 576 and video['codec_name'] == 'mpeg2video'
-        pal = true
-      else
-        pal = false
-      end
-
       if crop.nil? or (crop == {:width => width, :height => height, :x => 0, :y => 0})
         crop_filter = nil
       else
@@ -1639,6 +1681,8 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         decode_options = []
       end
 
+      nvenc_gpu_only = false
+
       if (@decode_scope == :vc1 and video['codec_name'] == 'vc1') or @decode_scope == :all
         if @encoder =~ /vaapi$/
           decode_options = [
@@ -1655,6 +1699,18 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
           decode_options += ['-hwaccel', decode_method]
 
+          if  @nvenc_gpu_only and
+              decode_method == 'cuda' and
+              @encoder =~ /nvenc$/ and
+              overlay_filter.nil? and
+              (frame_rate_filter.nil? or frame_rate_filter !~ /fps=/) and
+              crop_filter.nil? and
+              scale_filter.nil?
+            decode_options += ['-hwaccel_output_format', 'cuda']
+            nvenc_gpu_only = true
+            frame_rate_filter.sub!(/^yadif/, 'yadif_cuda') unless frame_rate_filter.nil?
+          end
+
           if  decode_method == 'qsv' and
               overlay_filter.nil? and
               frame_rate_filter.nil? and
@@ -1687,15 +1743,27 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         end
       end
 
+      ten_bit = (@ten_bit ? (@eight_bit_vc1 ? (video['codec_name'] != 'vc1') : true) : false)
+      pix_fmt = true
+
       if @encoder =~ /vaapi$/ and not decode_options.include?('-hwaccel')
         conversion_filter = 'format=nv12,hwupload'
+      elsif nvenc_gpu_only
+        conversion_filter = "scale_cuda=format=#{ten_bit ? 'p010le' : 'yuv420p'}"
+        pix_fmt = false
       else
         conversion_filter = nil
       end
 
+      encode_options = []
+
       if @encoder == 'copy'
         filter = ''
       else
+        if video['codec_name'] == 'mpeg2video' and video['avg_frame_rate'] == '30000/1001'
+          encode_options += ['-vsync', 'cfr']
+        end
+
         filter =  overlay_filter.nil?     ? '' : overlay_filter
         filter += frame_rate_filter.nil?  ? '' : ",#{frame_rate_filter}"
         filter += crop_filter.nil?        ? '' : ",#{crop_filter}"
@@ -1705,7 +1773,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       end
 
       if overlay_filter.nil?
-        encode_options = [
+        encode_options += [
           '-map', "0:#{video['index']}"
         ]
 
@@ -1715,66 +1783,65 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
           ]
         end
       else
-        encode_options = [
+        encode_options += [
           '-filter_complex', "[0:#{video['index']}]#{filter}[v]",
           '-map', '[v]'
         ]
       end
 
-      hdr = ((video.fetch('pix_fmt', 'yuv420p') == 'yuv420p10le') and @ten_bit)
+      color_primaries = video['color_primaries']
+      color_trc       = video['color_transfer']
+      color_trc       = 'gamma22' if color_trc == 'bt470m'
+      color_trc       = 'gamma28' if color_trc == 'bt470bg'
+      colorspace      = video['color_space']
 
-      if hdr
-        color_primaries = 'bt2020'
-        color_trc       = 'smpte2084'
-        colorspace      = 'bt2020nc'
-      else
-        color_primaries = 'bt709'
-        color_trc       = 'bt709'
-        colorspace      = 'bt709'
+      if (video.fetch('pix_fmt', 'yuv420p') == 'yuv420p10le') and ten_bit
+        color_primaries ||= 'bt2020'
+        color_trc       ||= 'smpte2084'
+        colorspace      ||= 'bt2020nc'
       end
 
       if width > 1920 or height > 1080
+        level = '5.1'
         bitrate = @target_2160p
-        max_bitrate = 40000
-        max_dpb_mbs = 184320
+        max_bitrate = @hevc ? 25000 : 135000 # Level 5 HEVC Main 10 or H.264 Main
       elsif width > 1280 or height > 720
+        level = '4'
         bitrate = @target_1080p
-        max_bitrate = 20000
-        max_dpb_mbs = 32768
+        max_bitrate = @hevc ? 12000 : 20000 # Level 4
       elsif width > 720 or height > 576
+        level = '3.1'
         bitrate = @target_720p
-        max_bitrate = 10000
-        max_dpb_mbs = 18000
+        max_bitrate = @hevc ? 10000 : 14000 # Level 3.1
       else
+        color_primaries ||= (width == 720 and height == 576 and video['codec_name'] == 'mpeg2video') ? 'bt470bg' : 'smpte170m'
+        colorspace      ||= 'smpte170m'
+        level = '3'
         bitrate = @target_480p
-        max_bitrate = 5000
-        max_dpb_mbs = 8100
-
-        unless hdr
-          color_primaries = pal ? 'bt470bg' : 'smpte170m'
-          colorspace      = 'smpte170m'
-        end
+        max_bitrate = @hevc ? 6000 : 10000 # Level 3
       end
 
+      color_primaries ||= 'bt709'
+      color_trc       ||= 'bt709'
+      colorspace      ||= 'bt709'
       bitrate = @target unless @target.nil?
       bitrate = [bitrate, max_bitrate].min
-      maxrate = 0
-      bufsize = 0
 
       if @encoder =~ /(nvenc|hevc_qsv|libx26[45])$/
-        if @maxrate.nil?
-          maxrate = bitrate * 3
-        else
-          maxrate = [[(bitrate * @maxrate).to_i, (bitrate * 1.5).to_i].max, bitrate * 3].min
+        maxrate = [max_bitrate, bitrate * 2].max
+
+        unless @maxrate.nil?
+          maxrate = [[(@maxrate < bitrate ? bitrate * @maxrate : @maxrate).to_i, bitrate].max, maxrate].min
         end
 
-        if @bufsize.nil?
-          bufsize = maxrate if @encoder =~ /(nvenc|libx26[45])$/
-        else
-          unless @bufsize == 0 and @encoder =~ /nvenc$/
-            bufsize = [[(bitrate * @bufsize).to_i, bitrate].max, bitrate * 4].min
-          end
+        bufsize = @encoder == 'hevc_qsv' ? 0 : maxrate
+
+        unless @bufsize.nil?
+          bufsize = [[(@bufsize < bitrate ? bitrate * @bufsize : @bufsize).to_i, bitrate].max, maxrate].min
         end
+      else
+        maxrate = 0
+        bufsize = 0
       end
 
       unless @preset.nil?
@@ -1806,7 +1873,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       text = "#{sprintf("%2d", video['index'])} = #{@encoder}"
 
       unless @encoder == 'copy'
-        text += " / #{bitrate} Kbps"
+        text += @nvenc_cq.nil? ? " / #{bitrate} Kbps" : " / #{@nvenc_cq} CQ"
         text += " / #{@preset}" unless @preset.nil?
       end
 
@@ -1816,21 +1883,25 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       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"] unless @encoder == 'copy'
+      encode_options += ['-pix_fmt:v', (@encoder =~ /(videotoolbox|nvenc|qsv)$/ ? 'p010le' : 'yuv420p10le')] if ten_bit and pix_fmt
+      encode_options += (@nvenc_cq.nil? ? ['-b:v', "#{bitrate}k"] : ['-cq:v', @nvenc_cq]) 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 += ['-allow_sw:v', '1'] if @encoder =~ /videotoolbox$/ and @vt_allow_sw
+
+      if @encoder =~ /videotoolbox$/
+        encode_options += ['-allow_sw:v', '1'] if @vt_allow_sw
+        encode_options += ['-profile:v', 'main10'] if ten_bit
+      end
 
       if @encoder =~ /nvenc$/
-        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?
+        encode_options += ['-b_ref_mode:v', @nvenc_bframe_refs]       unless @nvenc_bframe_refs.nil?
       end
 
       if @encoder =~ /qsv$/
@@ -1866,20 +1937,10 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
             ]
           end
         else
-          max_refs = [(max_dpb_mbs / (((width + 15) / 16) * ((height + 15) / 16))), 16].min
-
           case @preset
-          when 'slow'
-            refs = 5
-          when 'slower'
-            refs = 8
-          when 'veryslow', 'placebo'
-            refs = 16
-          else
-            refs = 0
+          when 'slow', 'slower', 'veryslow', 'placebo'
+            encode_options += ['-level:v', level]
           end
-
-          encode_options += ['-refs:v', max_refs.to_s] if refs > max_refs
         end
 
         encode_options += ['-x264-params:v', @x264_params] unless @x264_params.nil?
@@ -1889,7 +1950,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         encode_options += ['-x265-params:v', @x265_params] unless @x265_params.nil?
       end
 
-      unless @ten_bit
+      unless ten_bit
         encode_options += ['-profile:v', 'high'] if @encoder =~ /^(h264_nvenc|h264_amf|libx264)$/
       end
 
@@ -1932,15 +1993,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       audio_tracks = [{
         :stream => main_audio,
-        :width => width,
-        :bitrate => case width
-        when :stereo
-          @stereo_bitrate
-        when :surround
-          @surround_bitrate
-        when :original
-          nil
-        end
+        :width => width
       }]
 
       titles = {}
@@ -1954,15 +2007,6 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
         width = selection[:width]
 
-        bitrate = case width
-        when :stereo
-          @stereo_bitrate
-        when :surround
-          @surround_bitrate
-        when :original
-          nil
-        end
-
         unless selection[:track].nil?
           audio_track = 0
 
@@ -1974,8 +2018,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
             if audio_track == selection[:track]
               audio_tracks += [{
                 :stream => stream,
-                :width => width,
-                :bitrate => bitrate
+                :width => width
               }]
 
               break
@@ -1992,8 +2035,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
                 stream['index'] != main_audio['index']
               audio_tracks += [{
                 :stream => stream,
-                :width => width,
-                :bitrate => bitrate
+                :width => width
               }]
             end
           end
@@ -2008,8 +2050,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
             if title =~ /#{selection[:title]}/i and stream['index'] != main_audio['index']
               audio_tracks += [{
                 :stream => stream,
-                :width => width,
-                :bitrate => bitrate
+                :width => width
               }]
 
               titles[stream['index']] = title
@@ -2035,23 +2076,32 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         if track[:width] == :original
             encoder = 'copy'
         else
+          input_bitrate = track[:stream].fetch('bit_rate', '256').to_i / 1000
           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') and
-                (@keep_ac3_surround or (track[:stream]['bit_rate'].to_i / 1000) <= @surround_bitrate)) or
+            if  (@surround_encoder =~ /aac/ and codec_name == 'aac') or
+                (@surround_encoder =~ /ac3$/ and
+                (codec_name == @surround_encoder or codec_name == 'ac3') and
+                (@keep_ac3_surround or input_bitrate <= (@surround_bitrate.nil? ? 640 : @surround_bitrate))) or
                 (@pass_dts and dts)
               encoder = 'copy'
             elsif input_channels > 2
               encoder = @surround_encoder
               bitrate = @surround_bitrate
+
+              if encoder =~ /aac/
+                encoder = @aac_fallback_encoder if encoder == 'aac_at'
+                channels = 6
+              end
             end
           end
 
           if encoder.nil?
             if  input_channels <= 2 and (codec_name == 'aac' or
-                ((codec_name == @surround_encoder or codec_name == 'ac3') and
-                (@keep_ac3_stereo or (track[:stream]['bit_rate'].to_i / 1000) <= @stereo_bitrate)) or
+                (@surround_encoder =~ /ac3$/ and
+                (codec_name == @surround_encoder or codec_name == 'ac3') and
+                (@keep_ac3_stereo or input_bitrate <= (@stereo_bitrate.nil? ? 256 : @stereo_bitrate))) or
                 (@pass_dts and dts))
               encoder = 'copy'
             else
@@ -2080,19 +2130,19 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         configurations[input_index] = configuration
         text = "#{sprintf("%2d", input_index)} = #{encoder}"
         text += " / #{bitrate} Kbps" unless bitrate.nil?
-        text += ' / stereo' unless channels.nil?
+        text += ' / stereo' unless channels.nil? or channels > 2
         text += " / #{titles[input_index]}" if titles.has_key?(input_index)
         Kernel.warn text
         copy_track_name = (@copy_track_names or titles.has_key?(input_index))
 
         options += [
           '-map', "0:#{input_index}",
-          "-c:a:#{index}", encoder
-        ] + (encoder == 'aac_at' ? ["-aac_at_mode:a:#{index}", 'cvbr'] : []) +
-            (bitrate.nil? ? [] : ["-b:a:#{index}", "#{bitrate}k"]) +
-            (channels.nil? ? [] : ["-ac:a:#{index}", "#{channels}"]) +
-            (track[:stream]['sample_rate'] != '48000' ? ["-ar:a:#{index}", '48000'] : []) +
-            (copy_track_name ? [] : ["-metadata:s:a:#{index}", 'title=']) + [
+          "-c:a:#{index}", encoder,
+          *(encoder == 'aac_at' ? ["-aac_at_mode:a:#{index}", 'cvbr'] : []),
+          *(bitrate.nil? ? [] : ["-b:a:#{index}", "#{bitrate}k"]),
+          *(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=']),
           "-disposition:a:#{index}", (index == 0 ? 'default' : '0')
         ]
 

data/other_video_transcoding.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'other_video_transcoding'
-  s.version               = '0.6.0'
+  s.version               = '0.10.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.6.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Don Melton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies: []
 description: "    Other Video Transcoding is a package of tools to transcode videos.\n"
 email: don@blivet.com
@@ -33,6 +33,10 @@ files:
 - 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-0.7.0.gem
+- other_video_transcoding-0.8.0.gem
+- other_video_transcoding-0.9.0.gem
 - other_video_transcoding.gemspec
 homepage: https://github.com/donmelton/other_video_transcoding
 licenses:
@@ -53,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Other tools to transcode videos.