other_video_transcoding 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88e79f218a2cdbb3a930db25fd5d5b94e6294fec90f451bb979457c68ae13a82
-  data.tar.gz: cc6b33de67d3da5fb80d59634181ccdd89aa539cb4d35b5d5729bd3b4ee5dae0
+  metadata.gz: 325b662c56c03a0cac33994a3ab165381fe801615072c87188de4b8f6bd954f7
+  data.tar.gz: c26a3551deed5d3966168b881da8730672024b8363fc1e0e8611a27ca5ec9426
 SHA512:
-  metadata.gz: 638f9905c7df90b4c7921ae6a1d4b54e93f264c119a2599356ce911132b9688eba83edfe5ab2a0d6037326ce0c62c7aa4813792da45e15840f06d38bff1f999c
-  data.tar.gz: e213384ceb4e30a711e0a161ec371e72cb53b0d8d562ee7dc73dd8aade72dca2df1e8855800643dc36afe4cfa4356ae55a40fd80b2de503944261e7042388f73
+  metadata.gz: dafd0f33a13e2b0f90db7e8ab8d0d7db19577177128dd133538593f762daddbf06c1ebf2735f05828b96255fc7970ce091434b78d9d80780598e9f18555ec5b1
+  data.tar.gz: 8d294809aceafa52a1b73007593d9e36ca966e4aa15a43b4a4ca99c74f9df23bfb8c0c892b9ddba6d3fe009798f8de35480c942cbb26db2b3fd7c8b913022e6a

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 This single document contains all of the notes created for each [release](https://github.com/donmelton/other_video_transcoding/releases).
 
+## [0.10.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.10.0)
+
+Thursday, January 27, 2022
+
+* Add a `--nvenc-gpu-only` option to `other-transcode` to keep data on the GPU for greater speed, if possible. Deinterlacing is allowed but cropping, scaling, detelecining, setting frame rates and burning subtitles will prevent this from working and may actually slow things down. Performance can also be affected negatively depending on PC configuration. Please note that the `--nvenc-gpu-only` option requires `ffmpeg` version 5.0 or later.
+* Add a `--x264-cbr` option to `other-transcode` to simplify access to constant bitrate (CBR) ratecontrol. Despite the name, actual output bitrates from the `x264` encoder are variable and below what might be expected. So, default video bitrate targets are raised to accommodate this.
+* Enable proper crop detection in `other-transcode` for 4K UHD Blu-ray rips and other media with a 10-bit color depth. This was done by changing the `limit` value passed to the `cropdetect` filter from an integer constant to a floating point equation. Via [ #52](https://github.com/donmelton/other_video_transcoding/issues/52).
+* Modify `other-transcode` to add a workaround for the mapping of BT.470 M and BT.470 BG color transfer characteristics from values returned from `ffprobe` to values actually used by `ffmpeg`. Via [ #112](https://github.com/donmelton/other_video_transcoding/issues/112).
+* Modify `other-transcode` to allow parentheses within the argument to the `--yadif-params`, `--x264-params` and `--x265-params` options. Via [ #119](https://github.com/donmelton/other_video_transcoding/issues/119).
+* Modify `ask-ffmpeg-log` to fix detection of frame counts less than five digits within `.log` files from very short duration videos. Via [ #126](https://github.com/donmelton/other_video_transcoding/issues/126).
+* Modify `ask-ffmpeg-log` to fix detection of statistics within `.log` files not generated by `other-transcode`.
+* Remove the deprecated `--nvenc-rc-mode` and `--aac-stereo` options from `other-transcode`.
+* Update all copyright notices to the year 2022.
+
 ## [0.9.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.9.0)
 
 Saturday, June 5, 2021

data/LICENSE

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

data/bin/ask-ffmpeg-log

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

data/bin/other-transcode

@@ -2,7 +2,7 @@
 #
 # other-transcode
 #
-# Copyright (c) 2019-2021 Don Melton
+# Copyright (c) 2019-2022 Don Melton
 #
 
 require 'English'
@@ -18,8 +18,8 @@ module Transcoding
   class Command
     def about
       <<-HERE
-other-transcode 0.9.0
-Copyright (c) 2019-2021 Don Melton
+other-transcode 0.10.0
+Copyright (c) 2019-2022 Don Melton
       HERE
     end
 
@@ -170,6 +170,8 @@ Nvidia video encoder options:
                     set mode for using B-frames as reference frames
     --nvenc-cq QUALITY
                     use constant quality (CQ) ratecontrol at target quality
+    --nvenc-gpu-only
+                    keep data on GPU for greater speed, if possible
 
 Intel Quick Sync video encoder options:
     --qsv-refs FRAMES
@@ -193,6 +195,9 @@ Video Acceleration API encoder options:
                     set numeric level of compression
 
 x264 software video encoder options:
+    --x264-cbr      use constant bitrate (CBR) ratecontrol
+                      with variable bitrate output
+                      (raises default video bitrate targets)
     --x264-avbr     use average variable bitrate (AVBR) ratecontrol
     --x264-mbtree   use macroblock-tree ratecontrol (disables AVBR if in use)
     --x264-quick    increase encoding speed by 70-80%
@@ -358,6 +363,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @nvenc_bframes = nil
       @nvenc_bframe_refs = nil
       @nvenc_cq = nil
+      @nvenc_gpu_only = false
       @qsv_refs = nil
       @qsv_bframes = nil
       @amf_quality = nil
@@ -652,7 +658,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       opts.on '--yadif-params ARG' do |arg|
         arg.split ':' do |param|
-          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,]+$/
+          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,\(\)]+$/
         end
 
         @yadif_params = arg
@@ -750,12 +756,11 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @nvenc_cq = [[arg, 1].max, 51].min.to_s.sub(/\.0$/, '')
       end
 
-      opts.on '--nvenc-rc-mode ARG' do |arg|
-        Kernel.warn '**********'
-        Kernel.warn 'Using deprecated option: --nvenc-rc-mode'
-        Kernel.warn '**********'
+      opts.on '--nvenc-gpu-only' do
         @encoder = @hevc ? 'hevc_nvenc' : 'h264_nvenc'
-        fail UsageError, "invalid rate control argument: #{arg}" unless arg =~ /^vbr(_hq)?$/
+        @decode_scope = :all
+        @decode_method = 'cuda'
+        @nvenc_gpu_only = true
       end
 
       opts.on '--qsv-refs ARG', Integer do |arg|
@@ -804,6 +809,16 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @vaapi_compression = [arg, 0].max
       end
 
+      opts.on '--x264-cbr' do
+        @encoder = 'libx264'
+        @hevc = false
+        @x264_mbtree = true
+        @x264_avbr = false
+        @x264_params = nil
+        @maxrate = 1.0
+        @bufsize = nil
+      end
+
       opts.on '--x264-avbr' do
         @encoder = 'libx264'
         @hevc = false
@@ -830,7 +845,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       opts.on '--x264-params ARG' do |arg|
         arg.split ':' do |param|
-          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,]+$/
+          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,\(\)]+$/
         end
 
         @encoder = 'libx264'
@@ -843,7 +858,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       opts.on '--x265-params ARG' do |arg|
         arg.split ':' do |param|
-          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,]+$/
+          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,\(\)]+$/
         end
 
         @encoder = 'libx265'
