streamio-ffmpeg 0.6.8.1 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.7.0 2010-07-07
+
+* Support for ffpresets through video_preset, audio_preset and file_preset encoding options
+* Added encoding option video_bitrate_tolerance
+
 == 0.6.8.1 2010-07-06
 
 * Bugfix - aspect ratio was not calculated properly on movies with no DAR

data/README.rdoc

@@ -54,7 +54,7 @@ Give custom command line options with a string.
 
 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,
+  options = {:video_codec => "libx264", :frame_rate => 10, :resolution => "320x240", :video_bitrate => 300, :video_bitrate_tolerance => 100,
              :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,
@@ -87,7 +87,12 @@ Preserve aspect ratio on width or height by using the preserve_aspect_ratio tran
 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)
+  movie.transcode("movie.flv", options)
+
+Use ffpreset files to avoid headaches when encoding with libx264 (http://www.ffmpeg.org/ffmpeg-doc.html#SEC13).
+
+  options = {:video_codec => "libx264", :video_preset => "medium"} # audio_preset and file_preset also availible
+  movie.transcode("movie.mp4", options) # encodes video using libx264-medium.ffpreset
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.6.8.1
+0.7.0

data/lib/ffmpeg/encoding_options.rb

@@ -99,10 +99,26 @@ module FFMPEG
       "-bufsize #{k_format(value)}"
     end
     
+    def convert_video_bitrate_tolerance(value)
+      "-bt #{k_format(value)}"
+    end
+    
     def convert_threads(value)
       "-threads #{value}"
     end
     
+    def convert_video_preset(value)
+      "-vpre #{value}"
+    end
+    
+    def convert_audio_preset(value)
+      "-apre #{value}"
+    end
+    
+    def convert_file_preset(value)
+      "-fpre #{value}"
+    end
+    
     def convert_custom(value)
       value
     end

data/spec/ffmpeg/encoding_options_spec.rb

@@ -78,6 +78,10 @@ module FFMPEG
         EncodingOptions.new(:video_min_bitrate => 600).to_s.should == "-minrate 600k"
       end
       
+      it "should convert video bitrate tolerance" do
+        EncodingOptions.new(:video_bitrate_tolerance => 100).to_s.should == "-bt 100k"
+      end
+      
       it "should convert buffer size" do
         EncodingOptions.new(:buffer_size => 2000).to_s.should == "-bufsize 2000k"
       end
@@ -86,6 +90,18 @@ module FFMPEG
         EncodingOptions.new(:threads => 2).to_s.should == "-threads 2"
       end
       
+      it "should convert video preset" do
+        EncodingOptions.new(:video_preset => "max").to_s.should == "-vpre max"
+      end
+      
+      it "should convert audio preset" do
+        EncodingOptions.new(:audio_preset => "max").to_s.should == "-apre max"
+      end
+      
+      it "should convert file preset" do
+        EncodingOptions.new(:file_preset => "max.ffpreset").to_s.should == "-fpre max.ffpreset"
+      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/)

data/streamio-ffmpeg.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{streamio-ffmpeg}
-  s.version = "0.6.8.1"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Backeus"]
-  s.date = %q{2010-07-06}
+  s.date = %q{2010-07-07}
   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 = [

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: streamio-ffmpeg
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 8
-  - 1
-  version: 0.6.8.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - David Backeus
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +02:00
+date: 2010-07-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency