video2gif 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2905fc3a1a3ebebfa2f2e9cfe464ddff85f3e287d163b4eb5195a6b9766e3bb
-  data.tar.gz: 4fd1a4c2233f36261253684a57ed285b06dfde299c66c953d30467fe905591f7
+  metadata.gz: e4bff1ae338db86be23755a9bdf6bb4e5a877b942f3a48c32af28317e35c8508
+  data.tar.gz: d3aa41909f20f0ef78ca35fafa2efc4dc09932aa63372401a44efb65c3d315d2
 SHA512:
-  metadata.gz: 3f086509e0375b35179c4e583601c5808c5958ee2f16a7093831ef305b0c5e35dc7c179f222cc9814057e5f62cca2edff974c2cdca07c1780625fb27cda4ecc1
-  data.tar.gz: de455ff906c6a4a8c0254edb74dc646e55facb932c0f07fe866732e057ac867e407f032733258a14f981bf62086c98062e41bee5f5f7d6e2a02208e38cc987c6
+  metadata.gz: d2608410cbbf81ab35a88825a66b5b9f11bfa9cbe00f42fdafa9c6a5f112ce8070595dabe4cba2cec879a7133a13defbcd633d3706b0f004f8b614c0eec28582
+  data.tar.gz: 2fe3759d6bc111f056b0f15f0c77c516d508186cedb5ca41a68281346b9428a0d0efa6ec8b1a101088d90f26990f0a41d308f51c47f4b6ee12d5e88a3753270a

data/Gemfile.lock

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

data/README.md

@@ -33,15 +33,13 @@ Installation
 
 `video2gif` is a command-line tool requiring both Ruby and a recent
 version of [FFmpeg] installed and available in the system `$PATH`. If
-you can run [FFmpeg] from the command line, you likely have the ability
-to run `video2gif`.
+you can run `ffmpeg` and `ffprobe` from the command line, you likely
+have the ability to run `video2gif`.
 
 Note that some features may not work by default. For example,
 tonemapping (used for HDR videos) requires `libzimg` support, not
 included by default in the [FFmpeg] supplied by [Homebrew]. If you
-attempt to use it, you will get an error. Additionally, `ffprobe`
-(usually supplied by [FFmpeg]) is required for subtitles and may become
-required in the future for all functionality.
+attempt to use it, you will get an error.
 
 `video2gif` also requires Ruby and the ability to install a new gem. If
 you have this available, run the following command to install it.

data/lib/video2gif/cli.rb

@@ -9,33 +9,39 @@ require 'video2gif'
 module Video2gif
   module CLI
     def self.start
+      unless Utils.is_executable?('ffmpeg')
+        puts 'ERROR: Requires FFmpeg to be installed!'
+        exit 1
+      end
+
+      unless Utils.is_executable?('ffprobe')
+        puts 'ERROR: Requires FFmpeg utils to be installed (for ffprobe)!'
+        exit 1
+      end
+
       logger = Logger.new(STDOUT)
       options = Options.parse(ARGV)
 
-      if options[:subtitles]
-        lines = []
+      lines = []
 
-        Open3.popen2e(*FFmpeg.ffprobe_command(options, logger)) do |stdin, stdout_stderr, thread|
-          stdin.close
-          stdout_stderr.each do |line|
-            logger.info(line.chomp) if options[:verbose] unless options[:quiet]
-            lines << line
-          end
-          stdout_stderr.close
+      Open3.popen2e(*FFmpeg.ffprobe_command(options, logger)) do |stdin, stdout_stderr, thread|
+        stdin.close
+        stdout_stderr.each do |line|
+          logger.info(line.chomp) if options[:verbose] unless options[:quiet]
+          lines << line
+        end
+        stdout_stderr.close
 
-          unless thread.value.success?
-            # TODO: more info, output lines with errors?
-            raise "Process #{thread.pid} failed! Try again with --verbose to see error."
-          end
+        unless thread.value.success?
+          # TODO: more info, output lines with errors?
+          raise "Process #{thread.pid} failed! Try again with --verbose to see error."
         end
+      end
 
-        options[:probe_infos] = JSON.parse(lines.join, symbolize_names: true)
+      options[:probe_infos] = JSON.parse(lines.join, symbolize_names: true)
 
