other_video_transcoding 0.1.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a57410a06260109a616e8c52a66912c1232b94e1c6c9fa3b68193dc1928a806
-  data.tar.gz: 2a3d7e2161ed9e5c057d706dca00505f3579840745e542af1fe65691144f88e4
+  metadata.gz: cfd039fdab5dca779448614baaf5f0e99b3d7dc883f97693919a016224e4b7aa
+  data.tar.gz: c97d8899ea867a018059d1896c3608e3982f8677f8fe81c7506097171c7591e8
 SHA512:
-  metadata.gz: 01c79a2c59e29c90892ad9a9ced373852c3e81c86994d75ccd45d03b48502d0da4e891bc0852afb75954fe15cb0cbdffb2275b531ad34b33642463173db5d13c
-  data.tar.gz: 527078a99a29100e1ffd6031f6d08ef44e9759a09157ab67a1831aa83d60c10544736cbbfe921394237877c640dc595aac530f5cf991e8dc29d9371f2152cb7f
+  metadata.gz: 1915b0bdacf95a0bdfe5e825497f9081571318aaf9423a10df614b0f5ab7a74949ebd6c6039c4ef09c5ce2d567dbe6a851019f996d64284a1ab0525a0a7c10e2
+  data.tar.gz: 64f23ade8dc74a15f8024313b66cd91b3298e80d4e39be391f47630ddd2aa812c67271bfa522794202dd33b4ce18b601c8cbf77a8b46078f288c050afd5eef3a

data/CHANGELOG.md

