fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-01 17:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix videos with unsupported colorspace not being transcoded (#13242)

Browse source
This commit is contained in:
ThibG 2020-03-10 11:58:40 +01:00 committed by GitHub
parent abd8394880
commit 2c6099125d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/media_attachment.rb
View file

@ -78,8 +78,9 @@ class MediaAttachment < ApplicationRecord
}.freeze }.freeze
VIDEO_PASSTHROUGH_OPTIONS = { VIDEO_PASSTHROUGH_OPTIONS = {
video_codec_whitelist: ['h264'], video_codecs: ['h264'],
audio_codec_whitelist: ['aac', nil], audio_codecs: ['aac', nil],
colorspaces: ['yuv420p'],
options: { options: {
format: 'mp4', format: 'mp4',
convert_options: { convert_options: {

14
lib/paperclip/video_transcoder.rb
View file

@ -6,19 +6,21 @@ module Paperclip
class VideoTranscoder < Paperclip::Processor class VideoTranscoder < Paperclip::Processor
def make def make
movie = FFMPEG::Movie.new(@file.path) movie = FFMPEG::Movie.new(@file.path)
actual_options = options
passthrough_options = actual_options[:passthrough_options]
actual_options = passthrough_options[:options] if passthrough?(movie, passthrough_options)
attachment.instance.type = MediaAttachment.types[:gifv] unless movie.audio_codec attachment.instance.type = MediaAttachment.types[:gifv] unless movie.audio_codec
Paperclip::Transcoder.make(file, actual_options, attachment) Paperclip::Transcoder.make(file, actual_options(movie), attachment)
end end
private private
def passthrough?(movie, options) def actual_options(movie)
options && options[:video_codec_whitelist].include?(movie.video_codec) && options[:audio_codec_whitelist].include?(movie.audio_codec) opts = options[:passthrough_options]
if opts && opts[:video_codecs].include?(movie.video_codec) && opts[:audio_codecs].include?(movie.audio_codec) && opts[:colorspaces].include?(movie.colorspace)
opts[:options]
else
options
end
end end
end end
end end