dragonfly-ffmpeg 0.1.5 → 0.1.6

data/lib/dragonfly-ffmpeg/analyser.rb

@@ -30,69 +30,73 @@ module EnMasse
         end
       
         def frame_rate(temp_object)
-          inspect(:frame_rate, temp_object)
+          inspect_movie(:frame_rate, temp_object)
         end
         alias_method :fps, :frame_rate
         
         def duration(temp_object)
-          inspect(:duration, temp_object)
+          inspect_movie(:duration, temp_object)
         end
         
         def bitrate(temp_object)
-          inspect(:bitrate, temp_object)
+          inspect_movie(:bitrate, temp_object)
         end
         
         def size(temp_object)
-          inspect(:size, temp_object)
+          inspect_movie(:size, temp_object)
         end
         
         def video_stream(temp_object)
-          inspect(:video_stream, temp_object)
+          inspect_movie(:video_stream, temp_object)
         end
         
         def video_codec(temp_object)
-          inspect(:video_codec, temp_object)
+          inspect_movie(:video_codec, temp_object)
         end
         
         def colorspace(temp_object)
-          inspect(:colorspace, temp_object)
+          inspect_movie(:colorspace, temp_object)
         end
         
         def resolution(temp_object)
-          inspect(:resolution, temp_object)
+          inspect_movie(:resolution, temp_object)
         end
         
         def v_width(temp_object)
-          inspect(:width, temp_object)
+          inspect_movie(:width, temp_object)
         end
         
         def v_height(temp_object)
-          inspect(:height, temp_object)
+          inspect_movie(:height, temp_object)
         end
         
         def audio_stream(temp_object)
-          inspect(:audio_stream, temp_object)
+          inspect_movie(:audio_stream, temp_object)
         end
         
         def audio_codec(temp_object)
-          inspect(:audio_codec, temp_object)
+          inspect_movie(:audio_codec, temp_object)
         end
         
         def audio_sample_rate(temp_object)
-          inspect(:audio_sample_rate, temp_object)
+          inspect_movie(:audio_sample_rate, temp_object)
+        end
+        
+        def audio_bitrate(temp_object)
+          inspect_movie(:audio_bitrate, temp_object)
         end
         
         def audio_channels(temp_object)
-          inspect(:audio_channels, temp_object)
+          inspect_movie(:audio_channels, temp_object)
         end
         
         def valid?(temp_object)
-          inspect(:valid?, temp_object)
+          inspect_movie(:valid?, temp_object)
         end
         
         private
         
-        def inspect(method, temp_object)
+        def inspect_movie(method, temp_object)
           ::FFMPEG::Movie.new(temp_object.path).send(method)
         end
         

data/lib/dragonfly-ffmpeg/encoder.rb

@@ -34,6 +34,7 @@ module EnMasse
               :frame_rate => 29.97,
               :video_bitrate => 3072,
               :audio_codec => "libfaac",
+              :audio_bitrate => 128,
               :audio_channels => 2,
               :audio_sample_rate => 48000,
               :video_preset => "hq"
@@ -46,6 +47,7 @@ module EnMasse
               :frame_rate => 29.97,
               :video_bitrate => 3072,
               :audio_codec => "libvorbis",
+              :audio_bitrate => 128,
               :audio_channels => 2,
               :audio_sample_rate => 48000
             )
@@ -57,6 +59,7 @@ module EnMasse
               :frame_rate => 29.97,
               :video_bitrate => 3072,
               :audio_codec => "libvorbis",
+              :audio_bitrate => 128,
               :audio_channels => 2,
               :audio_sample_rate => 48000,
               :custom => "-f webm"
@@ -89,6 +92,11 @@ module EnMasse
           tempfile = new_tempfile(format, original_basename)
           transcoded_file = origin.transcode(tempfile.path, options)
           
