video2gif 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dea97a401b3e47b30ffc508fb4dfa7c3f93059b92e1e2fb63331c8487fd1315
-  data.tar.gz: 645a56bf651cff478b033ca2dd710f2b1102dbdfe1bfce4d5a4a5e49a5ec8662
+  metadata.gz: 201a683929c71a4f1f0857fc4b0316762742695d78986682dfef5ac547fcac8a
+  data.tar.gz: fbd96ac1341097ef254ce3ea85512d1f3c7b856d6bbadf20938ae315fd639a6f
 SHA512:
-  metadata.gz: 77a15fe135ba84c88447ed29fec18a32ca61a3bbc69d729b9a8725015a303c49990df42d13f913c24ca9452dedfc7f118197fb494a2778a259391419ac5ebd61
-  data.tar.gz: c784127c03e71ede62f83c393cad597447c0a97738da684cd5deb1aca2c4f48fde11f2c05c3dd61b148a17c9925768f13f3f9b10ea4c7cd9fe628535eed350d9
+  metadata.gz: 33d191ea91ae9ab24e9248b5e3701e05dd8b3f194da3d4b66bddce6518e622866f65e06271dcab6b6ac7051af40abd30cfd132022e7a3c394ec71e4eaa09f486
+  data.tar.gz: c05bfff2d92dd4ce23d6240469aa4d0db718a86f27f0810b47a91ce05c8ed0d1e16d57cb96bc34fb30ffa9cc21599e791d0c54f902d986b1026562ca6a75d4f9

data/Gemfile.lock

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

data/lib/video2gif/ffmpeg.rb

@@ -28,18 +28,17 @@ 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]
-        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.
+      # Scale here before other filters to avoid unnecessary processing.
       if options[:tonemap]
-        filtergraph << "zscale=dither=none:filter=lanczos:width=#{options[:width]}:height=-1" if options[:width]
+        # 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.
+        filtergraph << 'zscale=' + %W[
+           dither=none
+           filter=lanczos
+           width=#{options[:width]}
+           height=trunc(#{options[:width]}/dar)
+        ] if options[:width]
         filtergraph << 'zscale=transfer=linear:npl=100'
         filtergraph << 'zscale=npl=100'
         filtergraph << 'format=gbrpf32le'
@@ -47,6 +46,15 @@ module Video2gif
         filtergraph << "tonemap=tonemap=#{options[:tonemap]}:desat=0"
         filtergraph << 'zscale=transfer=bt709:matrix=bt709:range=tv'
         filtergraph << 'format=yuv420p'
+      else
+        # If we're not attempting to convert HDR to SDR, the standard
+        # 'scale' filter is preferred (if we're resizing at all).
+        filtergraph << 'scale=' + %W[
+          flags=lanczos
+          sws_dither=none
+          width=#{options[:width]}
+          height=trunc(#{options[:width]}/dar
+        ].join(':') if options[:width] && !options[:tonemap]
       end
 
       # Perform any desired equalization before we overlay text so that
@@ -71,14 +79,14 @@ 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")
 
-        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 }'",
-          "fontcolor='#{ options[:textcolor] || 'white' }'",
-          "borderw='#{ options[:textborder] || 3 }'",
-          "fontfile='#{ options[:textfont] || 'Arial'}'\\\\:style='#{options[:textvariant] || 'Bold' }'",
-          "text='#{text}'",
+        filtergraph << 'drawtext=' + %W[
+          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 }'
+          fontcolor='#{ options[:textcolor] || 'white' }'
+          borderw='#{ options[:textborder] || 3 }'
+          fontfile='#{ options[:textfont] || 'Arial'}'\\\\:style='#{options[:textvariant] || 'Bold' }'
+          text='#{text}'
         ].join(':')
       end
 
@@ -101,7 +109,8 @@ module Video2gif
 
     def self.ffmpeg_command(options, executable: 'ffmpeg')
       command = [executable]
-      command << '-y'  # always overwrite
+      command << '-y'
+      command << '-hide_banner'
       command << '-analyzeduration' << '2147483647' << '-probesize' << '2147483647'
       command << '-loglevel' << 'verbose'
       command << '-ss' << options[:seek] if options[:seek]

data/lib/video2gif/version.rb

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

metadata

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