@@ -2,6 +2,62 @@
 
 This single document contains all of the notes created for each [release](https://github.com/donmelton/other_video_transcoding/releases).
 
+## [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
+
+* Allow `all` to be used as an argument to the `--add-audio` and `--add-subtitle` options of `other-transcode`, adding all audio tracks or all subtitle tracks. Via [ #3](https://github.com/donmelton/other_video_transcoding/issues/3).
+* Add `original` as a width attribute to the `--main-audio` and `--add-audio` options of `other-transcode`. Unlike `stereo` and `surround`, this disables transcoding and always copies the selected track(s). Via [ #5](https://github.com/donmelton/other_video_transcoding/issues/5).
+* Add a `--copy-video` option to `other-transcode`. This disables transcoding and copies the original video track to the output.
+* No longer ignore any image-based subtitles added to MP4 output. Instead, let `ffmpeg` foolishly add DVD-style subtitles and (currently) fail when adding Blu-ray Disc-style subtitles.
+* Deprecate the `--name` option of `other-transcode` because it doesn't make sense to name only the first output file from a tool which can take multiple inputs. The option still works for now, but using it issues a warning message. It will be removed in a future release.
+* Remove warnings when other options disable the Nvidia video decoder, which could only happen if the `--burn-subtitle` or `--detelecine` options were used with the `--cuvid` option.
+
+## [0.1.1](https://github.com/donmelton/other_video_transcoding/releases/tag/0.1.1)
+
+Friday, January 3, 2020
+
+* Prevent passing full or partial paths to the `--name` option of `other-transcode`.
+* Hide the path prefix when naming the program in `--help` output and in usage errors for both `other-transcode` and `ask-ffmpeg-log`.
+* In the "README" document:
+    * Add warnings to avoid installing within virtual machines and about the possible need to use `sudo`.
+    * Add a link to additional documentation on the wiki for installing `ffprobe`, `ffmpeg`, `mkvpropedit` and `mpv` on Windows.
+    * Also explain how to install those same programs on macOS using Homebrew.
+* Update all copyright notices to the year 2020.
+
 ## [0.1.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.1.0)
 
 Thursday, December 26, 2019

data/LICENSE

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

data/README.md

@@ -26,7 +26,7 @@ And many features are supported including:
 * Hardware-based video decoding for improved performance
 * Fallback to software video encoding when appropriate hardware is not available
 * Optional automatic and reliable video cropping
-* Adding audio and subtitle tracks by by language or title
+* Adding audio and subtitle tracks by language or title
 * [Dolby Digital Plus](https://en.wikipedia.org/wiki/Dolby_Digital_Plus) (Enhanced AC-3) audio encoding
 * Burning image-based subtitles into video output to ease player compatibility
 
@@ -36,6 +36,8 @@ Additional documentation for this project is available in the [wiki](https://git
 
 ## Installation
 
+_Avoid installing within [virtual machines](https://en.wikipedia.org/wiki/Virtual_machine) such as the [Windows Subsystem for Linux](https://en.wikipedia.org/wiki/Windows_Subsystem_for_Linux) since access to hardware video encoders may not be allowed, severely impacting performance._
+
 These tools work on Windows, Linux and macOS. They're packaged as a Gem and require Ruby. See "[Installing Ruby](https://www.ruby-lang.org/en/documentation/installation/)" if you don't have it on your platform.
 
 Use this command to install the package: 
@@ -46,6 +48,8 @@ And this command to update it:
 
     gem update other_video_transcoding
 
+_The commands to install and update may need prefixing with_ `sudo` _on some platforms._
+
 The `other-transcode` tool in this package requires other software to function properly, specifically these command line programs:
 
 * `ffprobe`
@@ -56,6 +60,22 @@ Optional crop previewing also requires the `mpv` command line program.
 
 See "[Download FFmpeg](https://ffmpeg.org/download.html)," "[MKVToolNix Downloads](https://mkvtoolnix.download/downloads.html)" and "[mpv Installation](https://mpv.io/installation/)" to find versions for your platform.
 
+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-transcode-nvidia
+
+https://github.com/ttyS0/docker-transcode-vaapi
+
+On macOS, all of these programs can be easily installed via [Homebrew](http://brew.sh/), an optional package manager:
+
+    brew install ffmpeg
+    brew install mkvtoolnix
+    brew install mpv
+
+The `ffprobe` program is included within the `ffmpeg` package and the `mkvpropedit` program is included within the `mkvtoolnix` package.
+
 ## Usage
 
 Each tool in this package has several command line options. The `other-transcode` tool is the most complex with over 50 of its own. Use `--help` to list the options available for a specific tool, along with brief instructions on their usage:

data/bin/ask-ffmpeg-log

@@ -2,7 +2,7 @@
 #
 # ask-ffmpeg-log
 #
-# Copyright (c) 2019 Don Melton
+# Copyright (c) 2019-2020 Don Melton
 #
 
 require 'abbrev'
@@ -15,18 +15,18 @@ module Transcoding
 
   class Command
     def about
-      <<HERE
-ask-ffmpeg-log 0.1.0
-Copyright (c) 2019 Don Melton
-HERE
+      <<-HERE
+ask-ffmpeg-log 0.3.2
+Copyright (c) 2019-2020 Don Melton
+      HERE
     end
 
     def usage
-      <<HERE
+      <<-HERE
 Report temporal information from ffmpeg-generated `.log` files
 containing encoding statistics.
 
-Usage: #{$PROGRAM_NAME} [OPTION]... [FILE|DIRECTORY]...
+Usage: #{File.basename($PROGRAM_NAME)} [OPTION]... [FILE|DIRECTORY]...
 
 Options:
     --time          sort results by time instead of speed
@@ -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,11 +65,13 @@ HERE
       end
 
       fail UsageError, 'missing argument' if ARGV.empty?
+
       ARGV.each { |arg| process_input arg }
       complete
       exit
     rescue UsageError => e
-      Kernel.warn "#{$PROGRAM_NAME}: #{e}\nTry `#{$PROGRAM_NAME} --help more` for more information."
+      Kernel.warn "#{$PROGRAM_NAME}: #{e}"
+      Kernel.warn "Try `#{File.basename($PROGRAM_NAME)} --help` for more information."
       exit false
     rescue StandardError => e
       Kernel.warn "#{$PROGRAM_NAME}: #{e}"
@@ -91,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

@@ -2,7 +2,7 @@
 #
 # other-transcode
 #
-# Copyright (c) 2019 Don Melton
+# Copyright (c) 2019-2020 Don Melton
 #
 
 require 'English'
@@ -17,73 +17,72 @@ module Transcoding
 
   class Command
     def about
-      <<HERE
-other-transcode 0.1.0
-Copyright (c) 2019 Don Melton
-HERE
+      <<-HERE
+other-transcode 0.3.2
+Copyright (c) 2019-2020 Don Melton
+      HERE
     end
 
     def usage1
-      <<HERE
+      <<-HERE
 Transcode Blu-ray Disc or DVD rip into a smaller, more portable format
 while remaining high enough quality to be mistaken for the original.
 
-Usage: #{$PROGRAM_NAME} [OPTION]... [FILE]...
+Usage: #{File.basename($PROGRAM_NAME)} [OPTION]... [FILE]...
 
 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
-    --name STRING   set output filename, excluding format extension
-                      (default: based on input filename) 
     --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
@@ -102,11 +101,11 @@ HERE
     --cuvid         use Nvidia video decoder
                       for H.264, VC-1, MPEG-2 and other formats
                       (ignores scope set by `--decode`)
-HERE
+      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
@@ -114,11 +113,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)
@@ -127,11 +126,15 @@ 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
@@ -172,22 +175,36 @@ 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
+      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)
-    --add-audio TRACK|LANGUAGE|STRING[=WIDTH]
+      HERE
+    end
+
+    def usage12
+      <<-HERE
+                        (use `original` to disable transcoding)
+      HERE
+    end
+
+    def usage13
+      <<-HERE
+    --add-audio TRACK|all|LANGUAGE|STRING[=WIDTH]
                     add single audio track by number
                       including main audio track
+                    or all audio tracks
+                      excluding main audio track
                     or audio tracks by language code
                       excluding main audio track
                       (in ISO 639-2 format, e.g.: `eng`)
@@ -195,22 +212,61 @@ Audio options:
                       excluding main audio track
                       (comparison is case-insensitve)
                     with optional width (default: stereo)
+      HERE
+    end
+
+    def usage14
+      <<-HERE
+                      (use `original` to disable transcoding)
+      HERE
+    end
+
+    def usage15
+      <<-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|LANGUAGE|STRING
+    --add-subtitle TRACK[=forced]|auto|all|LANGUAGE|STRING
                     add single subtitle track by number
                       optionally setting forced disposition
                     or enable automatic addition of forced subtitle
-                    or add subtitle tracks by language code
+                    or add all subtitle tracks
+                    or subtitle tracks by language code
                       (in ISO 639-2 format, e.g.: `eng`)
                     or subtitle tracks with titles containing string
                       (comparison is case-insensitve)
-                    (all variations exclude any burned track)
+                    (variations exclude any burned track)
     --burn-subtitle TRACK|auto
                     burn subtitle track by number into video
                       or enable automatic burning of forced subtitle
@@ -223,17 +279,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
@@ -255,6 +312,8 @@ HERE
       @rate = nil
       @detelecine = false
       @enable_filters = true
+      @maxrate = nil
+      @bufsize = nil
       @vt_allow_sw = false
       @nvenc_spatial_aq = nil
       @nvenc_temporal_aq = nil
@@ -270,6 +329,7 @@ HERE
       @amf_bframes = nil
       @vaapi_compression = nil
       @x264_avbr = false
+      @x264_mbtree = false
       @x264_quick = false
       @audio_selections = [{
         :track => 1,
@@ -279,8 +339,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
@@ -295,12 +358,16 @@ HERE
             case arg
             when 'full'
               puts  usage1 + usage2 + usage3 + usage4 + usage5 + usage6 +
-                    usage7 + usage8 + usage9 + usage10 + usage11
+                    usage7 + usage8 + usage9 + usage10 + usage11 + usage12 +
+                    usage13 + usage14 + usage15 + usage16 + usage17 +
+                    usage18 + usage19
             when 'more'
               puts  usage1 + usage2 + usage3 + usage4 + usage6 + usage7 +
-                    usage8 + usage9 + usage11
+                    usage8 + usage9 + usage11 + usage13 + usage15 + usage16 +
+                    usage17 + usage18 + usage19
             else
-              puts  usage1 + usage3 + usage6 + usage8 + usage11
+              puts  usage1 + usage3 + usage6 + usage8 + usage11 + usage13 +
+                    usage15 + usage17 + usage19
             end
 
             exit
@@ -316,11 +383,13 @@ HERE
       end
 
       fail UsageError, 'missing argument' if ARGV.empty?
+
       configure ARGV.first
       ARGV.each { |arg| process_input arg }
       exit
     rescue UsageError => e
-      Kernel.warn "#{$PROGRAM_NAME}: #{e}\nTry `#{$PROGRAM_NAME} --help more` for more information."
+      Kernel.warn "#{$PROGRAM_NAME}: #{e}"
+      Kernel.warn "Try `#{File.basename($PROGRAM_NAME)} --help` for more information."
       exit false
     rescue StandardError => e
       Kernel.warn "#{$PROGRAM_NAME}: #{e}"
@@ -343,6 +412,10 @@ HERE
         @debug = true
       end
 
+      opts.on '--scan' do
+        @scan = true
+      end
+
       opts.on '--preview-crop' do
         @detect = true
         @preview = true
@@ -357,10 +430,6 @@ HERE
         @format = :mp4
       end
 
-      opts.on '--name ARG' do |arg|
-        @name = arg
-      end
-
       opts.on '--copy-track-names' do
         @copy_track_names = true
       end
@@ -410,10 +479,12 @@ HERE
 
       opts.on '--[no-]10-bit' do |arg|
         @ten_bit = arg
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--preset ARG' do |arg|
         @preset = arg
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--decode ARG' do |arg|
@@ -450,6 +521,8 @@ HERE
         else
           @target = [arg.to_i, 1].max
         end
+
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--crop ARG' do |arg|
@@ -461,22 +534,27 @@ HERE
         else
           fail UsageError, "invalid crop geometry: #{arg}"
         end
+
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--720p' do
         @max_width  = 1280
         @max_height = 720
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--1080p' do
         @max_width  = 1920
         @max_height = 1080
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--deinterlace' do
         @deinterlace = true
         @detelecine = false
         @enable_filters = false
+        @encoder = nil if @encoder == 'copy' and @decoder_type != :cuvid
       end
 
       opts.on '--rate ARG' do |arg|
@@ -499,6 +577,7 @@ HERE
 
         @detelecine = false
         @enable_filters = false
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--detelecine' do
@@ -506,12 +585,36 @@ HERE
         @deinterlace = false
         @rate = nil
         @enable_filters = false
+        @encoder = nil if @encoder == 'copy'
       end
 
       opts.on '--no-filters' do
         @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
+        @ten_bit = nil
+        @preset = nil
+        @target = nil
+        @crop = nil
+        @rate = nil
+        @detelecine = false
+        @enable_filters = false
+        @burn_subtitle_track = 0
+      end
+
       opts.on '--vt-allow-sw' do
         @encoder = @hevc ? 'hevc_videotoolbox' : 'h264_videotoolbox'
         @vt_allow_sw = true
@@ -592,6 +695,14 @@ HERE
         @encoder = 'libx264'
         @hevc = false
         @x264_avbr = true
+        @x264_mbtree = false
+      end
+
+      opts.on '--x264-mbtree' do
+        @encoder = 'libx264'
+        @hevc = false
+        @x264_mbtree = true
+        @x264_avbr = false
       end
 
       opts.on '--x264-quick' do
@@ -602,7 +713,7 @@ HERE
       end
 
       opts.on '--main-audio ARG' do |arg|
-        if arg =~ /^([0-9]+)(?:=(surround|stereo))?$/
+        if arg =~ /^([0-9]+)(?:=(stereo|surround|original))?$/
           @audio_selections[0][:track] = $1.to_i
           @audio_selections[0][:width] = $2.to_sym unless $2.nil?
         else
@@ -611,7 +722,7 @@ HERE
       end
 
       opts.on '--add-audio ARG' do |arg|
-        if arg =~ /^([^=]+)(?:=(surround|stereo))?$/
+        if arg =~ /^([^=]+)(?:=(stereo|surround|original))?$/
           scope = $1
           width = $2
 
@@ -646,10 +757,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 += [{
@@ -675,6 +803,8 @@ HERE
         else
           fail UsageError, "invalid subtitle track: #{arg}"
         end
+
+        @encoder = nil if @encoder == 'copy'
       end
     end
 
@@ -699,7 +829,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'],
@@ -709,7 +845,7 @@ HERE
         verify_tool_availability command
       end
 
-      return if @detect
+      return if @scan or @detect
 
       encoders = find_encoders
 
@@ -734,7 +870,7 @@ HERE
       else
         @encoder.sub!(/^h264/, 'hevc') if @hevc
 
-        unless @dry_run or encoders =~ /#{@encoder}/
+        unless @dry_run or @encoder == 'copy' or encoders =~ /#{@encoder}/
           fail "video encoder not available: #{@encoder}"
         end
       end
@@ -752,6 +888,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)
@@ -829,22 +970,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, '.*') : @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?
 
@@ -855,7 +1025,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]}"
@@ -888,13 +1058,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
       ]
 
@@ -939,17 +1109,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 = ''
@@ -984,6 +1162,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
@@ -1106,10 +1371,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([
@@ -1239,13 +1504,7 @@ HERE
         overlay_filter = nil
       else
         overlay_filter = "[0:#{burn_subtitle['index']}]overlay"
-
-        unless cuvid_decoder.nil?
-          Kernel.warn '**********'
-          Kernel.warn "burning subtitle disables video decoder: #{cuvid_decoder}"
-          Kernel.warn '**********'
-          cuvid_decoder = nil
-        end
+        cuvid_decoder = nil
       end
 
       deinterlace = @deinterlace
@@ -1255,7 +1514,7 @@ HERE
         if video['avg_frame_rate'] == '30000/1001' or video['field_order'] != '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
@@ -1265,7 +1524,7 @@ HERE
 
       if deinterlace
         if cuvid_decoder.nil?
-          frame_rate_filter = 'yadif=deint=interlaced'
+          frame_rate_filter = 'yadif=deint=interlaced' unless @encoder == 'copy'
         else
           cuvid_options += ['-deint:v', 'adaptive']
         end
@@ -1278,14 +1537,8 @@ HERE
       end
 
       if @detelecine
-        unless cuvid_decoder.nil?
-          Kernel.warn '**********'
-          Kernel.warn "detelecine disables video decoder: #{cuvid_decoder}"
-          Kernel.warn '**********'
-          cuvid_decoder = nil
-        end
-
         frame_rate_filter = 'fieldmatch=order=tff:combmatch=none,decimate'
+        cuvid_decoder = nil
       end
 
       width   = video['width'].to_i
@@ -1373,12 +1626,16 @@ HERE
         conversion_filter = nil
       end
 
-      filter =  overlay_filter.nil?     ? '' : overlay_filter
-      filter += frame_rate_filter.nil?  ? '' : ",#{frame_rate_filter}"
-      filter += crop_filter.nil?        ? '' : ",#{crop_filter}"
-      filter += scale_filter.nil?       ? '' : ",#{scale_filter}"
-      filter += conversion_filter.nil?  ? '' : ",#{conversion_filter}"
-      filter.sub!(/^,/, '')
+      if @encoder == 'copy'
+        filter = ''
+      else
+        filter =  overlay_filter.nil?     ? '' : overlay_filter
+        filter += frame_rate_filter.nil?  ? '' : ",#{frame_rate_filter}"
+        filter += crop_filter.nil?        ? '' : ",#{crop_filter}"
+        filter += scale_filter.nil?       ? '' : ",#{scale_filter}"
+        filter += conversion_filter.nil?  ? '' : ",#{conversion_filter}"
+        filter.sub!(/^,/, '')
+      end
 
       if overlay_filter.nil?
         encode_options = [
@@ -1412,15 +1669,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'
@@ -1430,7 +1691,22 @@ HERE
 
       bitrate = @target unless @target.nil?
       bitrate = [bitrate, max_bitrate].min
-      maxrate = bitrate * 3
+      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
+        end
+
+        if @bufsize.nil?
+          bufsize = maxrate if @encoder =~ /^libx26[45]$/
+        else
+          bufsize = [[(bitrate * @bufsize).to_i, bitrate].max, bitrate * 4].min
+        end
+      end
 
       if @preset.nil? or @preset == 'none'
         preset = nil
@@ -1457,12 +1733,17 @@ HERE
         end
 
         fail "invalid preset for encoder: #{@preset}" unless valid
+
         preset = @preset
       end
 
       Kernel.warn 'Stream mapping:'
-      text = "#{sprintf("%2d", video['index'])} = #{@encoder} / #{bitrate} Kbps"
-      text += " / #{preset}" unless preset.nil?
+      text = "#{sprintf("%2d", video['index'])} = #{@encoder}"
+
+      unless @encoder == 'copy'
+        text += " / #{bitrate} Kbps"
+        text += " / #{preset}" unless preset.nil?
+      end
 
       unless burn_subtitle.nil?
         text += " / #{sprintf("%d", burn_subtitle['index'])} = #{burn_subtitle['codec_name']} / burn"
@@ -1471,9 +1752,9 @@ HERE
       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"]
-      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 += ['-b:v', "#{bitrate}k"] unless @encoder == 'copy'
+      encode_options += ['-maxrate:v', "#{maxrate}k"] if maxrate > 0
+      encode_options += ['-bufsize:v', "#{bufsize}k"] if bufsize > 0
       encode_options += ['-preset:v', preset] unless preset.nil?
       encode_options += ['-allow_sw:v', '1'] if @encoder =~ /videotoolbox$/ and @vt_allow_sw
 
@@ -1527,14 +1808,31 @@ 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
       end
 
@@ -1542,14 +1840,21 @@ HERE
         encode_options += ['-profile:v', 'high'] if @encoder =~ /^(h264_nvenc|h264_amf|libx264)$/
       end
 
+      unless @encoder == 'copy'
+        encode_options += [
+          '-color_primaries:v', color_primaries,
+          '-color_trc:v', color_trc,
+          '-colorspace:v', colorspace
+        ]
+      end
+
       encode_options += [
-        '-color_primaries:v', color_primaries,
-        '-color_trc:v', color_trc,
-        '-colorspace:v', colorspace,
         '-metadata:s:v', 'title=',
         '-disposition:v', 'default'
       ]
 
+      encode_options += ['-tag:v', 'hvc1'] if @format == :mp4 and @hevc
+
       [decode_options, encode_options]
     end
 
@@ -1575,7 +1880,14 @@ HERE
       audio_tracks = [{
         :stream => main_audio,
         :width => width,
-        :bitrate => width == :surround ? @surround_bitrate : @stereo_bitrate
+        :bitrate => case width
+        when :stereo
+          @stereo_bitrate
+        when :surround
+          @surround_bitrate
+        when :original
+          nil
+        end
       }]
 
       titles = {}
@@ -1588,7 +1900,15 @@ HERE
         end
 
         width = selection[:width]
-        bitrate = width == :surround ? @surround_bitrate : @stereo_bitrate
+
+        bitrate = case width
+        when :stereo
+          @stereo_bitrate
+        when :surround
+          @surround_bitrate
+        when :original
+          nil
+        end
 
         unless selection[:track].nil?
           audio_track = 0
@@ -1614,7 +1934,8 @@ HERE
           media_info['streams'].each do |stream|
             next if stream['codec_type'] != 'audio'
 
-            if  stream.fetch('tags', {}).fetch('language', '') == selection[:language] and
+            if (selection[:language] == 'all' or
+                stream.fetch('tags', {}).fetch('language', '') == selection[:language]) and
                 stream['index'] != main_audio['index']
               audio_tracks += [{
                 :stream => stream,
@@ -1658,28 +1979,37 @@ HERE
         bitrate = nil
         channels = nil
 
-        if track[:width] == :surround
-          if codec_name == @surround_encoder or codec_name == 'ac3'
+        if track[:width] == :original
             encoder = 'copy'
-          elsif input_channels > 2
-            encoder = @surround_encoder
-            bitrate = @surround_bitrate
+        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' or
+                (@pass_dts and dts)
+              encoder = 'copy'
+            elsif input_channels > 2
+              encoder = @surround_encoder
+              bitrate = @surround_bitrate
+            end
           end
-        end
 
-        if encoder.nil?
-          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))
-            encoder = 'copy'
-          else
-            encoder = @stereo_encoder
-            bitrate = @stereo_bitrate
+          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
+                (@pass_dts and dts))
+              encoder = 'copy'
+            else
+              encoder = @stereo_encoder
+              bitrate = @stereo_bitrate
 
-            if input_channels > 2
-              channels = 2
-            elsif input_channels == 1
-              bitrate = @stereo_bitrate / 2
+              if input_channels > 2
+                channels = 2
+              elsif input_channels == 1
+                bitrate = @mono_bitrate
+              end
             end
           end
         end
@@ -1762,7 +2092,8 @@ HERE
           media_info['streams'].each do |stream|
             next if stream['codec_type'] != 'subtitle'
 
-            if stream.fetch('tags', {}).fetch('language', '') == selection[:language]
+            if (selection[:language] == 'all' or
+                stream.fetch('tags', {}).fetch('language', '') == selection[:language])
               subtitles += [stream]
             end
           end
@@ -1779,10 +2110,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
@@ -1790,9 +2118,6 @@ HERE
       subtitles.each do |subtitle|
         next if (not burn_subtitle.nil?) and burn_subtitle['index'] == subtitle['index']
 
-        next if @format == :mp4 and
-          (subtitle['codec_name'] == 'hdmv_pgs_subtitle' or subtitle['codec_name'] == 'dvd_subtitle')
-
         force = (index == 0 and not force_subtitle.nil?)
         text = "#{sprintf("%2d", subtitle['index'])} = #{subtitle['codec_name']}"
         text += ' / force' if force
@@ -1802,7 +2127,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')
         ]