falcon 0.1.2 → 0.1.3

data/README.rdoc

@@ -18,13 +18,12 @@ By default avariable two profiles "web_mp4" and "web_ogg":
   
   Falcon::Profile.new("web_mp4", {:player => 'flash', :container => "mp4", :extname => 'mp4',
     :width => 480, :height => 320, :video_codec => "libx264",
-    :video_bitrate => 500, :fps => 29.97, :audio_codec => "libfaac",
-    :command => "-vpre medium",
-    :audio_bitrate => 128, :audio_sample_rate => 48000})
-  
+    :command => "-vpre slow -crf 22", :video_bitrate => 500, :fps => 29.97, 
+    :audio_codec => "libfaac", :audio_bitrate => 128, :audio_sample_rate => 48000})
+
   Falcon::Profile.new("web_ogg", {:player => 'html5', :container => "ogg", :extname => 'ogv',
-    :width => 480, :height => 320, :video_codec => "libtheora",
-    :video_bitrate => 500, :fps => 29.97, :audio_codec => "libvorbis",
+    :width => 480, :height => 320, :video_codec => "libtheora", :command => '-g 300',
+    :video_bitrate => 1000, :fps => 29.97, :audio_codec => "libvorbis",
     :audio_bitrate => 128, :audio_sample_rate => 48000})
 
 === Update profiles
@@ -157,3 +156,4 @@ For delayed_job:
     end
   end
   
+Copyright © 2011 Aimbulance, released under the MIT license

data/lib/falcon/encoder.rb

@@ -62,7 +62,6 @@ module Falcon
           :input_file => input_file,
           :output_file => output_file,
           :resolution => self.ffmpeg_resolution
-          #:resolution_and_padding => self.ffmpeg_resolution_and_padding_no_cropping
         })
       end
       
@@ -133,10 +132,10 @@ module Falcon
           end
         end
         
+        # Calculate resolution and any padding
         def ffmpeg_resolution_and_padding_no_cropping(v_width, v_height)
-          # Calculate resolution and any padding
-          in_w = v_width.to_f #self.video.width.to_f
-          in_h = v_height.to_f #self.video.height.to_f
+          in_w = v_width.to_f
+          in_h = v_height.to_f
           out_w = self.width.to_f
           out_h = self.height.to_f
 
@@ -144,35 +143,35 @@ module Falcon
             aspect = in_w / in_h
             aspect_inv = in_h / in_w
           rescue
-            #Merb.logger.error "Couldn't do w/h to caculate aspect. Just using the output resolution now."
-            @ffmpeg_resolution = %(#{self.width}x#{self.height} )
+            Rails.logger.error "Couldn't do w/h to caculate aspect. Just using the output resolution now."
+            @ffmpeg_resolution = "#{self.width}x#{self.height}"
             return 
           end
 
           height = (out_w / aspect.to_f).to_i
           height -= 1 if height % 2 == 1
 
-          @ffmpeg_resolution = %(#{self.width}x#{height} )
+          @ffmpeg_resolution = "#{self.width}x#{height}"
 
           # Keep the video's original width if the height
           if height > out_h
             width = (out_h / aspect_inv.to_f).to_i
             width -= 1 if width % 2 == 1
 
-            @ffmpeg_resolution = %(#{width}x#{self.height} )
+            @ffmpeg_resolution = "#{width}x#{self.height}"
             self.width = width
-            self.save
+            self.save(:validate => false)
           # Otherwise letterbox it
           elsif height < out_h
             pad = ((out_h - height.to_f) / 2.0).to_i
             pad -= 1 if pad % 2 == 1
-            @ffmpeg_padding = %(-padtop #{pad} -padbottom #{pad})
+            @ffmpeg_padding = "-vf pad=#{self.width}:#{height + pad}:0:#{pad / 2}"
           end
         end
         
-        def encode_source  
-          #stream = transcoder.source.video_stream
-          ffmpeg_resolution_and_padding_no_cropping(self.width, self.height)
+        def encode_source
+          stream = transcoder.source.video_stream
+          ffmpeg_resolution_and_padding_no_cropping(stream.width, stream.height)
           options = self.profile_options(self.source_path, output_path)
           
           begin
@@ -200,7 +199,7 @@ module Falcon
                 end
               end
               
-              command << @ffmpeg_padding
+              command << self.ffmpeg_padding
               command << "-y"
             end
           rescue ::WebVideo::CommandLineError => e

data/lib/falcon/media.rb

@@ -115,7 +115,7 @@ module Falcon
     
     # Yield generated screenshots and remove them
     def screenshots(&block)
-      Dir.glob("#{output_directory}/*.{jpg,JPG}").each do |filepath|
+      Dir.glob(File.join(output_directory, '*.{jpg,JPG}').to_s).each do |filepath|
   	    yield filepath
   	    FileUtils.rm(filepath, :force => true)
   	  end

data/lib/falcon/profiles.rb

@@ -1,9 +1,9 @@
 Falcon::Profile.new("web_mp4", {:player => 'flash', :container => "mp4", :extname => 'mp4',
   :width => 480, :height => 320, :video_codec => "libx264",
-  :video_bitrate => 500, :fps => 29.97, :audio_codec => "libfaac",
-  :audio_bitrate => 128, :audio_sample_rate => 48000})
+  :command => "-vpre slow -crf 22", :video_bitrate => 500, :fps => 29.97, 
+  :audio_codec => "libfaac", :audio_bitrate => 128, :audio_sample_rate => 48000})
 
 Falcon::Profile.new("web_ogg", {:player => 'html5', :container => "ogg", :extname => 'ogv',
-  :width => 480, :height => 320, :video_codec => "libtheora",
-  :video_bitrate => 500, :fps => 29.97, :audio_codec => "libvorbis",
+  :width => 480, :height => 320, :video_codec => "libtheora", :command => '-g 300',
+  :video_bitrate => 1000, :fps => 29.97, :audio_codec => "libvorbis",
   :audio_bitrate => 128, :audio_sample_rate => 48000})

data/lib/falcon/version.rb

@@ -1,3 +1,3 @@
 module Falcon
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: falcon
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Igor Galeta
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 +03:00
+date: 2011-06-30 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 23
         segments: 
         - 1
         - 1
-        - 1
-        version: 1.1.1
+        - 2
+        version: 1.1.2
   name: web_video
   version_requirements: *id001
   prerelease: false