Fix movie width and frame_rate returning nil #14357
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gargron
reviewed
Jul 19, 2020
app/models/media_attachment.rb
Outdated
| @@ -336,8 +336,8 @@ def check_video_dimensions | |||
|
|
|||
| return unless movie.valid? | |||
|
|
|||
| 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.width}x#{movie.height} videos are not supported" if movie.width.nil? || movie.width * movie.height > MAX_VIDEO_MATRIX_LIMIT | |||
There was a problem hiding this comment.
Hm, this will raise error "x videos are not supported". I am not sure if it is necessary to raise these errors if there is no video stream. Perhaps raise another error like "Video has no video stream" before if movie.width.nil? || movie.frame_rate.nil??
There was a problem hiding this comment.
That sounds better. Change.
|
Raise StreamValidationError instead of DimensionsValidationError. |
ClearlyClaire
approved these changes
Jul 19, 2020
shouo1987
pushed a commit
to CrossGate-Pawoo/mastodon
that referenced
this pull request
Dec 7, 2022
* Fix movie width and frame_rate returning nil * Add StreamValidationError and raise * Fix code style
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add a nil check, as it can be nil