streamio-ffmpeg 0.8.1 → 0.8.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.8.2 2011-08-19
+
+* Path to ffmpeg binary can now be specified (thanks jonathandean)
+* If ffmpeg output contains "is not supported" the Movie will be considered invalid
+
 == 0.8.1 2011-07-28
 
 * Fix progress yielding with ffmpeg 0.8

data/README.rdoc

@@ -94,6 +94,14 @@ Use ffpreset files to avoid headaches when encoding with libx264 (http://www.ffm
   options = {:video_codec => "libx264", :video_preset => "medium"} # audio_preset and file_preset also availible
   movie.transcode("movie.mp4", options) # encodes video using libx264-medium.ffpreset
 
+== Specify the path to ffmpeg
+
+By default, streamio assumes that the ffmpeg binary is available in the execution path and named ffmpeg and so will run commands that look something like "ffmpeg -i /path/to/input.file ...". Use the FFMPEG.ffmpeg_binary setter to specify the full path to the binary if necessary:
+
+  FFMPEG.ffmpeg_binary = '/usr/local/bin/ffmpeg'
+
+This will cause the same command to run as "/usr/local/bin/ffmpeg -i /path/to/input.file ..." instead.
+
 == Copyright
 
 Copyright (c) 2010 Streamio Networks AB. See LICENSE for details.

data/lib/ffmpeg/movie.rb

@@ -9,7 +9,7 @@ module FFMPEG
       
       @path = escape(path)
 
-      stdin, stdout, stderr = Open3.popen3("ffmpeg -i '#{path}'") # Output will land in stderr
+      stdin, stdout, stderr = Open3.popen3("#{FFMPEG.ffmpeg_binary} -i '#{path}'") # Output will land in stderr
       output = stderr.read
       
       fix_encoding(output)
@@ -44,7 +44,8 @@ module FFMPEG
         @audio_sample_rate = audio_sample_rate[/\d*/].to_i
       end
       
-      @invalid = @video_stream.to_s.empty? && @audio_stream.to_s.empty?
+      @invalid = true if @video_stream.to_s.empty? && @audio_stream.to_s.empty?
+      @invalid = true if output.include?("is not supported")
     end
     
     def valid?

data/lib/ffmpeg/transcoder.rb

@@ -23,7 +23,7 @@ module FFMPEG
     # ffmpeg <  0.8: frame=  413 fps= 48 q=31.0 size=    2139kB time=16.52 bitrate=1060.6kbits/s
     # ffmpeg >= 0.8: frame= 4855 fps= 46 q=31.0 size=   45306kB time=00:02:42.28 bitrate=2287.0kbits/
     def run
-      command = "ffmpeg -y -i '#{@movie.path}' #{@raw_options} '#{@output_file}'"
+      command = "#{FFMPEG.ffmpeg_binary} -y -i '#{@movie.path}' #{@raw_options} '#{@output_file}'"
       FFMPEG.logger.info("Running transcoding...\n#{command}\n")
       output = ""
       last_output = nil

data/lib/ffmpeg/version.rb

@@ -1,3 +1,3 @@
 module FFMPEG
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/streamio-ffmpeg.rb

@@ -27,4 +27,20 @@ module FFMPEG
     logger.level = Logger::INFO
     @logger = logger
   end
+
+  # Set the path of the ffmpeg binary.
+  # Can be useful if you need to specify a path such as /usr/local/bin/ffmpeg
+  #
+  # @param [String] path to the ffmpeg binary
+  # @return [String] the path you set
+  def self.ffmpeg_binary=(bin)
+    @ffmpeg_binary = bin
+  end
+
+  # Get the path to the ffmpeg binary, defaulting to 'ffmpeg'
+  #
+  # @return [String] the path to the ffmpeg binary
+  def self.ffmpeg_binary
+    @ffmpeg_binary.nil? ? 'ffmpeg' : @ffmpeg_binary
+  end
 end

metadata

@@ -1,38 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: streamio-ffmpeg
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.8.2
   prerelease: 
-  version: 0.8.1
 platform: ruby
-authors: 
+authors:
 - David Backeus
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-19 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152909420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-description: Simple yet powerful wrapper around ffmpeg to get metadata from movies and do transcoding.
-email: 
+  version_requirements: *2152909420
+description: Simple yet powerful wrapper around ffmpeg to get metadata from movies
+  and do transcoding.
+email:
 - david@streamio.se
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ffmpeg/encoding_options.rb
 - lib/ffmpeg/movie.rb
 - lib/ffmpeg/transcoder.rb
@@ -43,36 +40,32 @@ files:
 - CHANGELOG
 homepage: http://github.com/streamio/streamio-ffmpeg
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3076190158678176815
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 951887406957158189
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3076190158678176815
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 951887406957158189
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Reads metadata and transcodes movies.
 test_files: []
-