Plain AAC audio uploads live again. -DT
parent
f119ef489c
commit
cf557f1849
|
@ -55,18 +55,35 @@ class MediaAttachment < ApplicationRecord
|
||||||
|
|
||||||
AUDIO_STYLES = {
|
AUDIO_STYLES = {
|
||||||
original: {
|
original: {
|
||||||
format: 'mp4',
|
format: 'm4a',
|
||||||
convert_options: {
|
convert_options: {
|
||||||
output: {
|
output: {
|
||||||
filter_complex: '"[0:a]compand,showwaves=s=640x360:mode=line,format=yuv420p[v]"',
|
vn: '',
|
||||||
map: '"[v]" -map 0:a',
|
|
||||||
threads: 2,
|
|
||||||
vcodec: 'libx264',
|
|
||||||
acodec: 'aac',
|
acodec: 'aac',
|
||||||
movflags: '+faststart',
|
movflags: '+faststart',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
small: {
|
||||||
|
format: 'png',
|
||||||
|
time: 0,
|
||||||
|
convert_options: {
|
||||||
|
output: {
|
||||||
|
filter_complex: '"showwavespic=s=400x100:colors=lime|green"',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
thumb: {
|
||||||
|
format: 'png',
|
||||||
|
time: 0,
|
||||||
|
convert_options: {
|
||||||
|
output: {
|
||||||
|
filter_complex: '"showwavespic=s=400x100:colors=lime|green"',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
VIDEO_STYLES = {
|
VIDEO_STYLES = {
|
||||||
|
|
|
@ -7,16 +7,12 @@ module Paperclip
|
||||||
|
|
||||||
meta = ::Av.cli.identify(@file.path)
|
meta = ::Av.cli.identify(@file.path)
|
||||||
# {:length=>"0:00:02.14", :duration=>2.14, :audio_encode=>"mp3", :audio_bitrate=>"44100 Hz", :audio_channels=>"mono"}
|
# {:length=>"0:00:02.14", :duration=>2.14, :audio_encode=>"mp3", :audio_bitrate=>"44100 Hz", :audio_channels=>"mono"}
|
||||||
if meta[:duration] > max_aud_len
|
|
||||||
raise Mastodon::ValidationError, "Audio uploads must be less than #{max_aud_len} seconds in length."
|
|
||||||
end
|
|
||||||
|
|
||||||
final_file = Paperclip::Transcoder.make(file, options, attachment)
|
attachment.instance.file_file_name = 'media.m4a'
|
||||||
|
attachment.instance.file_content_type = 'audio/mp4'
|
||||||
attachment.instance.file_file_name = 'media.mp4'
|
|
||||||
attachment.instance.file_content_type = 'video/mp4'
|
|
||||||
attachment.instance.type = MediaAttachment.types[:video]
|
attachment.instance.type = MediaAttachment.types[:video]
|
||||||
|
|
||||||
|
final_file = Paperclip::Transcoder.make(file, options, attachment)
|
||||||
final_file
|
final_file
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue