video2gif 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92d78189e8061dcc25298f5e8fb65e84c39688479f7f087761a16fbab16b5c60
-  data.tar.gz: d50fcf7f759e6578beb1730c9a1f2de95b5518c5fdae9a36125405d888a85c03
+  metadata.gz: de00f9f371c9632397ca52a27968a790f7e68fc58580b5438dfe9a73600a072e
+  data.tar.gz: 159321148a290683426e35b76aa5a9f2ebe2cc1e78f122ebc07b2738e67f02c9
 SHA512:
-  metadata.gz: 57774248542d5c75031ff1596094b3698ee13b48df7ca0a0715c314da676bfe62601396249bbc1d0b0116be97a83351a65a5f9ffded88deb26ac9779afb645c2
-  data.tar.gz: 7661e6761b9ceb828bace679eb552f9ffdabf31fdd43b31a63e4ad480bed4514b5733b2a4958a868cd698cd96d7fd3d93da6d31da1fc31e008369a695f8fa64c
+  metadata.gz: 8a067a16a488490ac8d076cac3802b1f4d99428507b59f1abd72f414fdc90c7a3eea80f345a40aaa95c78faeff04016ebffe2908a15ca00b6fb5f7f365bed56d
+  data.tar.gz: 0fa948c4872e6ca1297e2a6c4c9b5dffdb89ff2ecd232b2c16bfea75bb085cbdc9779bceb353ef552cbc4741ed8a1c5559f7a3160b59578d5f46dd46a5ab16a1

data/Gemfile.lock

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

data/lib/video2gif/cli.rb

@@ -11,14 +11,14 @@ module Video2gif
       logger = Logger.new(STDOUT)
       options = Video2gif::Options.parse(ARGV)
 
-      if options[:cropdetect]
+      if options[:autocrop]
         Open3.popen3(*Video2gif::FFMpeg.cropdetect_command(options, logger)) do |stdin, stdout, stderr, thread|
           stdin.close
           stdout.close
           stderr.each(chomp: true) do |line|
             logger.info(line) if options[:verbose] unless options[:quiet]
             if line.include?('Parsed_cropdetect')
-              options[:cropdetect] = line.match('crop=([0-9]+\:[0-9]+\:[0-9]+\:[0-9]+)')
+              options[:autocrop] = line.match('crop=([0-9]+\:[0-9]+\:[0-9]+\:[0-9]+)')
             end
           end
           stderr.close

data/lib/video2gif/ffmpeg.rb

@@ -9,23 +9,22 @@ module Video2gif
       width      = options[:width]   # default is not to scale at all
 
       # create filter elements
-      palettegen_fps_filter = "fps=2"  # sample only a few frames a second
-      paletteuse_fps_filter = "fps=#{fps}"
-      crop_filter       = options[:cropdetect] || 'crop=' + %W[
-                                                     w=#{ options[:wregion] || 'in_w' }
-                                                     h=#{ options[:hregion] || 'in_h' }
-                                                     x=#{ options[:xoffset] || 0 }
-                                                     y=#{ options[:yoffset] || 0 }
-                                                  ].join(':')
+      fps_filter        = "fps=#{fps}"
+      crop_filter       = options[:autocrop] || 'crop=' + %W[
+                                                   w=#{ options[:wregion] || 'in_w' }
+                                                   h=#{ options[:hregion] || 'in_h' }
+                                                   x=#{ options[:xoffset] || 0 }
+                                                   y=#{ options[:yoffset] || 0 }
+                                                ].join(':')
       scale_filter      = "scale=#{width}:-1:flags=lanczos:sws_dither=none" if options[:width] unless options[:tonemap]
       tonemap_filters   = if options[:tonemap]  # TODO: detect input format
                             %W[
-                              zscale=w=#{width}:h=-1
-                              zscale=t=linear:npl=100
+                              zscale=dither=none:filter=lanczos:width=#{width}:height=-1
+                              zscale=transfer=linear:npl=100
                               format=yuv420p10le
-                              zscale=p=bt709
+                              zscale=primaries=bt709
                               tonemap=tonemap=#{options[:tonemap]}:desat=0
-                              zscale=t=bt709:m=bt709:r=tv
+                              zscale=transfer=bt709:matrix=bt709:range=tv
                               format=yuv420p
                             ].join(',')
                           end
