streamio-ffmpeg 0.7.1 → 0.7.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.7.2 2010-08-11
+
+* Added encoding option duration
+* Avoid crashing when ffmpeg can't find resolution of a movie
+
 == 0.7.1 2010-07-08
 
 * Make sure preset parameters are always put last to avoid them ending up before any codec assignments

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/ffmpeg/encoding_options.rb

@@ -112,6 +112,10 @@ module FFMPEG
       "-threads #{value}"
     end
     
+    def convert_duration(value)
+      "-t #{value}"
+    end
+    
     def convert_video_preset(value)
       "-vpre #{value}"
     end

data/lib/ffmpeg/movie.rb

@@ -28,7 +28,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]
+        @resolution = resolution.split(" ").first rescue nil # get rid of [PAR 1:1 DAR 16:9]
         @dar = $1 if video_stream[/DAR (\d+:\d+)/]
       end
       

data/lib/ffmpeg/transcoder.rb

@@ -65,9 +65,10 @@ module FFMPEG
       end
       
       if validate_duration?
-        precision = 1.1
-        unless !(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)"
+        precision = @raw_options[:duration] ? 1.5 : 1.1
+        desired_duration = @raw_options[:duration] && @raw_options[:duration] < @movie.duration ? @raw_options[:duration] : @movie.duration
+        if (encoded.duration >= (desired_duration * precision) or encoded.duration <= (desired_duration / precision))
+          @errors << "encoded file duration differed from original/specified duration (wanted: #{desired_duration}sec, got: #{encoded.duration}sec)"
           return false
         end
       end

data/spec/ffmpeg/encoding_options_spec.rb

@@ -90,6 +90,10 @@ module FFMPEG
         EncodingOptions.new(:threads => 2).to_s.should == "-threads 2"
       end
       
+      it "should convert duration" do
+        EncodingOptions.new(:duration => 30).to_s.should == "-t 30"
+      end
+      
       it "should convert video preset" do
         EncodingOptions.new(:video_preset => "max").to_s.should == "-vpre max"
       end

data/spec/ffmpeg/transcoder_spec.rb

@@ -139,6 +139,23 @@ module FFMPEG
         encoded = Transcoder.new(movie, "#{tmp_path}/image.jpg", :custom => "-ss 00:00:03 -vframes 1 -f image2").run
         encoded.resolution.should == "640x480"
       end
+      
+      it "should validate duration to the specified duration if given" do
+        movie = Movie.new("#{fixture_path}/movies/awesome movie.mov")
+        
+        encoded = Transcoder.new(movie, "#{tmp_path}/durationalized.mp4", :duration => 2).run
+        
+        encoded.duration.should >= 1.8
+        encoded.duration.should <= 2.2
+      end
+      
+      it "should validate duration to original movies duration if duration specified to higher number than original" do
+        movie = Movie.new("#{fixture_path}/movies/awesome movie.mov")
+        
+        expect { 
+          Transcoder.new(movie, "#{tmp_path}/durationalized.mp4", :duration => 10).run
+        }.to_not raise_error
+      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.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Backeus"]
-  s.date = %q{2010-07-08}
+  s.date = %q{2010-08-11}
   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 = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/sounds/napoleon.mp3",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/stremio-ffmpeg_spec.rb",
+     "spec/streamio-ffmpeg_spec.rb",
      "streamio-ffmpeg.gemspec"
   ]
   s.homepage = %q{http://github.com/streamio/streamio-ffmpeg}
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
      "spec/ffmpeg/movie_spec.rb",
      "spec/ffmpeg/transcoder_spec.rb",
      "spec/spec_helper.rb",
-     "spec/stremio-ffmpeg_spec.rb"
+     "spec/streamio-ffmpeg_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: streamio-ffmpeg
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - David Backeus
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 +02:00
+date: 2010-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ files:
 - spec/fixtures/sounds/napoleon.mp3
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/stremio-ffmpeg_spec.rb
+- spec/streamio-ffmpeg_spec.rb
 - streamio-ffmpeg.gemspec
 has_rdoc: true
 homepage: http://github.com/streamio/streamio-ffmpeg
@@ -106,4 +106,4 @@ test_files:
 - spec/ffmpeg/movie_spec.rb
 - spec/ffmpeg/transcoder_spec.rb
 - spec/spec_helper.rb
-- spec/stremio-ffmpeg_spec.rb
+- spec/streamio-ffmpeg_spec.rb