video2gif 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18744ed8233c2766731e647303b9b4493545d860
-  data.tar.gz: 94cafe3965b7cf4f5800b6ebd1d5c24f457f66f1
+  metadata.gz: 1266f3c1c715f41fa3c9d15bd11b788c74b4095d
+  data.tar.gz: 33c432d73a9daa08f89b1a758875a504a1c33f8f
 SHA512:
-  metadata.gz: 8224b9efbff707dd5e79587fb51531ce158a9bc447a0d173b903987883ee3b0c32598a4d9de309b6f16f7b551f72d21691aef4898bfde74574e657946706e015
-  data.tar.gz: 48e256f90d5a3dcf546684708997a342bd4f12081f93b57049ac851c708a6c787dc92792da2828932c94eff27ea88247493498e4bc2e2383e55284c18a2c8f67
+  metadata.gz: 820669a53355384b56f7060249a064bc57b1ccd000b575490e055b58ea18cd87438271bf5c0afb99fe139f0feff735a3f4dfd68d72b53dc148018345471b473b
+  data.tar.gz: ae0e081d4cd1ae6fa56a00259c8ffb7132f02ce3eea545cb90f36e788e857034fd3234057beaa03a2c33f30e69ce97ed9b667dace0ae097863eeb1f8625d0885

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    video2gif (0.0.13)
+    video2gif (0.0.14)
 
 GEM
   remote: https://rubygems.org/

data/lib/video2gif/ffmpeg.rb

@@ -3,15 +3,24 @@
 
 module Video2gif
   module FFMpeg
-    def self.filter_complex(options)
-      filter_complex = []
+    def self.filtergraph(options)
+      filtergraph = []
 
-      filter_complex << "fps=#{ options[:fps] || 10 }"
+      # Set 'fps' filter first, drop unneeded frames instead of
+      # processing those.
+      filtergraph << "fps=#{ options[:fps] || 10 }"
 
+      # Crop if needed, using either settings discovered during the
+      # autocrop run or manually set parameters, so we don't process
+      # additional parts of the image (and exclude it from palette
+      # generation).
       if options[:autocrop]
-        filter_complex << options[:autocrop]
-      else
-        filter_complex << 'crop=' + [
+        filtergraph << options[:autocrop]
+      elsif options[:wregion] ||
+            options[:hregion] ||
+            options[:xoffset] ||
+            options[:yoffset]
+        filtergraph << 'crop=' + [
           "w=#{ options[:wregion] || 'in_w' }",
           "h=#{ options[:hregion] || 'in_h' }",
           "x=#{ options[:xoffset] || 0 }",
@@ -19,29 +28,39 @@ module Video2gif
         ].join(':')
       end
 
+      # If we're not attempting to convert HDR to SDR, the standard
+      # 'scale' filter is preferred (if we're resizing at all). Scale
+      # here before other filters to avoid unnecessary processing.
       if options[:width] && !options[:tonemap]
-        filter_complex << "scale=flags=lanczos:sws_dither=none:width=#{options[:width]}:height=-1"
+        filtergraph << "scale=flags=lanczos:sws_dither=none:width=#{options[:width]}:height=-1"
       end
 
+      # If we're attempting to convert HDR to SDR, use a set of 'zscale'
+      # filters, 'format' filters, and the 'tonemap' filter. The
+      # 'zscale' will do the resize for us as well.
       if options[:tonemap]
-        filter_complex << "zscale=dither=none:filter=lanczos:width=#{options[:width]}:height=-1" if options[:width]
-        filter_complex << 'zscale=transfer=linear:npl=100'
-        filter_complex << 'zscale=npl=100'
-        filter_complex << 'format=gbrpf32le'
-        filter_complex << 'zscale=primaries=bt709'
-        filter_complex << "tonemap=tonemap=#{options[:tonemap]}:desat=0"
-        filter_complex << 'zscale=transfer=bt709:matrix=bt709:range=tv'
-        filter_complex << 'format=yuv420p'
+        filtergraph << "zscale=dither=none:filter=lanczos:width=#{options[:width]}:height=-1" if options[:width]
+        filtergraph << 'zscale=transfer=linear:npl=100'
+        filtergraph << 'zscale=npl=100'
+        filtergraph << 'format=gbrpf32le'
+        filtergraph << 'zscale=primaries=bt709'
+        filtergraph << "tonemap=tonemap=#{options[:tonemap]}:desat=0"
+        filtergraph << 'zscale=transfer=bt709:matrix=bt709:range=tv'
+        filtergraph << 'format=yuv420p'
       end
 
-      filter_complex << "eq=contrast=#{options[:contrast]}"     if options[:contrast]
-      filter_complex << "eq=brightness=#{options[:brightness]}" if options[:brightness]
-      filter_complex << "eq=saturation=#{options[:saturation]}" if options[:saturation]
-      filter_complex << "eq=gamma=#{options[:gamma]}"           if options[:gamma]
-      filter_complex << "eq=gamma_r=#{options[:gamma_r]}"       if options[:gamma_r]
-      filter_complex << "eq=gamma_g=#{options[:gamma_g]}"       if options[:gamma_g]
-      filter_complex << "eq=gamma_b=#{options[:gamma_b]}"       if options[:gamma_b]
-
+      # Perform any desired equalization before we overlay text so that
+      # it won't be affected.
+      filtergraph << "eq=contrast=#{options[:contrast]}"     if options[:contrast]
+      filtergraph << "eq=brightness=#{options[:brightness]}" if options[:brightness]
+      filtergraph << "eq=saturation=#{options[:saturation]}" if options[:saturation]
+      filtergraph << "eq=gamma=#{options[:gamma]}"           if options[:gamma]
+      filtergraph << "eq=gamma_r=#{options[:gamma_r]}"       if options[:gamma_r]
+      filtergraph << "eq=gamma_g=#{options[:gamma_g]}"       if options[:gamma_g]
+      filtergraph << "eq=gamma_b=#{options[:gamma_b]}"       if options[:gamma_b]
+
+      # If there is text to superimpose, do it here before palette
+      # generation to ensure the color looks appropriate.
       if options[:text]
         count_of_lines = options[:text].scan(/\\n/).count + 1
         text = options[:text]
@@ -52,7 +71,7 @@ module Video2gif
           .gsub(/\B"\b([^"\u201C\u201D\u201E\u201F\u2033\u2036\r\n]+)\b?"\B/, "\u201C\\1\u201D")
           .gsub(/\B'\b([^'\u2018\u2019\u201A\u201B\u2032\u2035\r\n]+)\b?'\B/, "\u2018\\1\u2019")
 
-        filter_complex << 'drawtext=' + [
+        filtergraph << 'drawtext=' + [
           "x='#{ options[:xpos] || '(main_w/2-text_w/2)' }'",
           "y='#{ options[:ypos] || "(main_h-line_h*1.5*#{count_of_lines})" }'",
           "fontsize='#{ options[:textsize] || 32 }'",
@@ -63,21 +82,38 @@ module Video2gif
         ].join(':')
       end
 
-      filter_complex << 'split [palettegen] [paletteuse]'
-      filter_complex << "[palettegen] palettegen=#{options[:palette] || 256}:stats_mode=diff [palette]"
-      filter_complex << '[paletteuse] [palette] paletteuse=dither=floyd_steinberg:diff_mode=rectangle'
+      # Split the stream into two copies, labeled with output pads for
+      # the palettegen/paletteuse filters to use.
+      filtergraph << 'split[palettegen][paletteuse]'
+
+      # Using a copy of the stream created above labeled "palettegen",
+      # generate a palette from the stream using the specified number of
+      # colors and optimizing for moving objects in the stream. Label
+      # this stream's output as "palette."
+      filtergraph << "[palettegen]palettegen=#{options[:palette] || 256}:stats_mode=diff[palette]"
+
+      # Using a copy of the stream from the 'split' filter and the
+      # generated palette as inputs, apply the final palette to the GIF.
+      # For non-moving parts of the GIF, attempt to reuse the same
+      # palette from frame to frame.
+      filtergraph << "[paletteuse][palette]paletteuse=dither=#{options[:dither] || 'floyd_steinberg'}:diff_mode=rectangle"
 
-      filter_complex.join(',')
+      filtergraph.join(',')
     end
 
-    def self.cropdetect_command(options, logger)
-      command = ['ffmpeg']
+    def self.ffmpeg_command(options, executable: 'ffmpeg')
+      command = [executable]
+      command << '-y'  # always overwrite
       command << '-analyzeduration' << '2147483647' << '-probesize' << '2147483647'
       command << '-loglevel' << 'verbose'
       command << '-ss' << options[:seek] if options[:seek]
       command << '-t' << options[:time] if options[:time]
       command << '-i' << options[:input_filename]
-      command << '-filter_complex' << "cropdetect=limit=#{options[:autocrop]}"
+    end
+
+    def self.cropdetect_command(options, logger, executable: 'ffmpeg')
+      command = ffmpeg_command(options, executable: executable)
+      command << '-filtergraph' << "cropdetect=limit=#{options[:autocrop]}"
       command << '-f' << 'null'
       command << '-'
 
@@ -86,15 +122,9 @@ module Video2gif
       command
     end
 
-    def self.gif_command(options, logger)
-      command = ['ffmpeg']
-      command << '-y'  # always overwrite
-      command << '-analyzeduration' << '2147483647' << '-probesize' << '2147483647'
-      command << '-loglevel' << 'verbose'
-      command << '-ss' << options[:seek] if options[:seek]
-      command << '-t' << options[:time] if options[:time]
-      command << '-i' << options[:input_filename]
-      command << '-filter_complex' << filter_complex(options)
+    def self.gif_command(options, logger, executable: 'ffmpeg')
+      command = ffmpeg_command(options, executable: executable)
+      command << '-filter_complex' << filtergraph(options)
       command << '-f' << 'gif'
       command << options[:output_filename]
 

data/lib/video2gif/options.rb

@@ -57,6 +57,17 @@ module Video2gif
           options[:palette] = p
         end
 
+        parser.on('-d [ALGORITHM]',
+                  '--[no-]dither [ALGORITHM]',
+                  'Set the dithering algorithm for the palette generation",
+                  "(default enabled with "floyd_steinberg")') do |d|
+          if d.nil?
+            options[:dither] = 'floyd_steinberg'
+          else
+            options[:dither] = d || 'none'
+          end
+        end
+
         parser.on('-c SIZE',
                   '--crop-size-w SIZE',
                   'Pixel size of width to select from source video, before scaling') do |s|

data/lib/video2gif/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Video2gif
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video2gif
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Emily St.