video2gif 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62e8037d3f2d5c9f1fd4ef4be2455b6d831407cb4485bf4169bb0d44aaafa21e
-  data.tar.gz: 49dd66cac75ba0ddf7c98b363b39770237034695098c516ac5e62a853fb16a3e
+  metadata.gz: 4e3d8fc9f7c1f1753c1aeb09c6760650055182e1b5d2f68d29d1453b14c6a63d
+  data.tar.gz: 9525b0c28289532b777d89b6443fa9873d2ab8c94d3bd01ebcc37c27628a3b33
 SHA512:
-  metadata.gz: 39ab1ea8910042d75f3608ea6d112a0941e98dcc42c09683ec91e93e91935bf99b8fcad2f8b586ff46c98097ffca1323babfa42d81f32f2d817e30ffa1aea511
-  data.tar.gz: 3da078214b6d9799d1fa0cebee2d1da6b24b16656e822b359683a79a44d7d639c34c6821bdd05487e562b02b3cab6bd851b762f6898009b63bb6d560c1a6e7da
+  metadata.gz: bc904a92ac20deb0bbc643c2cf9fe6919fbbbb9977e78dc08fc12e824acc61e25938ba6160527fd70ecff232d556b2b617f63a84ca61269fea5d3b3404cc000f
+  data.tar.gz: 510759bd40cdec24eb975b68ea48e942806fc54de7c52b3ab11e67f69e6294b506ff8f5270e1b667b79d6992457b9761802615c00f40b0b68aebe86a8a5b313d

data/Gemfile.lock

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

data/lib/video2gif/ffmpeg.rb

@@ -5,51 +5,43 @@ module Video2gif
   module FFmpeg
     CROP_REGEX = /crop=([0-9]+\:[0-9]+\:[0-9]+\:[0-9]+)/
 
+    # TODO: This whole method needs to be broken up significantly.
     def self.filtergraph(options)
       filtergraph = []
 
-      if options[:subtitles] && options[:probe_infos][:streams].any? do |s|
-        s[:codec_type] == 'subtitle'
-      end
+      # If we want subtitles and *have* subtitles, we need some info to
+      # use them.
+      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]]
+      end
 
-        if Subtitles::KNOWN_TEXT_FORMATS.include?(subtitle_info[:codec_name])
-          filtergraph << "setpts=PTS+#{Utils.duration_to_seconds(options[:seek])}/TB"
-          filtergraph << "subtitles='#{options[:input_filename]}':si=#{options[:subtitle_index]}"
-          filtergraph << 'setpts=PTS-STARTPTS'
-        elsif Subtitles::KNOWN_BITMAP_FORMATS.include?(subtitle_info[:codec_name])
-          filtergraph << "[0:s:#{options[:subtitle_index]}]scale=" + %W[
-            flags=lanczos
-            sws_dither=none
-            width=#{video_info[:width]}
-            height=#{video_info[:height]}
-          ].join(':') + '[subs]'
-          filtergraph << '[0:v][subs]overlay=format=auto'
-        end
+      # Bitmap formatted subtitles go first so that they get scaled
+      # correctly.
+      if options[:subtitles] &&
+          options[:probe_infos][:streams].any? { |s| s[:codec_type] == 'subtitle' } &&
+          Subtitles::KNOWN_BITMAP_FORMATS.include?(subtitle_info[:codec_name])
+        filtergraph << "[0:s:#{options[:subtitle_index]}]scale=" + %W[
+          flags=lanczos
+          sws_dither=none
+          width=#{video_info[:width]}
+          height=#{video_info[:height]}
+        ].join(':') + '[subs]'
+        filtergraph << '[0:v][subs]overlay=format=auto'
       end
 
       # 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]
-        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 }",
-          "y=#{ options[:yoffset] || 0 }",
-        ].join(':')
-      end
+      # Apply automatic cropping discovered during the cropdetect run.
+      filtergraph << options[:autocrop] if options[:autocrop]
+
+      # Apply manual cropping, if any.
+      filtergraph << "crop=w=#{options[:wregion]}" if options[:wregion]
+      filtergraph << "crop=h=#{options[:hregion]}" if options[:hregion]
+      filtergraph << "crop=x=#{options[:xoffset]}" if options[:xoffset]
+      filtergraph << "crop=y=#{options[:yoffset]}" if options[:yoffset]
 
       # Scale here before other filters to avoid unnecessary processing.
       if options[:tonemap]
@@ -90,6 +82,16 @@ module Video2gif
       filtergraph << "eq=gamma_g=#{options[:gamma_g]}"       if options[:gamma_g]
       filtergraph << "eq=gamma_b=#{options[:gamma_b]}"       if options[:gamma_b]
 
+      # Embed text subtitles later so that they don't get processed by
+      # cropping, etc., which might accidentally crop them out.
+      if options[:subtitles] &&
+          options[:probe_infos][:streams].any? { |s| s[:codec_type] == 'subtitle' } &&
+          Subtitles::KNOWN_TEXT_FORMATS.include?(subtitle_info[:codec_name])
+        filtergraph << "setpts=PTS+#{Utils.duration_to_seconds(options[:seek])}/TB"
+        filtergraph << "subtitles='#{options[:input_filename]}':si=#{options[:subtitle_index]}"
+        filtergraph << 'setpts=PTS-STARTPTS'
+      end
+
       # If there is text to superimpose, do it here before palette
       # generation to ensure the color looks appropriate.
       if options[:text]

data/lib/video2gif/options.rb

@@ -68,22 +68,26 @@ module Video2gif
           end
         end
 
-        parser.on('--crop-size-w SIZE',
+        parser.on('--crop-width SIZE',
+                  '--crop-size-w SIZE',
                   'Pixel size of width to select from source video, before scaling') do |s|
           options[:wregion] = s
         end
 
-        parser.on('--crop-size-h SIZE',
+        parser.on('--crop-height SIZE',
+                  '--crop-size-h SIZE',
                   'Pixel size of height to select from source video, before scaling') do |s|
           options[:hregion] = s
         end
 
-        parser.on('--crop-offset-x OFFSET',
+        parser.on('--crop-x OFFSET',
+                  '--crop-offset-x OFFSET',
                   'Pixel offset from left to select from source video, before scaling') do |o|
           options[:xoffset] = o
         end
 
-        parser.on('--crop-offset-y OFFSET',
+        parser.on('--crop-y OFFSET',
+                  '--crop-offset-y OFFSET',
                   'Pixel offset from top to select from source video, before scaling') do |o|
           options[:yoffset] = o
         end
@@ -257,7 +261,7 @@ module Video2gif
         exit
       end
 
-      options[:input_filename] = args[0]
+      options[:input_filename]  = args[0]
       options[:output_filename] = if args[1]
                                     args[1].end_with?('.gif') ? args[1] : args[1] + '.gif'
                                   else

data/lib/video2gif/version.rb

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

metadata

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