other_video_transcoding 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbe4654304564db44ba76d5b6b4a805a853e4ae2fca1238f69d7ceac6152970b
-  data.tar.gz: 5104621d3963ddacfd90796a2dd9cad57fc04f03c47e6122cc7dccd3794df16c
+  metadata.gz: e5caa1866dd6d3035704fb8977f21d682291ebfd46a6496974399a6876b13d33
+  data.tar.gz: b7c206ee00b2162bfea7b9c27f7566c879225a32efcfbf7a09fd7a9fc88f8200
 SHA512:
-  metadata.gz: 6eec714eb59091c7ee48b74a4ac6dba65b3333bfa3dbb76b24ef5afb334e0c7434cc16234fe8e056cb7328eecc820794a8f54433082a49db6e06c02b812c690d
-  data.tar.gz: ff5ee96313996a08b9433e223c64e01b492c7bebc1735c5533d6f263373c56e8202d13e78bd9c07221f6b08c502577d9ae8701a53f5741a4ce57911b8024b826
+  metadata.gz: d1c667e8c485d1ab70a4c035aa53915365aa6225cab6487f0488c37fa99eb7632e1ffc262ab3f256a55d8e43c71caaa20ed1d8dd64194a275972dbc1c65dee38
+  data.tar.gz: a47799076252ff46103419e41def057edfc4e63ec299b477f2360f7aad0ed866c14d0ff5f5ac2f8a3d1aeaf7a40fc47a2e3f4d203bc88c128cd0ce893f6fd22d

data/CHANGELOG.md

