streamio-ffmpeg 0.6.7 → 0.6.8

data/CHANGELOG

@@ -1,10 +1,15 @@
+== 0.6.8 2010-07-06
+
+* Don't use encoding options with nil values
+* Added encoding options video_max_bitrate, video_min_bitrate and buffer_size for constant bitrate encoding
+
 == 0.6.7 2010-06-10
 
 * Bugfix - aspect ratio preserver could suggest non even resolutions in certain circumstances 
 
 == 0.6.6 2010-06-10
 
-* Transcodings to .jpg and .png will now work as they will skip duration validation.
+* Transcodings to .jpg and .png will now work as they will skip duration validation
 
 == 0.6.5 2010-05-19
 

data/README.rdoc

@@ -52,11 +52,12 @@ Give custom command line options with a string.
 
   movie.transcode("movie.mp4", "-ac aac -vc libx264 -ac 2 ...")
 
-Use the EncodingOptions parser for humanly readable transcoding options. Below you'll find all the supported options. Note that the :custom key will be used as is without modification so use it for any tricky business you might need.
+Use the EncodingOptions parser for humanly readable transcoding options. Below you'll find most of the supported options. Note that the :custom key will be used as is without modification so use it for any tricky business you might need.
 
   options = {:video_codec => "libx264", :frame_rate => 10, :resolution => "320x240", :video_bitrate => 300,
              :croptop => 60, :cropbottom => 60, :cropleft => 10, :cropright => 10, :aspect => 1.333333,
              :audio_codec => "libfaac", :audio_bitrate => 32, :audio_sample_rate => 22050, :audio_channels => 1,
+             :threads => 2,
              :custom => "-flags +loop -cmp +chroma -partitions +parti4x4+partp8x8 -flags2 +mixed_refs -me_method umh -subq 6 -refs 6 -rc_eq 'blurCplx^(1-qComp)' -coder 0 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qcomp 0.6 -qmin 10 -qmax 51 -qdiff 4 -level 21"}
   movie.transcode("movie.mp4", options)
 
@@ -83,6 +84,11 @@ Preserve aspect ratio on width or height by using the preserve_aspect_ratio tran
   transcoder_options = {:preserve_aspect_ratio => :height}
   widescreen_movie.transcode("movie.mp4", options, transcoder_options) # Output resolution will be 426x240
 
+For constant bitrate encoding use video_min_bitrate and video_max_bitrate with buffer_size.
+
+  options = {:video_min_bitrate => 600, :video_max_bitrate => 600, :buffer_size => 2000}
+  movie.transcode("movie.mp4", options)
+
 == Copyright
 
 Copyright (c) 2010 David Backeus. See LICENSE for details.

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "duztdruid@gmail.com"
     gem.homepage = "http://github.com/streamio/streamio-ffmpeg"
     gem.authors = ["David Backeus"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", "1.3.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/lib/ffmpeg/encoding_options.rb

@@ -1,5 +1,3 @@
-# Include support for -bt -maxrate -minrate -bufsize?
-
 module FFMPEG
   class EncodingOptions < Hash
     def initialize(options = {})
@@ -8,7 +6,7 @@ module FFMPEG
     
     def to_s
       parameters = collect do |key, value|
-        send("convert_#{key}", value) if supports_option?(key)
+        send("convert_#{key}", value) if value && supports_option?(key)
       end.join(" ")
       parameters << " #{convert_aspect(calculate_aspect)}" if calculate_aspect?
       parameters
@@ -70,7 +68,7 @@ module FFMPEG
     end
     
     def convert_video_bitrate(value)
-      "-b #{value}#{k_format(value)}"
+      "-b #{k_format(value)}"
     end
     
     def convert_audio_codec(value)
@@ -78,7 +76,7 @@ module FFMPEG
     end
     
     def convert_audio_bitrate(value)
-      "-ab #{value}#{k_format(value)}"
+      "-ab #{k_format(value)}"
     end
     
     def convert_audio_sample_rate(value)
@@ -89,12 +87,28 @@ module FFMPEG
       "-ac #{value}"
     end
     
+    def convert_video_max_bitrate(value)
+      "-maxrate #{k_format(value)}"
+    end
+    
+    def convert_video_min_bitrate(value)
+      "-minrate #{k_format(value)}"
+    end
+    
+    def convert_buffer_size(value)
+      "-bufsize #{k_format(value)}"
+    end
+    
+    def convert_threads(value)
+      "-threads #{value}"
+    end
+    
     def convert_custom(value)
       value
     end
     
     def k_format(value)
-      "k" unless value.to_s.include?("k")
+      value.to_s.include?("k") ? value : "#{value}k"
     end
   end
 end

data/spec/ffmpeg/encoding_options_spec.rb

@@ -70,10 +70,30 @@ module FFMPEG
         EncodingOptions.new(:audio_channels => 2).to_s.should == "-ac 2"
       end
       
+      it "should convert maximum video bitrate" do
+        EncodingOptions.new(:video_max_bitrate => 600).to_s.should == "-maxrate 600k"
+      end
+      
+      it "should convert mininimum video bitrate" do
+        EncodingOptions.new(:video_min_bitrate => 600).to_s.should == "-minrate 600k"
+      end
+      
+      it "should convert buffer size" do
+        EncodingOptions.new(:buffer_size => 2000).to_s.should == "-bufsize 2000k"
+      end
+      
+      it "should convert threads" do
+        EncodingOptions.new(:threads => 2).to_s.should == "-threads 2"
+      end
+      
       it "should convert a lot of them simultaneously" do
         converted = EncodingOptions.new(:video_codec => "libx264", :audio_codec => "aac", :video_bitrate => "1000k").to_s
         converted.should match(/-acodec aac/)
       end
+      
+      it "should ignore options with nil value" do
+        EncodingOptions.new(:video_codec => "libx264", :frame_rate => nil).to_s.should == "-vcodec libx264 "
+      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.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Backeus"]
-  s.date = %q{2010-06-15}
+  s.date = %q{2010-07-06}
   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 = [
@@ -59,12 +59,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, ["= 1.3.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, ["= 1.3.0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: streamio-ffmpeg
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - David Backeus
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 +02:00
+date: 2010-07-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 27
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 3
+        - 0
+        version: 1.3.0
   type: :development
   version_requirements: *id001
 description: Simple wrapper around ffmpeg to get metadata from movies and do transcoding