cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow mp4 uploads, convert to WebM

This commit is contained in:
Eugen Rochko 2016-10-12 14:29:10 +02:00
parent 5e511acb82
commit cdc49c6b4b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/models/media_attachment.rb
View File

@ -1,6 +1,6 @@
class MediaAttachment < ApplicationRecord class MediaAttachment < ApplicationRecord
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
VIDEO_MIME_TYPES = ['video/webm'].freeze VIDEO_MIME_TYPES = ['video/webm', 'video/mp4'].freeze
belongs_to :account, inverse_of: :media_attachments belongs_to :account, inverse_of: :media_attachments
belongs_to :status, inverse_of: :media_attachments belongs_to :status, inverse_of: :media_attachments
@ -43,14 +43,19 @@ private
} }
else else
{ {
small: { original: {
convert_options: { convert_options: {},
output: { format: 'webm'
vf: 'scale="min(510\, iw):min(680\, ih)":force_original_aspect_ratio=decrease'
}
}, },
format: 'png',
time: 1 small: {
convert_options: {
output: {
vf: 'scale="min(510\, iw):min(680\, ih)":force_original_aspect_ratio=decrease'
}
},
format: 'png',
time: 1
} }
} }
end end