Skip to content

Make the FFMPEG stdout log accessible. #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cristianrasch wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make the FFMPEG stdout log accessible. #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6baea6
Make the FFMPEG stdout log accessible.
cristianrasch Apr 12, 2014
779c903
Also make the screenshot output available
cristianrasch Apr 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/ffmpeg/movie.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,17 @@ def frame_rate
end

def transcode(output_file, options = EncodingOptions.new, transcoder_options = {}, &block)
Transcoder.new(self, output_file, options, transcoder_options).run &block
@transcoder = Transcoder.new(self, output_file, options, transcoder_options)
@transcoder.run &block
end

def transcoder_output
@transcoder.output if @transcoder
end

def screenshot(output_file, options = EncodingOptions.new, transcoder_options = {}, &block)
Transcoder.new(self, output_file, options.merge(screenshot: true), transcoder_options).run &block
@transcoder = Transcoder.new(self, output_file, options.merge(screenshot: true), transcoder_options)
@transcoder.run &block
end

protected
Expand Down
2 changes: 2 additions & 0 deletions lib/ffmpeg/transcoder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ module FFMPEG
class Transcoder
@@timeout = 30

attr_reader :output

def self.timeout=(time)
@@timeout = time
end
Expand Down