streamio-ffmpeg 0.6.2 → 0.6.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.6.3 2010-05-05
+
+* Use DAR to calculate aspect ratio if availible
+
 == 0.6.2 2010-05-05
 
 * Added Movie#uncertain_duration? which is true if ffmpeg is guessing duration from bitrate

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/ffmpeg/movie.rb

@@ -1,7 +1,7 @@
 module FFMPEG
   class Movie
     attr_reader :path, :duration, :bitrate
-    attr_reader :video_stream, :video_codec, :colorspace, :resolution
+    attr_reader :video_stream, :video_codec, :colorspace, :resolution, :dar
     attr_reader :audio_stream, :audio_codec, :audio_sample_rate
     
     def initialize(path)
@@ -29,6 +29,7 @@ module FFMPEG
       if video_stream
         @video_codec, @colorspace, resolution = video_stream.split(/\s?,\s?/)
         @resolution = resolution.split(" ").first # get rid of [PAR 1:1 DAR 16:9]
+        @dar = $1 if video_stream[/DAR (\d+:\d+)/]
       end
       
       if audio_stream
@@ -56,8 +57,13 @@ module FFMPEG
     end
     
     def calculated_aspect_ratio
-      aspect = width.to_f / height.to_f
-      aspect.nan? ? nil : aspect
+      if dar
+        width, height = dar.split(":")
+        width.to_f / height.to_f
+      else
+        aspect = width.to_f / height.to_f
+        aspect.nan? ? nil : aspect
+      end
     end
     
     def audio_channels

data/lib/ffmpeg/transcoder.rb

@@ -22,7 +22,7 @@ module FFMPEG
     
     def run
       command = "ffmpeg -y -i '#{@movie.path}' #{@raw_options} '#{@output_file}'"
-      FFMPEG.logger.info("Running transcoding...\n#{command}")
+      FFMPEG.logger.info("Running transcoding...\n#{command}\n")
       output = ""
       last_output = nil
       Open3.popen3(command) do |stdin, stdout, stderr|
@@ -34,7 +34,7 @@ module FFMPEG
             yield(progress) if block_given?
           end
           if line =~ /Unsupported codec/
-            FFMPEG.logger.error "Failed encoding...\nCommand\n#{command}\nOutput\n#{output}"
+            FFMPEG.logger.error "Failed encoding...\nCommand\n#{command}\nOutput\n#{output}\n"
             raise "Failed encoding: #{line}"
           end
           last_output = line
@@ -42,11 +42,11 @@ module FFMPEG
       end
 
       if encoding_succeeded?
-        FFMPEG.logger.info "Transcoding of #{@movie.path} to #{@output_file} succeeded"
+        FFMPEG.logger.info "Transcoding of #{@movie.path} to #{@output_file} succeeded\n"
         yield(1.0) if block_given?
       else
         errors = @errors.empty? ? "" : "Errors: #{@errors.join(", ")}"
-        FFMPEG.logger.error "Failed encoding...\n#{command}\n\n#{output}\n#{errors}"
+        FFMPEG.logger.error "Failed encoding...\n#{command}\n\n#{output}\n#{errors}\n"
         raise "Failed encoding. Last output: #{last_output}. #{errors}"
       end
       

data/spec/ffmpeg/movie_spec.rb

@@ -44,6 +44,20 @@ module FFMPEG
         end
       end
 
+      describe "given a weird aspect ratio file" do
+        before(:all) do
+          @movie = Movie.new("#{fixture_path}/movies/weird_aspect.small.mpg")
+        end
+        
+        it "should parse the DAR" do
+          @movie.dar.should == "704:405"
+        end
+        
+        it "should have correct calculated_aspect_ratio" do
+          @movie.calculated_aspect_ratio.to_s.should == "1.73827160493827"
+        end
+      end
+
       describe "given an awesome movie file" do
         before(:all) do
           @movie = Movie.new("#{fixture_path}/movies/awesome movie.mov")

data/streamio-ffmpeg.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{streamio-ffmpeg}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Backeus"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/movies/awesome movie.mov",
      "spec/fixtures/movies/awesome_widescreen.mov",
      "spec/fixtures/movies/broken.mp4",
+     "spec/fixtures/movies/weird_aspect.small.mpg",
      "spec/fixtures/sounds/napoleon.mp3",
      "spec/spec.opts",
      "spec/spec_helper.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - David Backeus
@@ -58,6 +58,7 @@ files:
 - spec/fixtures/movies/awesome movie.mov
 - spec/fixtures/movies/awesome_widescreen.mov
 - spec/fixtures/movies/broken.mp4
+- spec/fixtures/movies/weird_aspect.small.mpg
 - spec/fixtures/sounds/napoleon.mp3
 - spec/spec.opts
 - spec/spec_helper.rb