@@ -2,6 +2,63 @@
 
 This single document contains all of the notes created for each [release](https://github.com/donmelton/other_video_transcoding/releases).
 
+## [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
+
+* Modify the `--preview-crop` option in `other-transcode` to show commands compatible with newer versions of `mpv`.
+* No longer force a NTSC film frame rate for interlaced inputs in PAL MPEG-2 format.
+* When using the `--dry-run` option in `other-transcode`, issue a warning instead of failing if the output or log files already exist.
+* Add a link to another Docker container for Linux in the "README" document. Thanks, @ttyS0!
+
+## [0.3.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.3.0)
+
+Thursday, February 27, 2020
+
+* Add a `--scan` option to `other-transcode`. This prints media information and then exits, allowing easy identification of track numbers and formats. Via [ #11](https://github.com/donmelton/other_video_transcoding/issues/11).
+* Add a `--mono-bitrate` option to `other-transcode`. This sets the mono audio bitrate, which is otherwise 50% of the stereo bitrate.
+* Raise the maximum bitrates for audio in AAC format to 320 Kbps for stereo and 256 Kbps for mono. The default birates remain the same.
+* Add a `--all-eac3` option to `other-transcode`. This uses the Dolby Digital Plus (Enhanced AC-3) format for all transcoded audio. The behavior of the `--eac3` option, which uses Dolby Digital Plus for surround audio only, remains the same.
+* Add a `--keep-ac3-stereo` option to `other-transcode`. This copies stereo and mono audio in AC-3 format even when the original source bitrate is above the output transcoding bitrate.
+* Add a `--pass-dts` option to `other-transcode`. This enables passthrough of audio in DTS and DTS-ES formats. However, such audio also in surround format will still be transcoded if that audio is output to a stereo-width track.
+* Add `--rc-maxrate` and `--rc-bufsize` options to `other-transcode`. These set the ratecontrol maximum rate and/or the buffer size as a multiple of the video bitrate target, but only for certain encoders and ratecontrol systems.
+* Add a `--x264-mbtree` option to `other-transcode`. This uses macroblock-tree ratecontrol and disables AVBR if in use.
+* In order to ensure compatible H.264 levels, limit the number of reference frames when using the `x264` encoder with slower presets.
+* Remove the deprecated `--name` option of `other-transcode`.
+* Add a link to a Docker container for Linux in the "README" document. Thanks, @ttyS0!
+
 ## [0.2.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.2.0)
 
 Monday, January 13, 2020

data/README.md

@@ -62,6 +62,10 @@ See "[Download FFmpeg](https://ffmpeg.org/download.html)," "[MKVToolNix Download
 
 Additional documentation for installing these programs on Windows is available in the [wiki](https://github.com/donmelton/other_video_transcoding/wiki/Windows).
 
+[Docker](https://en.wikipedia.org/wiki/Docker_(software)) containers for Linux, including installation instructions, are available here:
+
+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:
 
     brew install ffmpeg

data/bin/ask-ffmpeg-log

@@ -15,14 +15,14 @@ module Transcoding
 
   class Command
     def about
-      <<HERE
-ask-ffmpeg-log 0.2.0
+      <<-HERE
+ask-ffmpeg-log 0.5.0
 Copyright (c) 2019-2020 Don Melton
-HERE
+      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
@@ -65,6 +65,7 @@ HERE
       end
 
       fail UsageError, 'missing argument' if ARGV.empty?
+
       ARGV.each { |arg| process_input arg }
       complete
       exit
@@ -92,10 +93,12 @@ HERE
       if File.directory? input
         logs = Dir[input + File::SEPARATOR + '*.log']
         fail "does not contain `.log` files: #{input}" if logs.empty?
+
         @logs += logs
         @paths << input
       else
         fail "not a `.log` file: #{input}" unless File.extname(input) == '.log'
+
         @logs << File.absolute_path(input)
         @paths << File.dirname(input)
       end

data/bin/other-transcode

@@ -17,14 +17,14 @@ module Transcoding
 
   class Command
     def about
-      <<HERE
-other-transcode 0.2.0
+      <<-HERE
+other-transcode 0.5.0
 Copyright (c) 2019-2020 Don Melton
-HERE
+      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,54 +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
@@ -92,19 +93,24 @@ HERE
     --10-bit, --no-10-bit
                     use 10-bit pixel format (default: not used for H.264,
                       used for HEVC with Nvidia, Intel and x265 encoders)
-    --preset NAME|none
-                    apply video encoder preset or disable default settings
+    --preset NAME   apply video encoder preset
     --decode vc1|all|none
                     set scope of automatic hardware decoder acceleration
                       (default: vc1 for VC-1 format only)
-    --cuvid         use Nvidia video decoder
-                      for H.264, VC-1, MPEG-2 and other formats
-                      (ignores scope set by `--decode`)
-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
@@ -112,11 +118,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)
@@ -125,28 +131,34 @@ 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
     --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-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
@@ -171,30 +183,37 @@ Video Acceleration API encoder options:
 
 x264 software video encoder options:
     --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%
                       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
@@ -207,22 +226,49 @@ 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
+    end
+
+    def usage16
+      <<-HERE
+    --mono-bitrate BITRATE
+                    set mono audio bitrate (default: 50% of stereo bitrate)
+      HERE
+    end
+
+    def usage17
+      <<-HERE
     --eac3          use Enhanced AC-3 format for surround audio
+      HERE
+    end
+
+    def usage18
+      <<-HERE
+    --all-eac3       "     "      "     "     "  all audio
+    --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
+    end
+
+    def usage19
+      <<-HERE
 
 Subtitle options:
     --add-subtitle TRACK[=forced]|auto|all|LANGUAGE|STRING
@@ -247,17 +293,18 @@ Other options:
     --version       output version information and exit
 
 Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
-HERE
+      HERE
     end
 
     def initialize
       @position = nil
       @duration = nil
       @debug = false
+      @scan = false
       @detect = false
       @preview = false
       @format = :mkv
-      @name = nil
+      @mkv_options = []
       @copy_track_names = false
       @max_muxing_queue_size = nil
       @dry_run = false
@@ -266,7 +313,8 @@ HERE
       @ten_bit = nil
       @preset = nil
       @decode_scope = :vc1
-      @decoder_type = nil
+      @decode_method = nil
+      @qsv_device = nil
       @target_2160p = nil
       @target_1080p = nil
       @target_720p  = nil
@@ -279,12 +327,16 @@ HERE
       @rate = nil
       @detelecine = false
       @enable_filters = true
+      @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
@@ -294,7 +346,10 @@ HERE
       @amf_bframes = nil
       @vaapi_compression = nil
       @x264_avbr = false
+      @x264_mbtree = false
       @x264_quick = false
+      @x264_params = nil
+      @x265_params = nil
       @audio_selections = [{
         :track => 1,
         :language => nil,
@@ -303,8 +358,11 @@ HERE
       }]
       @surround_bitrate = 640
       @stereo_bitrate = 256
+      @mono_bitrate = nil
       @surround_encoder = 'ac3'
       @stereo_encoder = nil
+      @keep_ac3_stereo = false
+      @pass_dts = false
       @subtitle_selections = []
       @auto_add_subtitle = false
       @burn_subtitle_track = 0
@@ -320,12 +378,15 @@ HERE
             when 'full'
               puts  usage1 + usage2 + usage3 + usage4 + usage5 + usage6 +
                     usage7 + usage8 + usage9 + usage10 + usage11 + usage12 +
-                    usage13 + usage14 + usage15
+                    usage13 + usage14 + usage15 + usage16 + usage17 +
+                    usage18 + usage19
             when 'more'
               puts  usage1 + usage2 + usage3 + usage4 + usage6 + usage7 +
-                    usage8 + usage9 + usage11 + usage13 + usage15
+                    usage8 + usage9 + usage11 + usage13 + usage15 + usage16 +
+                    usage17 + usage18 + usage19
             else
-              puts  usage1 + usage3 + usage6 + usage8 + usage11 + usage13 + usage15
+              puts  usage1 + usage3 + usage6 + usage8 + usage11 + usage13 +
+                    usage15 + usage17 + usage19
             end
 
             exit
@@ -341,6 +402,7 @@ HERE
       end
 
       fail UsageError, 'missing argument' if ARGV.empty?
+
       configure ARGV.first
       ARGV.each { |arg| process_input arg }
       exit
@@ -369,6 +431,10 @@ HERE
         @debug = true
       end
 
+      opts.on '--scan' do
+        @scan = true
+      end
+
       opts.on '--preview-crop' do
         @detect = true
         @preview = true
@@ -383,13 +449,6 @@ HERE
         @format = :mp4
       end
 
-      opts.on '--name ARG' do |arg|
-        @name = arg
-        Kernel.warn '**********'
-        Kernel.warn 'Using deprecated option: --name'
-        Kernel.warn '**********'
-      end
-
       opts.on '--copy-track-names' do
         @copy_track_names = true
       end
@@ -456,8 +515,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|
@@ -514,7 +582,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|
@@ -552,6 +620,16 @@ HERE
         @enable_filters = false
       end
 
+      opts.on '--rc-maxrate ARG', Float do |arg|
+        @maxrate = arg
+        @encoder = nil if @encoder == 'copy'
+      end
+
+      opts.on '--rc-bufsize ARG', Float do |arg|
+        @bufsize = arg
+        @encoder = nil if @encoder == 'copy'
+      end
+
       opts.on '--copy-video' do
         @encoder = 'copy'
         @hevc = false
@@ -570,14 +648,14 @@ 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|
@@ -585,6 +663,17 @@ HERE
         @nvenc_lookahead = [[arg, 0].max, 32].min
       end
 
+      opts.on '--nvenc-multipass ARG' do |arg|
+        @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
+
+        @nvenc_multipass = case arg
+        when 'qres', 'fullres'
+          arg
+        else
+          fail UsageError, "invalid multipass resolution argument: #{arg}"
+        end
+      end
+
       opts.on '--nvenc-refs ARG', Integer do |arg|
         @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
         @nvenc_refs = [arg, 0].max
@@ -595,6 +684,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
@@ -645,15 +745,49 @@ HERE
         @encoder = 'libx264'
         @hevc = false
         @x264_avbr = true
+        @x264_mbtree = false
+        @x264_params = nil
+      end
+
+      opts.on '--x264-mbtree' do
+        @encoder = 'libx264'
+        @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
@@ -699,10 +833,27 @@ HERE
         @stereo_bitrate = arg
       end
 
+      opts.on '--mono-bitrate ARG', Integer do |arg|
+        @mono_bitrate = arg
+      end
+
       opts.on '--eac3' do
         @surround_encoder = 'eac3'
       end
 
+      opts.on '--all-eac3' do
+        @surround_encoder = 'eac3'
+        @stereo_encoder   = 'eac3'
+      end
+
+      opts.on '--keep-ac3-stereo' do
+        @keep_ac3_stereo = true
+      end
+
+      opts.on '--pass-dts' do
+        @pass_dts = true
+      end
+
       opts.on '--add-subtitle ARG' do |arg|
         if arg =~ /^([0-9]+)(?:=(forced))?$|^(auto)$|^([a-z]{3})$|^(.*)$/
           @subtitle_selections += [{
@@ -754,7 +905,13 @@ HERE
       @audio_selections.uniq!
       @subtitle_selections.uniq!
       @surround_bitrate = [[@surround_bitrate, 256].max, (@surround_encoder == 'ac3' ? 640 : 768)].min
-      @stereo_bitrate = [[@stereo_bitrate, 128].max, 256].min
+      @stereo_bitrate = [[@stereo_bitrate, 128].max, (@stereo_encoder == 'eac3' ? 768 : 320)].min
+
+      if @mono_bitrate.nil?
+        @mono_bitrate = @stereo_bitrate / 2
+      else
+        @mono_bitrate = [[@mono_bitrate, 64].max, (@stereo_encoder == 'eac3' ? 768 : 256)].min
+      end
 
       [
         ['ffprobe', '-loglevel', 'quiet', '-version'],
@@ -764,7 +921,7 @@ HERE
         verify_tool_availability command
       end
 
-      return if @detect
+      return if @scan or @detect
 
       encoders = find_encoders
 
@@ -799,6 +956,7 @@ HERE
       @target_1080p ||= (@hevc and @ten_bit) ? 6000  : 8000
       @target_720p  ||= (@hevc and @ten_bit) ? 3000  : 4000
       @target_480p  ||= (@hevc and @ten_bit) ? 1500  : 2000
+      @decode_method ||= @encoder =~ /nvenc$/ ? 'cuda' : 'auto'
 
       if @stereo_encoder.nil?
         if encoders =~ /aac_at/ or encoders =~ /libfdk_aac/
@@ -807,6 +965,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)
@@ -862,8 +1025,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'] : []) + [
@@ -884,23 +1046,51 @@ 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
 
-      unless @detect
-        output_path = (@name.nil? ? File.basename(path, '.*') : File.basename(@name)) +
-                      '.' + @format.to_s
-        fail "output file already exists: #{output_path}" if File.exist? output_path
+      unless @scan or @detect
+        output_path = File.basename(path, '.*') + '.' + @format.to_s
+        fail_or_warn "output file already exists: #{output_path}" if File.exist? output_path
 
         log_path = output_path + '.log'
-        fail "log file already exists: #{log_path}" if File.exist? log_path
+        fail_or_warn "log file already exists: #{log_path}" if File.exist? log_path
 
         tmp_log_path = "_ffmpeg_#{rand(10000..99999)}_#{$PROCESS_ID}.#{@format.to_s}.log"
-        fail "log file already exists: #{tmp_log_path}" if File.exist? tmp_log_path
+        fail_or_warn "log file already exists: #{tmp_log_path}" if File.exist? tmp_log_path
       end
 
       media_info = scan_media(path)
 
+      if @scan
+        print_media_info media_info
+        return
+      end
+
       video, burn_subtitle = get_video_streams(media_info)
       fail "video track not found: #{path}" if video.nil?
 
@@ -911,7 +1101,7 @@ HERE
         crop = detect_crop(media_info, video)
 
         if @detect
-          present_crop(crop, path)
+          present_crop crop, path
           return
         else
           Kernel.warn "crop = #{crop[:width]}:#{crop[:height]}:#{crop[:x]}:#{crop[:y]}"
@@ -944,13 +1134,13 @@ HERE
         '-stats'
       ] + time_options +
           decode_options + [
-        '-i', "#{path}"
+        '-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 == :mp4 ? ['-movflags', 'disable_chpl'] : []) + [
+      ] + (@format == :mkv ? @mkv_options : ['-movflags', 'disable_chpl']) + [
         output_path
       ]
 
@@ -995,17 +1185,25 @@ HERE
         FileUtils.mv tmp_log_path, log_path
       end
 
-      assemble_log(log_path, output)
+      assemble_log log_path, output
 
       if @format == :mp4
         Kernel.warn 'Done.'
       else
-        add_track_statistics_tags(output_path)
+        add_track_statistics_tags output_path
       end
 
       Kernel.warn "\nElapsed time: #{seconds_to_time(Time.now.tv_sec - seconds)}\n\n"
     end
 
+    def fail_or_warn(message)
+      if @dry_run
+        Kernel.warn "#{$PROGRAM_NAME}: #{message}"
+      else
+        fail message
+      end
+    end
+
     def scan_media(path)
       Kernel.warn 'Scanning media...'
       output = ''
@@ -1040,6 +1238,93 @@ HERE
       media_info
     end
 
+    def print_media_info(media_info)
+      video = nil
+      audio_streams = []
+      subtitles = []
+
+      media_info['streams'].each do |stream|
+        case stream['codec_type']
+        when 'video'
+          video = stream if video.nil?
+        when 'audio'
+          audio_streams += [stream]
+        when 'subtitle'
+          subtitles += [stream]
+        end
+      end
+
+      puts media_info['format']['filename']
+      size = "#{video['width']} x #{video['height']}"
+      print "      format = #{video['codec_name']} / #{size} / #{video['avg_frame_rate']} fps"
+      bitrate = get_bitrate(video)
+      puts bitrate.nil? ? '' : " / #{bitrate} Kbps"
+      duration = media_info['format']['duration'].to_f
+      time = seconds_to_time(duration.to_i)
+      milliseconds = duration.to_s.sub(/^[0-9]+(\.[0-9]+)$/, '\1')
+      time += milliseconds unless milliseconds == '.0'
+      puts "    duration = #{time}"
+      index = 0
+
+      audio_streams.each do |stream|
+        index += 1
+        puts "\##{index} audio:"
+        codec_name = stream['codec_name']
+        print "      format = #{codec_name}"
+
+        if codec_name == 'dts'
+          profile = stream.fetch('profile', 'DTS')
+          print " (#{profile})" unless profile == 'DTS'
+        end
+
+        print ' / '
+        layout = stream.fetch('channel_layout', '')
+
+        if layout.empty?
+          channels = stream['channels'].to_i
+          print "#{channels} " + (channels > 1 ? 'channels' : 'channel')
+        else
+          print "#{layout}"
+        end
+
+        bitrate = get_bitrate(stream)
+        puts bitrate.nil? ? '' : " / #{bitrate} Kbps"
+        puts "    language = #{stream.fetch('tags', {}).fetch('language', '')}"
+        title = stream.fetch('tags', {}).fetch('title', '')
+        puts "       title = #{title}" unless title.empty?
+      end
+
+      index = 0
+
+      subtitles.each do |stream|
+        index += 1
+        puts "\##{index} subtitle:"
+        print "      format = #{stream['codec_name']}"
+        frames = stream.fetch('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 "       title = #{title}" unless title.empty?
+        default = (stream['disposition']['default'] == 1)
+        forced  = (stream['disposition']['forced'] == 1)
+
+        if default or forced
+          puts '       flags = ' +
+            (default ? 'default' : '') +
+            ((default and forced) ? ' / ' : '') +
+            (forced ? 'forced' : '')
+        end
+      end
+    end
+
+    def get_bitrate(stream)
+      bitrate = stream.fetch('bit_rate', '')
+      bitrate = stream.fetch('tags', {}).fetch('BPS-eng', '') if bitrate.empty?
+      return nil if bitrate.empty?
+
+      bitrate.to_i / 1000
+    end
+
     def detect_crop(media_info, video)
       Kernel.warn 'Detecting crop...'
       duration = media_info['format']['duration'].to_f
@@ -1162,10 +1447,10 @@ HERE
         drawbox_string = "#{crop[:x]}:#{crop[:y]}:#{crop[:width]}:#{crop[:height]}"
         puts
         puts escape_command([
-          'mpv', '--no-audio', '--vf', "lavfi=[drawbox=#{drawbox_string}:invert:1]", path
+          'mpv', '--no-audio', "--vf=lavfi=[drawbox=#{drawbox_string}:invert:1]", path
         ])
         puts escape_command([
-          'mpv', '--no-audio', '--vf', "crop=#{crop_string}", path
+          'mpv', '--no-audio', "--vf=crop=#{crop_string}", path
         ])
         puts
         puts escape_command([
@@ -1264,48 +1549,20 @@ 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'
+          if video['codec_name'] == 'mpeg2video' and video['avg_frame_rate'] != '25/1'
             rate = '24000/1001'
           end
         end
@@ -1314,11 +1571,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?
@@ -1329,7 +1582,6 @@ HERE
 
       if @detelecine
         frame_rate_filter = 'fieldmatch=order=tff:combmatch=none,decimate'
-        cuvid_decoder = nil
       end
 
       width   = video['width'].to_i
@@ -1344,21 +1596,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
@@ -1373,14 +1613,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
@@ -1391,24 +1625,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')
@@ -1460,15 +1722,19 @@ HERE
       if width > 1920 or height > 1080
         bitrate = @target_2160p
         max_bitrate = 40000
+        max_dpb_mbs = 184320
       elsif width > 1280 or height > 720
         bitrate = @target_1080p
         max_bitrate = 20000
+        max_dpb_mbs = 32768
       elsif width > 720 or height > 576
         bitrate = @target_720p
         max_bitrate = 10000
+        max_dpb_mbs = 18000
       else
         bitrate = @target_480p
         max_bitrate = 5000
+        max_dpb_mbs = 8100
 
         unless hdr
           color_primaries = pal ? 'bt470bg' : 'smpte170m'
@@ -1478,17 +1744,30 @@ HERE
 
       bitrate = @target unless @target.nil?
       bitrate = [bitrate, max_bitrate].min
-      maxrate = bitrate * 3
+      maxrate = 0
+      bufsize = 0
 
-      if @preset.nil? or @preset == 'none'
-        preset = nil
-      else
+      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
+        end
+
+        if @bufsize.nil?
+          bufsize = maxrate if @encoder =~ /^libx26[45]$/
+        else
+          bufsize = [[(bitrate * @bufsize).to_i, bitrate].max, bitrate * 4].min
+        end
+      end
+
+      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$/
@@ -1505,7 +1784,6 @@ HERE
         end
 
         fail "invalid preset for encoder: #{@preset}" unless valid
-        preset = @preset
       end
 
       Kernel.warn 'Stream mapping:'
@@ -1513,7 +1791,7 @@ HERE
 
       unless @encoder == 'copy'
         text += " / #{bitrate} Kbps"
-        text += " / #{preset}" unless preset.nil?
+        text += " / #{@preset}" unless @preset.nil?
       end
 
       unless burn_subtitle.nil?
@@ -1524,35 +1802,17 @@ HERE
       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 += ['-maxrate:v', "#{maxrate}k"] if @encoder =~ /(nvenc|hevc_qsv|libx26[45])$/
-      encode_options += ['-bufsize:v', "#{maxrate}k"] if @encoder =~ /^libx26[45]$/
-      encode_options += ['-preset:v', preset] unless preset.nil?
+      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 =~ /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
@@ -1579,15 +1839,38 @@ HERE
 
       if @encoder == 'libx264'
         encode_options += ['-x264opts:v', 'ratetol=inf'] if @x264_avbr
-        encode_options += ['-mbtree:v', '0']
+        encode_options += ['-mbtree:v', '0'] unless @x264_mbtree
 
-        if @preset.nil? and @x264_quick
-          encode_options += [
-            '-refs:v', '1',
-            '-rc-lookahead:v', '30',
-            '-partitions:v', 'none'
-          ]
+        if @preset.nil?
+          if @x264_quick
+            encode_options += [
+              '-refs:v', '1',
+              '-rc-lookahead:v', '30',
+              '-partitions:v', 'none'
+            ]
+          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
+          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?
+      end
+
+      if @encoder == 'libx265'
+        encode_options += ['-x265-params:v', @x265_params] unless @x265_params.nil?
       end
 
       unless @ten_bit
@@ -1607,6 +1890,8 @@ HERE
         '-disposition:v', 'default'
       ]
 
+      encode_options += ['-tag:v', 'hvc1'] if @format == :mp4 and @hevc
+
       [decode_options, encode_options]
     end
 
@@ -1652,6 +1937,7 @@ HERE
         end
 
         width = selection[:width]
+
         bitrate = case width
         when :stereo
           @stereo_bitrate
@@ -1733,8 +2019,12 @@ HERE
         if track[:width] == :original
             encoder = 'copy'
         else
+          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'
+            if  codec_name == @surround_encoder or
+                codec_name == 'ac3' or
+                (@pass_dts and dts)
               encoder = 'copy'
             elsif input_channels > 2
               encoder = @surround_encoder
@@ -1743,9 +2033,10 @@ HERE
           end
 
           if encoder.nil?
-            if input_channels <= 2 and (codec_name == 'aac' or
+            if  input_channels <= 2 and (codec_name == 'aac' or
                 ((codec_name == @surround_encoder or codec_name == 'ac3') and
-                (track[:stream]['bit_rate'].to_i / 1000) <= @stereo_bitrate))
+                (@keep_ac3_stereo or (track[:stream]['bit_rate'].to_i / 1000) <= @stereo_bitrate)) or
+                (@pass_dts and dts))
               encoder = 'copy'
             else
               encoder = @stereo_encoder
@@ -1754,7 +2045,7 @@ HERE
               if input_channels > 2
                 channels = 2
               elsif input_channels == 1
-                bitrate = @stereo_bitrate / 2
+                bitrate = @mono_bitrate
               end
             end
           end
@@ -1856,10 +2147,7 @@ HERE
         end
       end
 
-      unless force_subtitle.nil?
-        subtitles = [force_subtitle] + subtitles
-      end
-
+      subtitles = [force_subtitle] + subtitles unless force_subtitle.nil?
       subtitles.uniq!
       options = []
       index = 0
@@ -1876,7 +2164,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')
         ]