diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-10-03 01:09:12 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 03:59:44 -0600 |
| commit | 5b6fc19e76b1b9af5c8ed1ebfa664606d2170e82 (patch) | |
| tree | b6ae2469304fbdec0ce5a75796b1fb0863fba155 /app/models/concerns | |
| parent | 941c1d41ffebfcd96d6709219c50b1482f930e9b (diff) | |
port tootsuite#12057 to monsterfork: Fix performance of GIF re-encoding
* 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 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/attachmentable.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index c3c7c7a35..9b3ca9e3c 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -6,6 +6,7 @@ module Attachmentable extend ActiveSupport::Concern MAX_MATRIX_LIMIT = 16_777_216 # 4096x4096px or approx. 16MB + GIF_MATRIX_LIMIT = 921_600 # 1280x720px included do before_post_process :obfuscate_file_name @@ -43,6 +44,7 @@ module Attachmentable next if attachment.blank? || !/image.*/.match?(attachment.content_type) || attachment.queued_for_write[:original].blank? width, height = FastImage.size(attachment.queued_for_write[:original].path) + matrix_limit = attachment.content_type == 'image/gif' ? GIF_MATRIX_LIMIT : MAX_MATRIX_LIMIT raise Mastodon::DimensionsValidationError, "#{width}x#{height} images are not supported" if width.present? && height.present? && (width * height >= MAX_MATRIX_LIMIT) end |