Fix media processing getting stuck on too much stdin/stderr (#16136)
* Fix media processing getting stuck on too much stdin/stderr See thoughtbot/terrapin#5 * Remove dependency on paperclip-av-transcoder gem * Remove dependency on streamio-ffmpeg gem * Disable stdin on ffmpeg processmaster
Eugen Rochko
4 years ago
committed by
GitHub
parent
dfa002932d
commit
036556d350
@ -0,0 +1,54 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class VideoMetadataExtractor |
||||
attr_reader :duration, :bitrate, :video_codec, :audio_codec, |
||||
:colorspace, :width, :height, :frame_rate |
||||
|
||||
def initialize(path) |
||||
@path = path |
||||
@metadata = Oj.load(ffmpeg_command_output, mode: :strict, symbol_keys: true) |
||||
|
||||
parse_metadata |
||||
rescue Terrapin::ExitStatusError, Oj::ParseError |
||||
@invalid = true |
||||
rescue Terrapin::CommandNotFoundError |
||||
raise Paperclip::Errors::CommandNotFoundError, 'Could not run the `ffprobe` command. Please install ffmpeg.' |
||||
end |
||||
|
||||
def valid? |
||||
!@invalid |
||||
end |
||||
|
||||
private |
||||
|
||||
def ffmpeg_command_output |
||||
command = Terrapin::CommandLine.new('ffprobe', '-i :path -print_format :format -show_format -show_streams -show_error -loglevel :loglevel') |
||||
command.run(path: @path, format: 'json', loglevel: 'fatal') |
||||
end |
||||
|
||||
def parse_metadata |
||||
if @metadata.key?(:format) |
||||
@duration = @metadata[:format][:duration].to_f |
||||
@bitrate = @metadata[:format][:bit_rate].to_i |
||||
end |
||||
|
||||
if @metadata.key?(:streams) |
||||
video_streams = @metadata[:streams].select { |stream| stream[:codec_type] == 'video' } |
||||
audio_streams = @metadata[:streams].select { |stream| stream[:codec_type] == 'audio' } |
||||
|
||||
if (video_stream = video_streams.first) |
||||
@video_codec = video_stream[:codec_name] |
||||
@colorspace = video_stream[:pix_fmt] |
||||
@width = video_stream[:width] |
||||
@height = video_stream[:height] |
||||
@frame_rate = video_stream[:avg_frame_rate] == '0/0' ? nil : Rational(video_stream[:avg_frame_rate]) |
||||
end |
||||
|
||||
if (audio_stream = audio_streams.first) |
||||
@audio_codec = audio_stream[:codec_name] |
||||
end |
||||
end |
||||
|
||||
@invalid = true if @metadata.key?(:error) |
||||
end |
||||
end |
||||
@ -0,0 +1,102 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
module Paperclip |
||||
# This transcoder is only to be used for the MediaAttachment model |
||||
# to check when uploaded videos are actually gifv's |
||||
class Transcoder < Paperclip::Processor |
||||
def initialize(file, options = {}, attachment = nil) |
||||
super |
||||
|
||||
@current_format = File.extname(@file.path) |
||||
@basename = File.basename(@file.path, @current_format) |
||||
@format = options[:format] |
||||
@time = options[:time] || 3 |
||||
@passthrough_options = options[:passthrough_options] |
||||
@convert_options = options[:convert_options].dup |
||||
end |
||||
|
||||
def make |
||||
metadata = VideoMetadataExtractor.new(@file.path) |
||||
|
||||
unless metadata.valid? |
||||
log("Unsupported file #{@file.path}") |
||||
return File.open(@file.path) |
||||
end |
||||
|
||||
update_attachment_type(metadata) |
||||
update_options_from_metadata(metadata) |
||||
|
||||
destination = Tempfile.new([@basename, @format ? ".#{@format}" : '']) |
||||
destination.binmode |
||||
|
||||
@output_options = @convert_options[:output]&.dup || {} |
||||
@input_options = @convert_options[:input]&.dup || {} |
||||
|
||||
case @format.to_s |
||||
when /jpg$/, /jpeg$/, /png$/, /gif$/ |
||||
@input_options['ss'] = @time |
||||
|
||||
@output_options['f'] = 'image2' |
||||
@output_options['vframes'] = 1 |
||||
when 'mp4' |
||||
@output_options['acodec'] = 'aac' |
||||
@output_options['strict'] = 'experimental' |
||||
end |
||||
|
||||
command_arguments, interpolations = prepare_command(destination) |
||||
|
||||
begin |
||||
command = Terrapin::CommandLine.new('ffmpeg', command_arguments.join(' '), logger: Paperclip.logger) |
||||
command.run(interpolations) |
||||
rescue Terrapin::ExitStatusError => e |
||||
raise Paperclip::Error, "Error while transcoding #{@basename}: #{e}" |
||||
rescue Terrapin::CommandNotFoundError |
||||
raise Paperclip::Errors::CommandNotFoundError, 'Could not run the `ffmpeg` command. Please install ffmpeg.' |
||||
end |
||||
|
||||
destination |
||||
end |
||||
|
||||
private |
||||
|
||||
def prepare_command(destination) |
||||
command_arguments = ['-nostdin'] |
||||
interpolations = {} |
||||
interpolation_keys = 0 |
||||
|
||||
@input_options.each_pair do |key, value| |
||||
interpolation_key = interpolation_keys |
||||
command_arguments << "-#{key} :#{interpolation_key}" |
||||
interpolations[interpolation_key] = value |
||||
interpolation_keys += 1 |
||||
end |
||||
|
||||
command_arguments << '-i :source' |
||||
interpolations[:source] = @file.path |
||||
|
||||
@output_options.each_pair do |key, value| |
||||
interpolation_key = interpolation_keys |
||||
command_arguments << "-#{key} :#{interpolation_key}" |
||||
interpolations[interpolation_key] = value |
||||
interpolation_keys += 1 |
||||
end |
||||
|
||||
command_arguments << '-y :destination' |
||||
interpolations[:destination] = destination.path |
||||
|
||||
[command_arguments, interpolations] |
||||
end |
||||
|
||||
def update_options_from_metadata(metadata) |
||||
return unless @passthrough_options && @passthrough_options[:video_codecs].include?(metadata.video_codec) && @passthrough_options[:audio_codecs].include?(metadata.audio_codec) && @passthrough_options[:colorspaces].include?(metadata.colorspace) |
||||
|
||||
@format = @passthrough_options[:options][:format] || @format |
||||
@time = @passthrough_options[:options][:time] || @time |
||||
@convert_options = @passthrough_options[:options][:convert_options].dup |
||||
end |
||||
|
||||
def update_attachment_type(metadata) |
||||
@attachment.instance.type = MediaAttachment.types[:gifv] unless metadata.audio_codec |
||||
end |
||||
end |
||||
end |
||||
@ -1,14 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
module Paperclip |
||||
module TranscoderExtensions |
||||
# Prevent the transcoder from modifying our meta hash |
||||
def initialize(file, options = {}, attachment = nil) |
||||
meta_value = attachment&.instance_read(:meta) |
||||
super |
||||
attachment&.instance_write(:meta, meta_value) |
||||
end |
||||
end |
||||
end |
||||
|
||||
Paperclip::Transcoder.prepend(Paperclip::TranscoderExtensions) |
||||
@ -1,26 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
module Paperclip |
||||
# This transcoder is only to be used for the MediaAttachment model |
||||
# to check when uploaded videos are actually gifv's |
||||
class VideoTranscoder < Paperclip::Processor |
||||
def make |
||||
movie = FFMPEG::Movie.new(@file.path) |
||||
|
||||
attachment.instance.type = MediaAttachment.types[:gifv] unless movie.audio_codec |
||||
|
||||
Paperclip::Transcoder.make(file, actual_options(movie), attachment) |
||||
end |
||||
|
||||
private |
||||
|
||||
def actual_options(movie) |
||||
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 |
||||
@ -0,0 +1,63 @@ |
||||
# frozen_string_literal: false |
||||
# Fix adapted from https://github.com/thoughtbot/terrapin/pull/5 |
||||
|
||||
module Terrapin |
||||
module MultiPipeExtensions |
||||
def read |
||||
read_streams(@stdout_in, @stderr_in) |
||||
end |
||||
|
||||
def close_read |
||||
begin |
||||
@stdout_in.close |
||||
rescue IOError |
||||
# Do nothing |
||||
end |
||||
|
||||
begin |
||||
@stderr_in.close |
||||
rescue IOError |
||||
# Do nothing |
||||
end |
||||
end |
||||
|
||||
def read_streams(output, error) |
||||
@stdout_output = '' |
||||
@stderr_output = '' |
||||
|
||||
read_fds = [output, error] |
||||
|
||||
until read_fds.empty? |
||||
to_read, = IO.select(read_fds) |
||||
|
||||
if to_read.include?(output) |
||||
@stdout_output << read_stream(output) |
||||
read_fds.delete(output) if output.closed? |
||||
end |
||||
|
||||
if to_read.include?(error) |
||||
@stderr_output << read_stream(error) |
||||
read_fds.delete(error) if error.closed? |
||||
end |
||||
end |
||||
end |
||||
|
||||
def read_stream(io) |
||||
result = '' |
||||
|
||||
begin |
||||
while (partial_result = io.read_nonblock(8192)) |
||||
result << partial_result |
||||
end |
||||
rescue EOFError, Errno::EPIPE |
||||
io.close |
||||
rescue Errno::EINTR, Errno::EWOULDBLOCK, Errno::EAGAIN |
||||
# Do nothing |
||||
end |
||||
|
||||
result |
||||
end |
||||
end |
||||
end |
||||
|
||||
Terrapin::CommandLine::MultiPipe.prepend(Terrapin::MultiPipeExtensions) |
||||
Loading…
Reference in new issue