mirrors/mastodon
mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-05-19 18:38:10 +00:00
Code Issues Projects Releases Wiki Activity

Fixed crash when supplying FFMPEG_BINARY environment variable (#30022)

Browse source
This commit is contained in:
Tim Rogers 2024-04-22 04:00:24 -05:00 committed by GitHub
parent 75163d9daf
commit 1ca6ff8ca5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/video_metadata_extractor.rb
View file

@ -22,7 +22,7 @@ class VideoMetadataExtractor
private private
def ffmpeg_command_output def ffmpeg_command_output
command = Terrapin::CommandLine.new('ffprobe', '-i :path -print_format :format -show_format -show_streams -show_error -loglevel :loglevel') command = Terrapin::CommandLine.new(Rails.configuration.x.ffprobe_binary, '-i :path -print_format :format -show_format -show_streams -show_error -loglevel :loglevel')
command.run(path: @path, format: 'json', loglevel: 'fatal') command.run(path: @path, format: 'json', loglevel: 'fatal')
end end

5
config/initializers/ffmpeg.rb
View file

@ -1,5 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
if ENV['FFMPEG_BINARY'].present? Rails.application.configure do
FFMPEG.ffmpeg_binary = ENV['FFMPEG_BINARY'] config.x.ffmpeg_binary = ENV['FFMPEG_BINARY'] || 'ffmpeg'
config.x.ffprobe_binary = ENV['FFPROBE_BINARY'] || 'ffprobe'
end end

2
lib/paperclip/image_extractor.rb
View file

@ -35,7 +35,7 @@ module Paperclip
dst.binmode dst.binmode
begin begin
command = Terrapin::CommandLine.new('ffmpeg', '-i :source -loglevel :loglevel -y :destination', logger: Paperclip.logger) command = Terrapin::CommandLine.new(Rails.configuration.x.ffmpeg_binary, '-i :source -loglevel :loglevel -y :destination', logger: Paperclip.logger)
command.run(source: @file.path, destination: dst.path, loglevel: 'fatal') command.run(source: @file.path, destination: dst.path, loglevel: 'fatal')
rescue Terrapin::ExitStatusError rescue Terrapin::ExitStatusError
dst.close(true) dst.close(true)

2
lib/paperclip/transcoder.rb
View file

@ -61,7 +61,7 @@ module Paperclip
command_arguments, interpolations = prepare_command(destination) command_arguments, interpolations = prepare_command(destination)
begin begin
command = Terrapin::CommandLine.new('ffmpeg', command_arguments.join(' '), logger: Paperclip.logger) command = Terrapin::CommandLine.new(Rails.configuration.x.ffmpeg_binary, command_arguments.join(' '), logger: Paperclip.logger)
command.run(interpolations) command.run(interpolations)
rescue Terrapin::ExitStatusError => e rescue Terrapin::ExitStatusError => e
raise Paperclip::Error, "Error while transcoding #{@basename}: #{e}" raise Paperclip::Error, "Error while transcoding #{@basename}: #{e}"