streamio-ffmpeg 0.8.4 → 0.8.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.8.5 2011-03-05
+
+* If a clip has a DAR that doesn't make sense fall back to calculating aspect ratio from dimensions
+* Allow filenames with single quote characters (thanks to youpy)
+
 == 0.8.4 2011-11-30
 
 * Duration now one decimal more accurate (thanks to Russel Brooks)

data/lib/ffmpeg/movie.rb

@@ -7,7 +7,7 @@ module FFMPEG
     def initialize(path)
       raise Errno::ENOENT, "the file '#{path}' does not exist" unless File.exists?(path)
       
-      @path = escape(path)
+      @path = path
 
       stdin, stdout, stderr = Open3.popen3("#{FFMPEG.ffmpeg_binary} -i '#{path}'") # Output will land in stderr
       output = stderr.read
@@ -65,13 +65,7 @@ module FFMPEG
     end
     
     def calculated_aspect_ratio
-      if dar
-        w, h = dar.split(":")
-        w.to_f / h.to_f
-      else
-        aspect = width.to_f / height.to_f
-        aspect.nan? ? nil : aspect
-      end
+      aspect_from_dar || aspect_from_dimensions
     end
     
     def size
@@ -95,9 +89,16 @@ module FFMPEG
     end
     
     protected
-    def escape(path)
-      map  =  { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
-      path.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { map[$1] }
+    def aspect_from_dar
+      return nil unless dar
+      w, h = dar.split(":")
+      aspect = w.to_f / h.to_f
+      aspect.zero? ? nil : aspect
+    end
+    
+    def aspect_from_dimensions
+      aspect = width.to_f / height.to_f
+      aspect.nan? ? nil : aspect
     end
     
     def fix_encoding(output)

data/lib/ffmpeg/transcoder.rb

@@ -1,4 +1,5 @@
 require 'open3'
+require 'shellwords'
 
 module FFMPEG
   class Transcoder
@@ -23,7 +24,7 @@ module FFMPEG
     # ffmpeg <  0.8: frame=  413 fps= 48 q=31.0 size=    2139kB time=16.52 bitrate=1060.6kbits/s
     # ffmpeg >= 0.8: frame= 4855 fps= 46 q=31.0 size=   45306kB time=00:02:42.28 bitrate=2287.0kbits/
     def run
-      command = "#{FFMPEG.ffmpeg_binary} -y -i '#{@movie.path}' #{@raw_options} '#{@output_file}'"
+      command = "#{FFMPEG.ffmpeg_binary} -y -i #{Shellwords.escape(@movie.path)} #{@raw_options} '#{@output_file}'"
       FFMPEG.logger.info("Running transcoding...\n#{command}\n")
       output = ""
       last_output = nil

data/lib/ffmpeg/version.rb

@@ -1,3 +1,3 @@
 module FFMPEG
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: streamio-ffmpeg
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70109521076240 !ruby/object:Gem::Requirement
+  requirement: &70155720045540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70109521076240
+  version_requirements: *70155720045540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70109521075560 !ruby/object:Gem::Requirement
+  requirement: &70155720044980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70109521075560
+  version_requirements: *70155720044980
 description: Simple yet powerful wrapper around ffmpeg to get metadata from movies
   and do transcoding.
 email:
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2761617016111549392
+      hash: -4488954591217010798
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,10 +72,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2761617016111549392
+      hash: -4488954591217010798
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Reads metadata and transcodes movies.