other_video_transcoding 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa5db474ee387172ee779cd57befc925892dde23348ed6376cd35c416662576f
-  data.tar.gz: bd15276c43996afe54cf1bd7ad0f52eb55e5f5a6c1d90ebd36721d206eb17205
+  metadata.gz: e5caa1866dd6d3035704fb8977f21d682291ebfd46a6496974399a6876b13d33
+  data.tar.gz: b7c206ee00b2162bfea7b9c27f7566c879225a32efcfbf7a09fd7a9fc88f8200
 SHA512:
-  metadata.gz: 577dcc59ee2b7b2304ad59243abd5999851ed5a0407934eccfd25e59d320145428b40a86eb3f6938b30e6c45d2343cc20aa2b62f474e7b4d0c1dd9a99d8dc43e
-  data.tar.gz: 053d07452a33c7d04239e8dee324ec954e08682607871cf8c79e2cdbf0cb6bbca0dff202e8464e2fe49f80c6e7a4adb50c3a9f815636e0fe786e7ac86829ddd6
+  metadata.gz: d1c667e8c485d1ab70a4c035aa53915365aa6225cab6487f0488c37fa99eb7632e1ffc262ab3f256a55d8e43c71caaa20ed1d8dd64194a275972dbc1c65dee38
+  data.tar.gz: a47799076252ff46103419e41def057edfc4e63ec299b477f2360f7aad0ed866c14d0ff5f5ac2f8a3d1aeaf7a40fc47a2e3f4d203bc88c128cd0ce893f6fd22d

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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

data/bin/ask-ffmpeg-log

@@ -16,7 +16,7 @@ module Transcoding
   class Command
     def about
       <<-HERE
-ask-ffmpeg-log 0.4.0
+ask-ffmpeg-log 0.5.0
 Copyright (c) 2019-2020 Don Melton
       HERE
     end

data/bin/other-transcode

@@ -18,7 +18,7 @@ module Transcoding
   class Command
     def about
       <<-HERE
-other-transcode 0.4.0
+other-transcode 0.5.0
 Copyright (c) 2019-2020 Don Melton
       HERE
     end
@@ -102,6 +102,10 @@ Video options:
                       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
 
@@ -310,7 +314,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @preset = nil
       @decode_scope = :vc1
       @decode_method = nil
-      @decoder_type = nil
+      @qsv_device = nil
       @target_2160p = nil
       @target_1080p = nil
       @target_720p  = nil
@@ -498,15 +502,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       end
 
       opts.on '--preset ARG' do |arg|
-        if arg == 'none'
-          Kernel.warn '**********'
-          Kernel.warn 'Using deprecated `--preset` argument: none'
-          Kernel.warn '**********'
-          @preset = nil
-        else
-          @preset = arg
-        end
-
+        @preset = arg
         @encoder = nil if @encoder == 'copy'
       end
 
@@ -523,11 +519,13 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @decode_method = arg ? 'cuda' : 'auto'
       end
 
-      opts.on '--cuvid' do
-        Kernel.warn '**********'
-        Kernel.warn 'Using deprecated option: --cuvid'
-        Kernel.warn '**********'
-        @decoder_type = :cuvid
+      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|
@@ -584,7 +582,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @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|
@@ -650,26 +648,14 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @vt_allow_sw = true
       end
 
-      opts.on '--[no-]nvenc-spatial-aq' do |arg|
-        unless arg
-          Kernel.warn '**********'
-          Kernel.warn 'Using deprecated option: --no-nvenc-spatial-aq'
-          Kernel.warn '**********'
-        end
-
+      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|
-        unless arg
-          Kernel.warn '**********'
-          Kernel.warn 'Using deprecated option: --no-nvenc-temporal-aq'
-          Kernel.warn '**********'
-        end
-
+      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|
@@ -1563,38 +1549,10 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
     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
@@ -1613,11 +1571,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       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?
@@ -1628,7 +1582,6 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
 
       if @detelecine
         frame_rate_filter = 'fieldmatch=order=tff:combmatch=none,decimate'
-        cuvid_decoder = nil
       end
 
       width   = video['width'].to_i
@@ -1643,21 +1596,9 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       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
@@ -1672,14 +1613,8 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         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
@@ -1690,24 +1625,52 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         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', @decode_method]
+            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')

data/other_video_transcoding.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'other_video_transcoding'
-  s.version               = '0.4.0'
+  s.version               = '0.5.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.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Don Melton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies: []
 description: "    Other Video Transcoding is a package of tools to transcode videos.\n"
 email: don@blivet.com
@@ -31,6 +31,7 @@ files:
 - other_video_transcoding-0.3.0.gem
 - other_video_transcoding-0.3.1.gem
 - other_video_transcoding-0.3.2.gem
+- other_video_transcoding-0.4.0.gem
 - other_video_transcoding.gemspec
 homepage: https://github.com/donmelton/other_video_transcoding
 licenses: