about summary refs log tree commit diff
path: root/lib/paperclip/video_transcoder.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-10-03 01:09:12 +0200
committerGitHub <noreply@github.com>2019-10-03 01:09:12 +0200
commitca22a22d7f4db867ad0045a7978e3d8dcd251a69 (patch)
tree22c20a985b89af6f3cdcd6717ddbb11c748804c2 /lib/paperclip/video_transcoder.rb
parent0ce0baa9b5799be61fed7fc509837ca0ba971402 (diff)
Fix performance of GIF re-encoding (#12057)
* Change animated GIF detection to not shell out to ImageMagick

Signed-off-by: Eugen Rochko <eugen@zeonfederated.com>

* Change video encoding parameters to limit to 10800 video frames

Signed-off-by: Eugen Rochko <eugen@zeonfederated.com>

* Limit GIF image size further

Signed-off-by: Eugen Rochko <eugen@zeonfederated.com>

* Always strip metadata from video files

* Fix code style issues
Diffstat (limited to 'lib/paperclip/video_transcoder.rb')
-rw-r--r--lib/paperclip/video_transcoder.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/paperclip/video_transcoder.rb b/lib/paperclip/video_transcoder.rb
index c3504c17c..66f7feda5 100644
--- a/lib/paperclip/video_transcoder.rb
+++ b/lib/paperclip/video_transcoder.rb
@@ -6,7 +6,9 @@ module Paperclip
   class VideoTranscoder < Paperclip::Processor
     def make
       meta = ::Av.cli.identify(@file.path)
+
       attachment.instance.type = MediaAttachment.types[:gifv] unless meta[:audio_encode]
+      options[:format] = File.extname(attachment.instance.file_file_name)[1..-1] if options[:keep_same_format]
 
       Paperclip::Transcoder.make(file, options, attachment)
     end