streamio-ffmpeg 0.7.4 → 0.7.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.7.5 2011-01-14
+
+* Fixed some ruby 1.9 issues
+* Added Movie#video_bitrate and Movie#audio_bitrate (thanks to mbj)
+
 == 0.7.4 2010-12-07
 
 * Fixed broken duration on movies with start times over 0 by reducing duration with start-time 

data/lib/ffmpeg/movie.rb

@@ -1,8 +1,8 @@
 module FFMPEG
   class Movie
     attr_reader :path, :duration, :time, :bitrate
-    attr_reader :video_stream, :video_codec, :colorspace, :resolution, :dar
-    attr_reader :audio_stream, :audio_codec, :audio_sample_rate
+    attr_reader :video_stream, :video_codec, :video_bitrate, :colorspace, :resolution, :dar
+    attr_reader :audio_stream, :audio_codec, :audio_bitrate, :audio_sample_rate
     
     def initialize(path)
       raise Errno::ENOENT, "the file '#{path}' does not exist" unless File.exists?(path)
@@ -12,6 +12,8 @@ module FFMPEG
       stdin, stdout, stderr = Open3.popen3("ffmpeg -i '#{path}'") # Output will land in stderr
       output = stderr.read
       
+      fix_encoding(output)
+      
       output[/Duration: (\d{2}):(\d{2}):(\d{2}\.\d{1})/]
       @duration = ($1.to_i*60*60) + ($2.to_i*60) + $3.to_f
       
@@ -32,13 +34,15 @@ module FFMPEG
       @uncertain_duration = output.include?("Estimating duration from bitrate, this may be inaccurate")
        
       if video_stream
-        @video_codec, @colorspace, resolution = video_stream.split(/\s?,\s?/)
+        @video_codec, @colorspace, resolution, video_bitrate = video_stream.split(/\s?,\s?/)
+        @video_bitrate = video_bitrate =~ %r(\A(\d+) kb/s\Z) ? $1.to_i : nil
         @resolution = resolution.split(" ").first rescue nil # get rid of [PAR 1:1 DAR 16:9]
         @dar = $1 if video_stream[/DAR (\d+:\d+)/]
       end
       
       if audio_stream
-        @audio_codec, audio_sample_rate, @audio_channels = audio_stream.split(/\s?,\s?/)
+        @audio_codec, audio_sample_rate, @audio_channels, unused, audio_bitrate = audio_stream.split(/\s?,\s?/)
+        @audio_bitrate = audio_bitrate =~ %r(\A(\d+) kb/s\Z) ? $1.to_i : nil
         @audio_sample_rate = audio_sample_rate[/\d*/].to_i
       end
       
@@ -94,5 +98,11 @@ module FFMPEG
       map  =  { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
       path.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { map[$1] }
     end
+    
+    def fix_encoding(output)
+      output[/test/] # Running a regexp on the string throws error if it's not UTF-8
+    rescue ArgumentError
+      output.force_encoding("ISO-8859-1")
+    end
   end
 end

data/lib/ffmpeg/transcoder.rb

@@ -99,6 +99,7 @@ module FFMPEG
     def validate_duration?
       return false if @movie.uncertain_duration?
       return false if %w(.jpg .png).include?(File.extname(@output_file))
+      return false if @raw_options.is_a?(String)
       true
     end
   end

data/lib/ffmpeg/version.rb

@@ -1,3 +1,3 @@
 module FFMPEG
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: streamio-ffmpeg
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - David Backeus
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 +01:00
+date: 2011-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
@@ -66,7 +64,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -75,7 +72,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3