+          if(format.to_s == 'mp4' && `qt-faststart`)
+            `qt-faststart #{transcoded_file.path} #{transcoded_file.path}.tmp.mp4`
+            `mv #{transcoded_file.path}.tmp.mp4 #{transcoded_file.path}`
+          end
+          
           content = ::Dragonfly::TempObject.new(File.new(transcoded_file.path))
           meta = {
               :name => (original_basename + ".#{format}"),

data/lib/dragonfly-ffmpeg/version.rb

@@ -19,7 +19,7 @@
 module EnMasse
   module Dragonfly
     module FFMPEG
-      VERSION = "0.1.5"
+      VERSION = "0.1.6"
     end
   end
 end

data/spec/dragonfly-ffmpeg/analyser_spec.rb

@@ -31,7 +31,7 @@ describe EnMasse::Dragonfly::FFMPEG::Analyser do
     @analyser.ext(@video).should == '.mov'
   end
   
-  it "should return the width" do 
+  it "should return the width" do
     @analyser.v_width(@video).should == 1280
   end
   
@@ -44,7 +44,7 @@ describe EnMasse::Dragonfly::FFMPEG::Analyser do
   end
   
   it "should return the duration" do
-    @analyser.duration(@video).should == 0.6
+    (@analyser.duration(@video)*10).to_i.should == 6
   end
   
   it "should return the bit rate" do
@@ -71,6 +71,10 @@ describe EnMasse::Dragonfly::FFMPEG::Analyser do
     @analyser.resolution(@video).should == "1280x720"
   end
   
+  it "should return the bit rate" do
+    @analyser.audio_bitrate(@video).should == 89
+  end
+  
   it "should return the audio stream" do
     @analyser.audio_stream(@video).should == "aac, 48000 Hz, stereo, s16, 89 kb/s"
   end

data/spec/dragonfly-ffmpeg/encoder_spec.rb

@@ -64,13 +64,14 @@ describe EnMasse::Dragonfly::FFMPEG::Encoder do
     end
   end
   
-  describe "encode with an inline defined encoding profile" do
+  describe "encode with an inline defined encoding profile (:webm)" do
     let(:profile) do
       EnMasse::Dragonfly::FFMPEG::Encoder::Profile.new(:webm_720p,
         :video_codec => "libvpx",
         :resolution => "1280x720",
         :frame_rate => 29.97,
         :video_bitrate => 3072,
+        :audio_bitrate => 128,
         :audio_codec => "libvorbis",
         :audio_channels => 2,
         :audio_sample_rate => 48000,
@@ -96,8 +97,114 @@ describe EnMasse::Dragonfly::FFMPEG::Encoder do
       video.should have_bitrate(profile.encoding_options[:video_bitrate])
     end
     
+    it "should have the specified audio bitrate" do
+      video.should have_audio_bitrate(profile.encoding_options[:audio_bitrate])
+    end
+    
+    it "should have the specified audio codec" do
+      video.should have_audio_codec("vorbis")
+    end
+    
+    it "should have the specified number of audio channels" do
+      video.should have_audio_channels(profile.encoding_options[:audio_channels])
+    end
+    
+    it "should have the specified audio sample rate" do
+      video.should have_audio_sample_rate(profile.encoding_options[:audio_sample_rate])
+    end
+  end
+  
+  
+  describe "encode with an inline defined encoding profile (ogv)" do
+    let(:profile) do
+      EnMasse::Dragonfly::FFMPEG::Encoder::Profile.new(:ogv,
+        :video_codec => "libtheora",
+        :resolution => "1280x720",
+        :frame_rate => 29.97,
+        :video_bitrate => 3072,
+        :audio_bitrate => 128,
+        :audio_codec => "libvorbis",
+        :audio_channels => 2,
+        :audio_sample_rate => 48000
+      )
+    end
+    
+    let(:video) { subject.encode(raw_video, :ogv, profile).first }
+    
+    it "should have the specified video codec" do
+      video.should have_video_codec("theora")
+    end
+    
+    it "should have the specified resolution" do
+      video.should have_resolution(profile.encoding_options[:resolution])
+    end
+    
+    it "should have the specified frame rate" do
+      video.should have_frame_rate(profile.encoding_options[:frame_rate])
+    end
+    
+    it "should have the specified bitrate" do
+      bitrate = EnMasse::Dragonfly::FFMPEG::Analyser.new.bitrate(video)
+      bitrate.should be_within(17).of(profile.encoding_options[:video_bitrate])
+    end
+    
+    it "should have the specified audio bitrate" do
+      video.should have_audio_bitrate(profile.encoding_options[:audio_bitrate])
+    end
+    
     it "should have the specified audio codec" do
-      video.should have_audio_codec(profile.encoding_options[:audio_codec])
+      video.should have_audio_codec("vorbis")
+    end
+    
+    it "should have the specified number of audio channels" do
+      video.should have_audio_channels(profile.encoding_options[:audio_channels])
+    end
+    
+    it "should have the specified audio sample rate" do
+      video.should have_audio_sample_rate(profile.encoding_options[:audio_sample_rate])
+    end
+  end
+  
+  describe "encode with an inline defined encoding profile (mp4)" do
+    let(:profile) do
+      EnMasse::Dragonfly::FFMPEG::Encoder::Profile.new(:mp4,
+        :video_codec => "libx264",
+        :resolution => "1280x720",
+        :frame_rate => 29.97,
+        :video_bitrate => 3072,
+        :audio_bitrate => 128,
+        :audio_codec => "libfaac",
+        :audio_channels => 2,
+        :audio_sample_rate => 48000,
+        :video_preset => "hq"
+      )
+    end
+    
+    let(:video) { subject.encode(raw_video, :mp4, profile).first }
+    
+    it "should have the specified video codec" do
+      video.should have_video_codec("h264")
+    end
+    
+    it "should have the specified resolution" do
+      video.should have_resolution(profile.encoding_options[:resolution])
+    end
+    
+    it "should have the specified frame rate" do
+      video.should have_frame_rate(profile.encoding_options[:frame_rate])
+    end
+    
+    it "should have the specified bitrate" do
+      bitrate = EnMasse::Dragonfly::FFMPEG::Analyser.new.bitrate(video)
+      bitrate.should be_within(17).of(profile.encoding_options[:video_bitrate])
+    end
+    
+    it "should have the specified audio bitrate" do
+      video.should have_audio_bitrate(profile.encoding_options[:audio_bitrate])
+    end
+    
+    it "should have the specified audio codec" do
+      video.should have_audio_codec("aac")
     end
     
     it "should have the specified number of audio channels" do
@@ -120,5 +227,7 @@ describe EnMasse::Dragonfly::FFMPEG::Encoder do
       subject.encode(raw_video, :webm, :a_fake_profile)
     }.should raise_error(EnMasse::Dragonfly::FFMPEG::UnknownEncoderProfile)
   end
+  
+  
 
 end

data/spec/spec_helper.rb

@@ -17,8 +17,8 @@
 #
 
 require 'rubygems'
-require 'bundler'
-Bundler.setup(:default, :test)
+#require 'bundler'
+#Bundler.setup(:default, :test)
 require 'spork'
 
 Spork.prefork do

data/spec/support/video_matchers.rb

@@ -21,6 +21,16 @@ RSpec::Matchers.define :have_video_codec do |v_codec|
     analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
     analyser.video_codec(given) == v_codec.to_s
   end
+  
+  failure_message_for_should do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    "Expected codec #{v_codec}, but got #{analyser.video_codec(given)}"
+  end
+  
+  failure_message_for_should_not do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    "Expected codec to not be #{v_codec}, but got #{analyser.video_codec(given)}"
+  end
 end
 
 RSpec::Matchers.define :have_resolution do |resolution|
@@ -33,35 +43,82 @@ end
 RSpec::Matchers.define :have_frame_rate do |frame_rate|
   match do |given|
     analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
-    analyser.frame_rate(given) == frame_rate.to_s
+    analyser.frame_rate(given) == frame_rate
+  end
+  
+  failure_message_for_should do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    "Expected frame_rate #{frame_rate}, but got #{analyser.frame_rate(given)}"
+  end
+  
+  failure_message_for_should_not do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    "Expected frame_rate to not be #{frame_rate}, but got #{analyser.frame_rate(given)}"
   end
 end
 
 RSpec::Matchers.define :have_bitrate do |bitrate|
   match do |given|
     analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
-    analyser.bitrate(given) == bitrate.to_s
+    analyser.bitrate(given) == bitrate
+  end
+  
+  failure_message_for_should do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    "Expected bitrate #{bitrate}, but got #{analyser.bitrate(given)}"
+  end
+  
+  failure_message_for_should_not do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    "Expected bitrate to not be #{bitrate}, but got #{analyser.bitrate(given)}"
+  end
+end
+
+RSpec::Matchers.define :have_audio_bitrate do |bitrate|
+  match do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    analyser.audio_bitrate(given) == bitrate
+  end
+  
+  failure_message_for_should do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    "Expected audio bitrate #{bitrate}, but got #{analyser.audio_bitrate(given)}"
+  end
+  
+  failure_message_for_should_not do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    "Expected audio bitrate to not be #{bitrate}, but got #{analyser.audio_bitrate(given)}"
   end
 end
 
 RSpec::Matchers.define :have_audio_codec do |audio_codec|
   match do |given|
     analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
-    analyser.audio_codec(given) == audio_codec.to_s
+    analyser.audio_codec(given) == audio_codec
+  end
+  
+  failure_message_for_should do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    "Expected audio_codec #{audio_codec}, but got #{analyser.audio_codec(given)}"
+  end
+  
+  failure_message_for_should_not do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    "Expected audio_codec to not be #{audio_codec}, but got #{analyser.audio_codec(given)}"
   end
 end
 
 RSpec::Matchers.define :have_audio_channels do |audio_channels|
   match do |given|
     analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
-    analyser.audio_channels(given) == audio_channels.to_s
+    analyser.audio_channels(given) == audio_channels
   end
 end
 
 RSpec::Matchers.define :have_audio_sample_rate do |audio_sample_rate|
   match do |given|
     analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
-    analyser.audio_sample_rate(given) == audio_sample_rate.to_s
+    analyser.audio_sample_rate(given) == audio_sample_rate
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-ffmpeg
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &70126800663540 !ruby/object:Gem::Requirement
+  requirement: &70205427880460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70126800663540
+  version_requirements: *70205427880460
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
-  requirement: &70126800662660 !ruby/object:Gem::Requirement
+  requirement: &70205427879180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70126800662660
+  version_requirements: *70205427879180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70126800661880 !ruby/object:Gem::Requirement
+  requirement: &70205427878600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70126800661880
+  version_requirements: *70205427878600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70126800660600 !ruby/object:Gem::Requirement
+  requirement: &70205427878020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70126800660600
+  version_requirements: *70205427878020
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70126800659740 !ruby/object:Gem::Requirement
+  requirement: &70205427877040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70126800659740
+  version_requirements: *70205427877040
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70126800656980 !ruby/object:Gem::Requirement
+  requirement: &70205427876360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126800656980
+  version_requirements: *70205427876360
 description: FFMPEG libraries for processesing, encoding, analysing and generating
   videos with Dragonfly
 email: