Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix movie width and frame_rate returning nil (#14357)

Browse source 
* Fix movie width and frame_rate returning nil

* Add StreamValidationError and raise

* Fix code style
This commit is contained in:
Takeshi Umeda 2020-07-20 05:28:27 +09:00 • committed by GitHub
parent 47931db1f5
commit 7540e235a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/media_attachment.rb
View file

@ -336,6 +336,7 @@ class MediaAttachment < ApplicationRecord
return unless movie.valid?
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
end