-      if options[:subtitles] && !options[:probe_infos][:streams].any? do |s|
-        s[:codec_type] == 'subtitle'
-      end
-          logger.warn('Could not find subtitles in the file, they will be omitted') unless options[:quiet]
-        end
+      if options[:subtitles] && !options[:probe_infos][:streams].any? { |s| s[:codec_type] == 'subtitle' }
+        logger.warn('Could not find subtitles in the file, they will be omitted') unless options[:quiet]
       end
 
       if options[:autocrop]

data/lib/video2gif/ffmpeg.rb

@@ -11,9 +11,11 @@ module Video2gif
 
       # If we want subtitles and *have* subtitles, we need some info to
       # use them.
+      video_info = options[:probe_infos][:streams].find { |s| s[:codec_type] == 'video' }
       if options[:subtitles] && options[:probe_infos][:streams].any? { |s| s[:codec_type] == 'subtitle' }
-        video_info = options[:probe_infos][:streams].find { |s| s[:codec_type] == 'video' }
-        subtitle_info = options[:probe_infos][:streams].find_all { |s| s[:codec_type] == 'subtitle' }[options[:subtitle_index]]
+        subtitle_info = options[:probe_infos][:streams]
+          .find_all { |s| s[:codec_type] == 'subtitle' }
+          .fetch(options[:subtitle_index], nil)
       end
 
       # Bitmap formatted subtitles go first so that they get scaled
@@ -30,7 +32,24 @@ module Video2gif
         filtergraph << '[0:v][subs]overlay=format=auto'
       end
 
-      # Set 'fps' filter first, drop unneeded frames instead of
+      # Slow down or speed up video as early as possible so that we
+      # don't end up trying to interpolate frames in that we already
+      # dropped.
+      if options[:rate]
+        filtergraph << "setpts=PTS/#{options[:rate]}" if options[:rate]
+        if Float(options[:rate]) < 1  # interpolate slowed down video
+          minterpolate = []
+          minterpolate << 'mi_mode=mci'
+          minterpolate << 'mc_mode=aobmc'
+          minterpolate << 'me_mode=bidir'
+          minterpolate << 'me=epzs'
+          minterpolate << 'vsbmc=1'
+          minterpolate << "fps=#{video_info[:avg_frame_rate] }/#{options[:rate]}"
+          filtergraph << 'minterpolate=' + minterpolate.join(':')
+        end
+      end
+
+      # Set 'fps' filter early, drop unneeded frames instead of
       # processing those.
       filtergraph << "fps=#{ options[:fps] || 10 }"
 
@@ -161,6 +180,9 @@ module Video2gif
       command << '-ss' << options[:seek] if options[:seek]
       command << '-t' << options[:time] if options[:time]
       command << '-i' << options[:input_filename]
+      command << '-an'
+      command << '-sn'
+      command << '-dn'
     end
 
     def self.cropdetect_command(options, logger, executable: 'ffmpeg')

data/lib/video2gif/options.rb

@@ -165,11 +165,6 @@ module Video2gif
                   'resulting GIF. May be extremely slow for text subtitles.',
                   'Takes an optional integer value to choose the subtitle',
                   'stream (defaults to the first subtitle stream, index 0)') do |s|
-          unless Utils.is_executable?('ffprobe')
-            puts 'ERROR: Requires FFmpeg utils to be installed (for ffprobe)!'
-            exit 1
-          end
-
           options[:subtitles] = s || true
           options[:subtitle_index] =  if options[:subtitles].is_a?(TrueClass)  # default to first stream
                                         0
@@ -181,6 +176,15 @@ module Video2gif
                                       end
         end
 
+        parser.on('-r MULTIPLIER',
+                  '--rate MULTIPLIER',
+                  '--speed MULTIPLIER',
+                  '(Experimental, SLOW) Multiplier for the speed of the',
+                  'GIF, where less than 1 indicates a lower speed and',
+                  'greater than 1 indicates a faster speed (default 1)') do |r|
+          options[:rate] = r
+        end
+
         parser.separator ''
         parser.separator 'Text overlay options (only used if text is defined):'
 
@@ -253,11 +257,6 @@ module Video2gif
 
       parser.parse!
 
-      unless Utils.is_executable?('ffmpeg')
-        puts 'ERROR: Requires FFmpeg to be installed!'
-        exit 1
-      end
-
       if args.size < 1 || args.size > 2
         puts 'ERROR: Specify one video to convert at a time!'
         puts ''

data/lib/video2gif/version.rb

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

metadata

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