video2gif 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a792d0bc3ded611a4295f7195ab17fbe5a71c65ae84bc527eb02c9f6c667088c
-  data.tar.gz: f17cfefa5ef240925a2915ae089df6c7d9eacd7bf2d1ac449bce6f707a2a15c7
+  metadata.gz: 9033455c4d54099067dd61428f3190e75bc52783ab0ee110effa5cb9efedf688
+  data.tar.gz: fd1092a4ef5ffa4c280861fa084444ed2d3b260139062488824c71c3de0957ee
 SHA512:
-  metadata.gz: ba5e69371e4edb486ff79a7ffa539cbf656c3edf1bc1794f58a02add3240fd81acadaaba8502b123990e09efa1d630560b4a20357d747f3349b3f9314864a9aa
-  data.tar.gz: 243ddc56a97b5470d7771e90731dafbb9d0c69c2427e406a4f6f664305fe6d1bd40b27cf29b8a99221dabcce6d76a562ea5321767e161cdf72be165a2a2f94a3
+  metadata.gz: 19a4bfdfb4abd9f13c9c0b8f6a558ef9c1563c620c864e70b3ed96f59b2dd344e153c7900561b92298b18fdc3094ea8a8feb7f4fc2d1f67b2ba90adbc95f757a
+  data.tar.gz: f7c4f43908ca23a75651a73c3cff2cd30407024296ad3fab227f6dba331d0276228e54032458cf7d80739c0b6b4bd8f440508ef101ce5d6edd788e9f0d680084

data/README.md

@@ -3,10 +3,10 @@ video2gif
 
 `video2gif` eases converting any video into a GIF.
 
-It uses [FFMpeg] and optionally [ImageMagick], so it understands any
-video that [FFMpeg] does. It has an array of options to allow you to
-select the part of the video you want, crop it automatically, overlay
-text, and manipulate the color and brightness.
+It uses [FFMpeg], so it understands any video that [FFMpeg] does. It has
+an array of options to allow you to select the part of the video you
+want, crop it automatically, overlay text, and manipulate the color and
+brightness.
 
 
 Installation
@@ -17,9 +17,6 @@ available in the system `$PATH`. If you can run `ffmpeg` from the
 command line, you're probably good. If not, use your favorite package
 manager to install it.
 
-If you install [ImageMagick], further optimization will automatically
-take place on the resulting GIF.
-
 Note that some features may not be available by default. For example,
 tonemapping (used for HDR videos) requires `libzimg` support, not
 included by default in the [FFMpeg] supplied by [Homebrew].

data/lib/video2gif.rb

@@ -93,12 +93,6 @@ module Video2gif
         options[:cropdetect] = c || 24
       end
 
-      parser.on('-o',
-                '--[no-]optimize',
-                'Attempt to optimize GIF size with ImageMagick (default yes if available)') do |o|
-        options[:optimize] = o
-      end
-
       parser.on('--contrast CONTRAST',
                 'Apply contrast adjustment, scaled from -2.0 to 2.0 (default 1)') do |c|
         options[:contrast] = c
@@ -239,19 +233,13 @@ module Video2gif
       exit
     end
 
-    if !is_executable?('convert') && options[:optimize]
-      logger.warn('ImageMagick isn\'t available! Optimization will be'\
-                  ' disabled!') unless options[:quiet]
-      options[:optimize] = false
-    end
-
     options
   end
 
   def self.build_filter_complex(options)
-    fps          = options[:fps]     || 15
-    palette_size = options[:palette] || 256
-    width        = options[:width]   # default is not to scale at all
+    fps        = options[:fps]     || 15
+    max_colors = options[:palette] ? "max_colors=#{options[:palette]}:" : ''
+    width      = options[:width]   # default is not to scale at all
 
     # create filter elements
     fps_filter        = "fps=#{fps}"
@@ -275,17 +263,17 @@ module Video2gif
                         end
     eq_filter         = if options[:eq]
                           'eq=' + %W[
-                            contrast=#{options[:contrast] || 1}
-                            brightness=#{options[:brightness] || 0}
-                            saturation=#{options[:saturation] || 1}
-                            gamma=#{options[:gamma] || 1}
-                            gamma_r=#{options[:gamma_r] || 1}
-                            gamma_g=#{options[:gamma_g] || 1}
-                            gamma_b=#{options[:gamma_b] || 1}
+                            contrast=#{ options[:contrast] || 1 }
+                            brightness=#{ options[:brightness] || 0 }
+                            saturation=#{ options[:saturation] || 1 }
+                            gamma=#{ options[:gamma] || 1 }
+                            gamma_r=#{ options[:gamma_r] || 1 }
+                            gamma_g=#{ options[:gamma_g] || 1 }
+                            gamma_b=#{ options[:gamma_b] || 1 }
                           ].join(':')
                         end
-    palettegen_filter = "palettegen=max_colors=#{palette_size}:stats_mode=diff"
-    paletteuse_filter = 'paletteuse=dither=sierra2_4a:diff_mode=rectangle'
+    palettegen_filter = "palettegen=#{max_colors}stats_mode=diff"
+    paletteuse_filter = 'paletteuse=dither=floyd_steinberg:diff_mode=rectangle'
     drawtext_filter   = if options[:text]
                           count_of_lines = options[:text].scan(/\\n/).count + 1
 
