streamio-ffmpeg 0.8.0 → 0.8.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.8.1 2011-07-28
+
+* Fix progress yielding with ffmpeg 0.8
+* Updated specs to pass with ffmpeg 0.8
+
 == 0.8.0 2011-05-26
 
 * Duration is now ALWAYS considered uncertain (we've noticed that ffmpeg is not always correct)

data/README.rdoc

@@ -6,7 +6,7 @@ Simple yet powerful wrapper around the ffmpeg command for reading metadata and t
 
   (sudo) gem install streamio-ffmpeg
 
-This version is written against an ffmpeg build from july 2010 (tested against r24069). So no guarantees with earlier (or much later) versions. Output and input standards have inconveniently changed rather a lot between versions of ffmpeg. My goal is to keep this library in sync with new versions of ffmpeg as they come along.
+This version is tested against ffmpeg 0.8. So no guarantees with earlier (or much later) versions. Output and input standards have inconveniently changed rather a lot between versions of ffmpeg. My goal is to keep this library in sync with new versions of ffmpeg as they come along.
 
 == Usage
 

data/lib/ffmpeg/transcoder.rb

@@ -20,17 +20,26 @@ module FFMPEG
       apply_transcoder_options
     end
     
+    # 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}'"
       FFMPEG.logger.info("Running transcoding...\n#{command}\n")
       output = ""
       last_output = nil
       Open3.popen3(command) do |stdin, stdout, stderr|
+        yield(0.0) if block_given?
         stderr.each("r") do |line|
           fix_encoding(line)
           output << line
-          if line =~ /time=(\d+.\d+)/
-            time = $1.to_f
+          if line.include?("time=")
+            if line =~ /time=(\d+):(\d+):(\d+.\d+)/ # ffmpeg 0.8 and above style
+              time = ($1.to_i * 3600) + ($2.to_i * 60) + $3.to_f
+            elsif line =~ /time=(\d+.\d+)/ # ffmpeg 0.7 and below style
+              time = $1.to_f
+            else # better make sure it wont blow up in case of unexpected output
+              time = 0.0
+            end
             progress = time / @movie.duration
             yield(progress) if block_given?
           end

data/lib/ffmpeg/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: streamio-ffmpeg
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - David Backeus
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 Z
+date: 2011-07-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -54,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4354055556747967075
+      hash: 3076190158678176815
       segments: 
       - 0
       version: "0"
@@ -63,7 +63,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      hash: 3076190158678176815
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: