other_video_transcoding 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4273472e881f7379241d7ea8f6a3576b861f92c02155ad3c786fbee68cf1a376
-  data.tar.gz: 38e2083ce586a71c114948efccb2877a817012ea0fdfdda1f0fce371070e80ef
+  metadata.gz: 1b33c51af021fb92ec9d41e7b4b95e92740b9c15832f276a471d6ecd8a92abe4
+  data.tar.gz: c3e030f58c77f2cce69cd02a3563428f4a0f6dbed0b6216928f4c40c6b2f3d73
 SHA512:
-  metadata.gz: f3d2b8f89b14154307b7a89c2f0ecb6368b33f9f9011363b749dac85645fd309f2cf32a8f2b3355736a29f1e74814c47aca2ea81ff70fa2e0d0e1ea0221c3c5d
-  data.tar.gz: 1b593c97ca2097033d068a44a5f924b413f5ead1858592efb05db115631b106500edf887ff032629b9dde6e6d307d652ddcee11af7c020046199c72602f2300f
+  metadata.gz: 5f5e7f4135a53ed651720e0803f605a52768cb12758fcb9c13c15c4d8cc59ec94340f02aab11d9c3db9b390bf296c51b9fb7f49c8314bbf4906352252dbc4942
+  data.tar.gz: 8df50e3a3be13cb47483fd5b0ce9b2c9e97b3b4fe6755e5843e450bf177709df070e82e2ba18ab79c76d5f30172d588b9407b6aec25757ffcb0fd6e45e180881

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 This single document contains all of the notes created for each [release](https://github.com/donmelton/other_video_transcoding/releases).
 
+## [0.8.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.8.0)
+
+Saturday, February 13, 2021
+
+* Modify `other-transcode` to:
+    * No longer automatically deinterlace video with a frame rate of 29.97 FPS.
+    * No longer change the frame rate of any video in MPEG-2 format which was automatically deinterlaced.
+    * Only automatically deinterlace non-progressive video.
+    * Apply any automatic or explicit deinterlacing to all frames of the video, not just the interlaced frames.
+    * Force a constant frame rate for any video in MPEG-2 format at 29.97 FPS.
+* Add a `--yadif-params` option to `other-transcode` to allow customization of the `yadif` filter used for deinterlacing.
+* Remove the deprecated `--all-eac3` option of `other-transcode`.
+
 ## [0.7.0](https://github.com/donmelton/other_video_transcoding/releases/tag/0.7.0)
 
 Monday, January 4, 2021

data/bin/ask-ffmpeg-log

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

data/bin/other-transcode

@@ -18,7 +18,7 @@ module Transcoding
   class Command
     def about
       <<-HERE
-other-transcode 0.7.0
+other-transcode 0.8.0
 Copyright (c) 2019-2021 Don Melton
       HERE
     end
@@ -128,7 +128,7 @@ Video options:
     --deinterlace   reduce interlace artifacts without changing frame rate
                       (applied automatically for some inputs)
     --rate FPS      force constant video frame rate
-                      (`24000/1001` applied automatically for some inputs)
+                      (disables automatic deinterlacing)
     --detelecine    drop duplicate frames to restore original frame rate
                       (disables any deinterlacing and forced frame rate)
     --no-filters    disable any automatic adjustments via filters
@@ -137,6 +137,8 @@ Video options:
 
     def usage10
       <<-HERE
+    --yadif-params KEY=VALUE[:KEY=VALUE]...
+                    override yadif deinterlace filter configuration
     --rc-maxrate FACTOR, --rc-bufsize FACTOR
                     set ratecontrol maximum rate and/or buffer size
                       as multiple of video bitrate target
@@ -333,6 +335,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       @rate = nil
       @detelecine = false
       @enable_filters = true
+      @yadif_params = nil
       @maxrate = nil
       @bufsize = nil
       @vt_allow_sw = false
@@ -633,6 +636,14 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @enable_filters = false
       end
 
+      opts.on '--yadif-params ARG' do |arg|
+        arg.split ':' do |param|
+          fail UsageError, "invalid argument: #{arg}" unless param =~ /^[\w\-]+=[\w\-\.,]+$/
+        end
+
+        @yadif_params = arg
+      end
+
       opts.on '--rc-maxrate ARG', Float do |arg|
         @maxrate = arg
         @encoder = nil if @encoder == 'copy'
@@ -860,14 +871,6 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         @stereo_encoder   = 'eac3'
       end
 
-      opts.on '--all-eac3' do
-        Kernel.warn '**********'
-        Kernel.warn 'Using deprecated option: --all-eac3'
-        Kernel.warn '**********'
-        @surround_encoder = 'eac3'
-        @stereo_encoder   = 'eac3'
-      end
-
       opts.on '--aac-stereo' do
         @stereo_encoder = nil
       end
@@ -1604,28 +1607,22 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       end
 
       deinterlace = @deinterlace
-      rate = @rate
-
-      if @enable_filters
-        if video['avg_frame_rate'] == '30000/1001' or video.fetch('field_order', 'progressive') != 'progressive'
-          deinterlace = true
 
-          if video['codec_name'] == 'mpeg2video' and video['avg_frame_rate'] != '25/1'
-            rate = '24000/1001'
-          end
-        end
+      if @enable_filters and video.fetch('field_order', 'progressive') != 'progressive'
+        deinterlace = true
       end
 
       frame_rate_filter = nil
 
-      if deinterlace
-        frame_rate_filter = 'yadif=deint=interlaced' unless @encoder == 'copy'
+      if deinterlace and @encoder != 'copy'
+        frame_rate_filter = 'yadif'
+        frame_rate_filter += "=#{@yadif_params}" unless @yadif_params.nil?
       end
 
-      unless rate.nil?
+      unless @rate.nil?
         frame_rate_filter = '' if frame_rate_filter.nil?
         frame_rate_filter += ',' unless frame_rate_filter.empty?
-        frame_rate_filter += "fps=#{rate}"
+        frame_rate_filter += "fps=#{@rate}"
       end
 
       if @detelecine
@@ -1727,9 +1724,15 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
         conversion_filter = nil
       end
 
+      encode_options = []
+
       if @encoder == 'copy'
         filter = ''
       else
+        if video['codec_name'] == 'mpeg2video' and video['avg_frame_rate'] == '30000/1001'
+          encode_options += ['-vsync', 'cfr']
+        end
+
         filter =  overlay_filter.nil?     ? '' : overlay_filter
         filter += frame_rate_filter.nil?  ? '' : ",#{frame_rate_filter}"
         filter += crop_filter.nil?        ? '' : ",#{crop_filter}"
@@ -1739,7 +1742,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
       end
 
       if overlay_filter.nil?
-        encode_options = [
+        encode_options += [
           '-map', "0:#{video['index']}"
         ]
 
@@ -1749,7 +1752,7 @@ Requires `ffprobe`, `ffmpeg` and `mkvpropedit`.
           ]
         end
       else
-        encode_options = [
+        encode_options += [
           '-filter_complex', "[0:#{video['index']}]#{filter}[v]",
           '-map', '[v]'
         ]

data/other_video_transcoding.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'other_video_transcoding'
-  s.version               = '0.7.0'
+  s.version               = '0.8.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.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Don Melton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies: []
 description: "    Other Video Transcoding is a package of tools to transcode videos.\n"
 email: don@blivet.com
@@ -34,6 +34,7 @@ files:
 - other_video_transcoding-0.4.0.gem
 - other_video_transcoding-0.5.0.gem
 - other_video_transcoding-0.6.0.gem
+- other_video_transcoding-0.7.0.gem
 - other_video_transcoding.gemspec
 homepage: https://github.com/donmelton/other_video_transcoding
 licenses:
@@ -54,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Other tools to transcode videos.