@@ -911,13 +926,6 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @stereo_encoder = nil
       end
 
-      opts.on '--aac-stereo' do
-        Kernel.warn '**********'
-        Kernel.warn 'Using deprecated option: --aac-stereo'
-        Kernel.warn '**********'
-        @stereo_encoder = nil
-      end
-
       opts.on '--aac-only' do
         @surround_encoder = nil
         @stereo_encoder   = nil
@@ -1028,10 +1036,19 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       @nvenc_cq = nil unless @encoder =~ /nvenc$/
       @ten_bit = (@hevc and @encoder =~ /(nvenc|qsv|x265)$/ ? true : false) if @ten_bit.nil?
-      @target_2160p ||= @hevc ? 8000 : 12000
-      @target_1080p ||= @hevc ? 4000 :  6000
-      @target_720p  ||= @hevc ? 2000 :  3000
-      @target_480p  ||= @hevc ? 1000 :  1500
+
+      if @encoder == 'libx264' and @x264_mbtree and @maxrate == 1.0
+        @target_2160p ||= 15000
+        @target_1080p ||= 7500
+        @target_720p  ||= 4500
+        @target_480p  ||= 2250
+      else
+        @target_2160p ||= @hevc ? 8000 : 12000
+        @target_1080p ||= @hevc ? 4000 :  6000
+        @target_720p  ||= @hevc ? 2000 :  3000
+        @target_480p  ||= @hevc ? 1000 :  1500
+      end
+
       @decode_method ||= @encoder =~ /nvenc$/ ? 'cuda' : 'auto'
 
       if @stereo_encoder.nil?
@@ -1435,7 +1452,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
             '-ss', position.to_s,
             '-i', path,
             '-frames:v', '15',
-            '-filter:v', 'cropdetect=24:2',
+            '-filter:v', 'cropdetect=24.0/255:2',
             '-an',
             '-sn',
             '-ignore_unknown',
@@ -1664,6 +1681,8 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         decode_options = []
       end
 
+      nvenc_gpu_only = false
+
       if (@decode_scope == :vc1 and video['codec_name'] == 'vc1') or @decode_scope == :all
         if @encoder =~ /vaapi$/
           decode_options = [
@@ -1680,6 +1699,18 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
           decode_options += ['-hwaccel', decode_method]
 
+          if  @nvenc_gpu_only and
+              decode_method == 'cuda' and
+              @encoder =~ /nvenc$/ and
+              overlay_filter.nil? and
+              (frame_rate_filter.nil? or frame_rate_filter !~ /fps=/) and
+              crop_filter.nil? and
+              scale_filter.nil?
+            decode_options += ['-hwaccel_output_format', 'cuda']
+            nvenc_gpu_only = true
+            frame_rate_filter.sub!(/^yadif/, 'yadif_cuda') unless frame_rate_filter.nil?
+          end
+
           if  decode_method == 'qsv' and
               overlay_filter.nil? and
               frame_rate_filter.nil? and
@@ -1712,8 +1743,14 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         end
       end
 
+      ten_bit = (@ten_bit ? (@eight_bit_vc1 ? (video['codec_name'] != 'vc1') : true) : false)
+      pix_fmt = true
+
       if @encoder =~ /vaapi$/ and not decode_options.include?('-hwaccel')
         conversion_filter = 'format=nv12,hwupload'
+      elsif nvenc_gpu_only
+        conversion_filter = "scale_cuda=format=#{ten_bit ? 'p010le' : 'yuv420p'}"
+        pix_fmt = false
       else
         conversion_filter = nil
       end
@@ -1754,8 +1791,9 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       color_primaries = video['color_primaries']
       color_trc       = video['color_transfer']
+      color_trc       = 'gamma22' if color_trc == 'bt470m'
+      color_trc       = 'gamma28' if color_trc == 'bt470bg'
       colorspace      = video['color_space']
-      ten_bit = (@ten_bit ? (@eight_bit_vc1 ? (video['codec_name'] != 'vc1') : true) : false)
 
       if (video.fetch('pix_fmt', 'yuv420p') == 'yuv420p10le') and ten_bit
         color_primaries ||= 'bt2020'
@@ -1845,7 +1883,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       Kernel.warn text
       encode_options += ['-c:v', @encoder]
-      encode_options += ['-pix_fmt:v', (@encoder =~ /(videotoolbox|nvenc|qsv)$/ ? 'p010le' : 'yuv420p10le')] if ten_bit
+      encode_options += ['-pix_fmt:v', (@encoder =~ /(videotoolbox|nvenc|qsv)$/ ? 'p010le' : 'yuv420p10le')] if ten_bit and pix_fmt
       encode_options += (@nvenc_cq.nil? ? ['-b:v', "#{bitrate}k"] : ['-cq:v', @nvenc_cq]) unless @encoder == 'copy'
       encode_options += ['-maxrate:v', "#{maxrate}k"] if maxrate > 0
       encode_options += ['-bufsize:v', "#{bufsize}k"] if bufsize > 0

data/other_video_transcoding.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'other_video_transcoding'
-  s.version               = '0.9.0'
+  s.version               = '0.10.0'
   s.required_ruby_version = '>= 2.0'
   s.summary               = 'Other tools to transcode videos.'
   s.description           = <<-HERE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: other_video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Don Melton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-05 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies: []
 description: "    Other Video Transcoding is a package of tools to transcode videos.\n"
 email: don@blivet.com
@@ -36,6 +36,7 @@ files:
 - other_video_transcoding-0.6.0.gem
 - other_video_transcoding-0.7.0.gem
 - other_video_transcoding-0.8.0.gem
+- other_video_transcoding-0.9.0.gem
 - other_video_transcoding.gemspec
 homepage: https://github.com/donmelton/other_video_transcoding
 licenses:
@@ -56,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Other tools to transcode videos.