Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix converted media being saved with original extension and mime type (#11130)

Browse source
This commit is contained in:
Eugen Rochko 2019-06-20 10:52:36 +02:00 • committed by GitHub
parent 7696f77245
commit 8f23726918
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/media_attachment.rb
View file

@ -70,12 +70,14 @@ class MediaAttachment < ApplicationRecord
AUDIO_STYLES = {
original: {
format: 'ogg',
content_type: 'audio/ogg',
convert_options: {},
},
}.freeze
VIDEO_FORMAT = {
format: 'mp4',
content_type: 'video/mp4',
convert_options: {
output: {
'loglevel' => 'fatal',
@ -189,11 +191,11 @@ class MediaAttachment < ApplicationRecord
if f.file_content_type == 'image/gif'
[:gif_transcoder, :blurhash_transcoder]
elsif VIDEO_MIME_TYPES.include?(f.file_content_type)
[:video_transcoder, :blurhash_transcoder]
[:video_transcoder, :blurhash_transcoder, :type_corrector]
elsif AUDIO_MIME_TYPES.include?(f.file_content_type)
[:transcoder]
[:transcoder, :type_corrector]
else
[:lazy_thumbnail, :blurhash_transcoder]
[:lazy_thumbnail, :blurhash_transcoder, :type_corrector]
end
end
end