streamio-ffmpeg 0.6.0 → 0.6.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 0.6.2 2010-05-05
+
+* Added Movie#uncertain_duration? which is true if ffmpeg is guessing duration from bitrate
+* Skipping the transcoders duration validation if original file has uncertain duration
+* Made sure aspect ratio preservation always rounds new size to an even number to avoid "not divisible by 2" errors
+* Changed Movie#valid? logic to accept any movie with either a readable audio or video stream
+
 == 0.6.0 2010-05-04
 
 * Cropping options now handled by EncodingOptions (croptop, cropbottom, cropleft and cropright)

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.2

data/lib/ffmpeg/movie.rb

@@ -12,8 +12,6 @@ module FFMPEG
       stdin, stdout, stderr = Open3.popen3("ffmpeg -i '#{path}'") # Output will land in stderr
       output = stderr.read
       
-      @valid = output["Unknown format"].nil? && output["Invalid data found when processing input"].nil?
-      
       output[/Duration: (\d{2}):(\d{2}):(\d{2}\.\d{1})/]
       @duration = ($1.to_i*60*60) + ($2.to_i*60) + $3.to_f
       
@@ -26,6 +24,8 @@ module FFMPEG
       output[/Audio: (.*)/]
       @audio_stream = $1
       
+      @uncertain_duration = output.include?("Estimating duration from bitrate, this may be inaccurate")
+       
       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]
@@ -35,10 +35,16 @@ module FFMPEG
         @audio_codec, audio_sample_rate, @audio_channels = audio_stream.split(/\s?,\s?/)
         @audio_sample_rate = audio_sample_rate[/\d*/].to_i
       end
+      
+      @invalid = @video_stream.to_s.empty? && @audio_stream.to_s.empty?
     end
     
     def valid?
-      @valid
+      not @invalid
+    end
+    
+    def uncertain_duration?
+      @uncertain_duration
     end
     
     def width
@@ -50,7 +56,8 @@ module FFMPEG
     end
     
     def calculated_aspect_ratio
-      width.to_f / height.to_f
+      aspect = width.to_f / height.to_f
+      aspect.nan? ? nil : aspect
     end
     
     def audio_channels

data/lib/ffmpeg/transcoder.rb

@@ -65,7 +65,7 @@ module FFMPEG
       end
       
       precision = 1.1
-      unless !(encoded.duration >= (@movie.duration * precision) or encoded.duration <= (@movie.duration / precision))
+      unless @movie.uncertain_duration? || !(encoded.duration >= (@movie.duration * precision) or encoded.duration <= (@movie.duration / precision))
         @errors << "encoded file duration differed from original (original: #{@movie.duration}sec, encoded: #{encoded.duration}sec)"
         return false
       end
@@ -79,12 +79,15 @@ module FFMPEG
     
     private
     def apply_transcoder_options
+      return if @movie.calculated_aspect_ratio.nil?
       case @transcoder_options[:preserve_aspect_ratio].to_s
       when "width"
-        new_height = (@raw_options.width / @movie.calculated_aspect_ratio).to_i
+        new_height = @raw_options.width / @movie.calculated_aspect_ratio
+        new_height = new_height.ceil.even? ? new_height.ceil : new_height.floor
         @raw_options[:resolution] = "#{@raw_options.width}x#{new_height}"
       when "height"
-        new_width = (@raw_options.height * @movie.calculated_aspect_ratio).to_i
+        new_width = @raw_options.height * @movie.calculated_aspect_ratio
+        new_width = new_width.ceil.even? ? new_width.ceil : new_width.floor
         @raw_options[:resolution] = "#{new_width}x#{@raw_options.height}"
       end
     end

data/spec/ffmpeg/movie_spec.rb

@@ -19,12 +19,40 @@ module FFMPEG
           @movie.should_not be_valid
         end
       end
+      
+      describe "given a mp3 file" do
+        before(:all) do
+          @movie = Movie.new("#{fixture_path}/sounds/napoleon.mp3")
+        end
+        
+        it "should have uncertain duration" do
+          @movie.should be_uncertain_duration
+        end
+      end
+      
+      describe "a broken mp4 file" do
+        before(:all) do
+          @movie = Movie.new("#{fixture_path}/movies/broken.mp4")
+        end
+        
+        it "should not be valid" do
+          @movie.should_not be_valid
+        end
+
+        it "should have nil calculated_aspect_ratio" do
+          @movie.calculated_aspect_ratio.should be_nil
+        end
+      end
 
       describe "given an awesome movie file" do
         before(:all) do
           @movie = Movie.new("#{fixture_path}/movies/awesome movie.mov")
         end
 
+        it "should not have uncertain duration" do
+          @movie.should_not be_uncertain_duration
+        end
+        
         it "should remember the movie path" do
           @movie.path.should == "#{fixture_path}/movies/awesome movie.mov"
         end

data/spec/ffmpeg/transcoder_spec.rb

@@ -79,6 +79,22 @@ module FFMPEG
           encoded = Transcoder.new(@movie, "#{tmp_path}/preserved_aspect.mp4", @options, special_options).run
           encoded.resolution.should == "426x240"
         end
+        
+        it "should not be used if original resolution is undeterminable" do
+          @movie.should_receive(:calculated_aspect_ratio).and_return(nil)
+          special_options = {:preserve_aspect_ratio => :height}
+          
+          encoded = Transcoder.new(@movie, "#{tmp_path}/preserved_aspect.mp4", @options, special_options).run
+          encoded.resolution.should == "320x240"
+        end
+        
+        it "should round to resolutions divisible by 2" do
+          @movie.should_receive(:calculated_aspect_ratio).at_least(:once).and_return(1.234)
+          special_options = {:preserve_aspect_ratio => :width}
+          
+          encoded = Transcoder.new(@movie, "#{tmp_path}/preserved_aspect.mp4", @options, special_options).run
+          encoded.resolution.should == "320x260" # 320 / 1.234 should at first be rounded to 259
+        end
       end
 
       it "should transcode the movie with String options" do
@@ -97,6 +113,22 @@ module FFMPEG
         transcoder = Transcoder.new(movie, "#{tmp_path}/fail.flv")
         lambda { transcoder.run }.should raise_error(RuntimeError, /no output file created/)
       end
+      
+      it "should fail if duration differs from original" do
+        movie = Movie.new("#{fixture_path}/sounds/napoleon.mp3")
+        movie.stub!(:duration).and_return(200)
+        movie.stub!(:uncertain_duration?).and_return(false)
+        transcoder = Transcoder.new(movie, "#{tmp_path}/duration_fail.flv")
+        lambda { transcoder.run }.should raise_error(RuntimeError, /encoded file duration differed from original/)
+      end
+      
+      it "should skip duration check if originals duration is uncertain" do
+        movie = Movie.new("#{fixture_path}/sounds/napoleon.mp3")
+        movie.stub!(:duration).and_return(200)
+        movie.stub!(:uncertain_duration?).and_return(true)
+        transcoder = Transcoder.new(movie, "#{tmp_path}/duration_fail.flv")
+        lambda { transcoder.run }.should_not raise_error(RuntimeError)
+      end
     end
   end
 end

data/streamio-ffmpeg.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{streamio-ffmpeg}
-  s.version = "0.6.0"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Backeus"]
-  s.date = %q{2010-05-04}
+  s.date = %q{2010-05-05}
   s.description = %q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
   s.email = %q{duztdruid@gmail.com}
   s.extra_rdoc_files = [
@@ -33,6 +33,8 @@ Gem::Specification.new do |s|
      "spec/ffmpeg/transcoder_spec.rb",
      "spec/fixtures/movies/awesome movie.mov",
      "spec/fixtures/movies/awesome_widescreen.mov",
+     "spec/fixtures/movies/broken.mp4",
+     "spec/fixtures/sounds/napoleon.mp3",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/stremio-ffmpeg_spec.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - David Backeus
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 +02:00
+date: 2010-05-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,8 @@ files:
 - spec/ffmpeg/transcoder_spec.rb
 - spec/fixtures/movies/awesome movie.mov
 - spec/fixtures/movies/awesome_widescreen.mov
+- spec/fixtures/movies/broken.mp4
+- spec/fixtures/sounds/napoleon.mp3
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/stremio-ffmpeg_spec.rb