@@ -40,8 +39,10 @@ module Video2gif
                               gamma_b=#{ options[:gamma_b] || 1 }
                             ].join(':')
                           end
-      palettegen_filter = "palettegen=#{max_colors}stats_mode=full"
-      paletteuse_filter = 'paletteuse=dither=floyd_steinberg:diff_mode=rectangle'
+      split_filter      = 'split [o1] [o2]'
+      palettegen_filter = "[o1] palettegen=#{max_colors}stats_mode=diff [p]"
+      fifo_filter       = '[o2] fifo [o3]'
+      paletteuse_filter = '[o3] [p] paletteuse=dither=floyd_steinberg:diff_mode=rectangle'
       drawtext_filter   = if options[:text]
                             count_of_lines = options[:text].scan(/\\n/).count + 1
 
@@ -73,30 +74,13 @@ module Video2gif
 
       filter_complex = []
 
-      # first, apply the same filters we'll use later in the same order
-      # before applying the palettegen so that we accurately predict the
-      # final palette
-      filter_complex << palettegen_fps_filter
-      filter_complex << crop_filter     if crop_filter
-      filter_complex << scale_filter    if options[:width] unless options[:tonemap]
-      filter_complex << tonemap_filters if options[:tonemap]
-      filter_complex << eq_filter       if options[:eq]
-      filter_complex << drawtext_filter if options[:text]
-
-      # then generate the palette (and label this filter stream)
-      filter_complex << palettegen_filter + '[palette]'
-
-      # then refer back to the first video input stream and the filter
-      # complex stream to apply the generated palette to the video stream
-      # along with the other filters (drawing text last so that it isn't
-      # affected by scaling)
-      filter_complex << '[0:v][palette]' + paletteuse_filter
-      filter_complex << paletteuse_fps_filter
+      filter_complex << fps_filter
       filter_complex << crop_filter     if crop_filter
       filter_complex << scale_filter    if options[:width] unless options[:tonemap]
       filter_complex << tonemap_filters if options[:tonemap]
       filter_complex << eq_filter       if options[:eq]
       filter_complex << drawtext_filter if options[:text]
+      filter_complex << split_filter << palettegen_filter << fifo_filter << paletteuse_filter
 
       filter_complex.join(',')
     end
@@ -104,11 +88,10 @@ module Video2gif
     def self.cropdetect_command(options, logger)
       command = ['ffmpeg']
       command << '-analyzeduration' << '2147483647' << '-probesize' << '2147483647'
-      command << '-nostdin'
       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[:cropdetect]}"
+      command << '-filter_complex' << "cropdetect=limit=#{options[:autocrop]}"
       command << '-f' << 'null'
       command << '-'
 
@@ -121,12 +104,10 @@ module Video2gif
       command = ['ffmpeg']
       command << '-y'  # always overwrite
       command << '-analyzeduration' << '2147483647' << '-probesize' << '2147483647'
-      command << '-nostdin'
       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)
-      command << '-gifflags' << '+transdiff'  # enabled by default
       command << '-f' << 'gif'
       command << options[:output_filename]
 

data/lib/video2gif/options.rb

@@ -81,11 +81,11 @@ module Video2gif
           options[:yoffset] = o
         end
 
-        parser.on('-d [THRESHOLD]',
-                  '--crop-detect [THRESHOLD]',
+        parser.on('-a [THRESHOLD]',
+                  '--autocrop [THRESHOLD]',
                   'Attempt automatic cropping based on black region, scaled',
                   'from 0 (nothing) to 255 (everything), default threshold 24') do |c|
-          options[:cropdetect] = c || 24
+          options[:autocrop] = c || 24
         end
 
         parser.on('--contrast CONTRAST',

data/lib/video2gif/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video2gif
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Emily St.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler