]> cat aescling's git repositories - mastodon.git/commitdiff
Fix videos with near-60 fps being rejected (#14684)
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 29 Aug 2020 23:54:30 +0000 (01:54 +0200)
committerGitHub <noreply@github.com>
Sat, 29 Aug 2020 23:54:30 +0000 (01:54 +0200)
Fix #14668

app/models/media_attachment.rb

index 3d93ec75ba899b8506893d9ae8e51320b971a766..663bb0896d4135c95d6e828da5e11fc5c53e918f 100644 (file)
@@ -338,7 +338,7 @@ class MediaAttachment < ApplicationRecord
 
     raise Mastodon::StreamValidationError, 'Video has no video stream' if movie.width.nil? || movie.frame_rate.nil?
     raise Mastodon::DimensionsValidationError, "#{movie.width}x#{movie.height} videos are not supported" if movie.width * movie.height > MAX_VIDEO_MATRIX_LIMIT
-    raise Mastodon::DimensionsValidationError, "#{movie.frame_rate.to_i}fps videos are not supported" if movie.frame_rate > MAX_VIDEO_FRAME_RATE
+    raise Mastodon::DimensionsValidationError, "#{movie.frame_rate.floor}fps videos are not supported" if movie.frame_rate.floor > MAX_VIDEO_FRAME_RATE
   end
 
   def set_meta