@@ -321,10 +309,10 @@ module Video2gif
     # before applying the palettegen so that we accurately predict the
     # final palette
     filter_complex << fps_filter
-    filter_complex << crop_filter if crop_filter
-    filter_complex << scale_filter if options[:width] unless options[:tonemap]
+    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 << eq_filter       if options[:eq]
     filter_complex << drawtext_filter if options[:text]
 
     # then generate the palette (and label this filter stream)
@@ -336,10 +324,10 @@ module Video2gif
     # affected by scaling)
     filter_complex << '[0:v][palette]' + paletteuse_filter
     filter_complex << fps_filter
-    filter_complex << crop_filter if crop_filter
-    filter_complex << scale_filter if options[:width] unless options[:tonemap]
+    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 << eq_filter       if options[:eq]
     filter_complex << drawtext_filter if options[:text]
 
     filter_complex.join(',')
@@ -349,51 +337,38 @@ module Video2gif
     if args[1]
       args[1].end_with?('.gif') ? args[1] : args[1] + '.gif'
     else
-      File.join(File.dirname(args[0]),
-                File.basename(args[0], '.*') + '.gif')
+      File.join(File.dirname(args[0]), File.basename(args[0], '.*') + '.gif')
     end
   end
 
-  def self.build_ffmpeg_gif_command(args, options, logger)
-    command = []
-    command << 'ffmpeg'
-    command << '-y'  # always overwrite
+  def self.build_ffmpeg_cropdetect_command(args, 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' << args[0]
-    command << '-filter_complex' << build_filter_complex(options)
-    command << '-f' << 'gif'
-
-    # if we're not optimizing, we won't send to stdout
-    command << (options[:optimize] ? '-' : build_output_filename(args))
-
-    logger.info(command.join(' ')) if options[:verbose] unless options[:quiet]
-
-    command
-  end
-
-  def self.build_convert_optimize_command(args, options, logger)
-    command = []
-    command << 'convert' << '-' << '-layers' << 'Optimize' << build_output_filename(args)
+    command << '-filter_complex' << "cropdetect=limit=#{options[:cropdetect]}"
+    command << '-f' << 'null'
+    command << '-'
 
     logger.info(command.join(' ')) if options[:verbose] unless options[:quiet]
 
     command
   end
 
-  def self.build_ffmpeg_cropdetect_command(args, options, logger)
-    command = []
-    command << 'ffmpeg'
+  def self.build_ffmpeg_gif_command(args, options, logger)
+    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' << args[0]
-    command << '-filter_complex' << "cropdetect=limit=#{options[:cropdetect]}"
-    command << '-f' << 'null'
-    command << '-'
+    command << '-filter_complex' << build_filter_complex(options)
+    command << '-gifflags' << '+transdiff'  # enabled by default
+    command << '-f' << 'gif'
+    command << build_output_filename(args)
 
     logger.info(command.join(' ')) if options[:verbose] unless options[:quiet]
 
@@ -405,7 +380,7 @@ module Video2gif
     options = parse_args(ARGV, logger)
 
     if options[:cropdetect]
-      Open3.popen3(*build_ffmpeg_cropdetect_command(ARGV, options, logger)) do |stdin, stdout, stderr, wait_thr|
+      Open3.popen3(*build_ffmpeg_cropdetect_command(ARGV, options, logger)) do |stdin, stdout, stderr, thread|
         stdin.close
         stdout.close
         stderr.each(chomp: true) do |line|
@@ -414,26 +389,19 @@ module Video2gif
         end
         stderr.close
 
-        raise "Process #{wait_thr.pid} failed! Try again with --verbose to see error." unless wait_thr.value.success?
+        raise "Process #{thread.pid} failed! Try again with --verbose to see error." unless thread.value.success?
       end
     end
 
-    gif_pipeline_items = [build_ffmpeg_gif_command(ARGV, options, logger)]
-    gif_pipeline_items << build_convert_optimize_command(ARGV, options, logger) if options[:optimize]
-
-    read_io, write_io = IO.pipe
-    Open3.pipeline_start(*gif_pipeline_items, out: write_io, err: write_io) do |threads|
-      write_io.close
-      if options[:verbose]
-        read_io.each(chomp: true) { |line| logger.info(line) unless options[:quiet] }
-      else
-        read_io.read(1024) until read_io.eof?
+    Open3.popen3(*build_ffmpeg_gif_command(ARGV, 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]
       end
-      read_io.close
+      stderr.close
 
-      threads.each do |t|
-        raise "Process #{t.pid} failed! Try again with --verbose to see error." unless t.value.success?
-      end
+      raise "Process #{thread.pid} failed! Try again with --verbose to see error." unless thread.value.success?
     end
   end
 end

data/lib/video2gif/version.rb

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

data/video2gif.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   # the 'allowed_push_host' to allow pushing to a single host or delete
   # this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
     spec.metadata['homepage_uri'] = spec.homepage
     spec.metadata['source_code_uri'] = "https://github.com/emilyst/video2gif"
     # spec.metadata['changelog_uri'] = "https://github.com/emilyst/video2gif"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video2gif
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Emily St.
@@ -93,7 +93,7 @@ homepage: https://github.com/emilyst/video2gif
 licenses:
 - CC0
 metadata:
-  allowed_push_host: https://rubygems.org/
+  allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/emilyst/video2gif
   source_code_uri: https://github.com/emilyst/video2gif
 post_install_message: