kakra-rvideo 0.9.6.3 → 0.9.6.6

data/lib/rvideo/frame_capturer.rb

@@ -50,7 +50,7 @@ module RVideo
       
       @offset, @rate, @limit, @output = parse_options options
       
-      @command = "ffmpeg -i #{@input.shell_quoted} -ss #{@offset} -r #{@rate} #{@output.shell_quoted}"
+      @command = "ffmpeg -i #{@input.shell_quoted} -ss #{@offset} -r #{@rate} -f image2 -vframes 1 #{@output.shell_quoted}"
     end
     
     def capture!
@@ -58,7 +58,9 @@ module RVideo
       frame_result = `#{@command} 2>&1`
       RVideo.logger.info("\nScreenshot results: #{frame_result}")
     
-      Dir[File.expand_path(@output).sub("%d", "*")].entries
+      # TODO: Fix
+      #Dir[File.expand_path(@output).sub("%d", "*")].entries
+      [@output]
     end
   
     VALID_TIMECODE_FORMAT = /\A([0-9.,]*)(s|f|%)?\Z/

data/lib/rvideo/inspector.rb

@@ -460,19 +460,19 @@ module RVideo # :nodoc:
 	# FIXME tbn/tbc may need braced alternatives, too: tb(n) / tb(c) - not tested
 	# not fixing as of yet because it renumbers backrefs
     VIDEO_MATCH_PATTERN = /
-      Stream\s*(\#[\d.]+)(?:[\(\[].+?[\)\]])?\s*                # stream id
-      [,:]\s*                                                   
-      (?:#{RATE}\s*#{FPS}[,:]\s*)?                              # frame rate, older builds
-      Video:\s*                                                 
-      #{VAL}#{SEP}                                              # codec
-      (?:#{VAL}#{SEP})?                                         # color space
-      (\d+)x(\d+)#{SEP}?                                        # resolution
-      (?:\s*\[?(?:PAR\s*(\d+:\d+))?\s*(?:DAR\s*(\d+:\d+))?\]?)? # pixel and display aspect ratios
+      Stream\s*(\#[\d.]+)(?:[\(\[].+?[\)\]])?\s*                  # stream id
+      [,:]\s*                                                     
+      (?:#{RATE}\s*#{FPS}[,:]\s*)?                                # frame rate, older builds
+      Video:\s*                                                   
+      #{VAL}#{SEP}                                                # codec
+      (?:#{VAL}#{SEP})?                                           # color space
+      (\d+)x(\d+)                                                 # resolution
+        (?:\s*\[?(?:PAR\s*(\d+:\d+))?\s*(?:DAR\s*(\d+:\d+))?\]?)? # pixel and display aspect ratios
         #{SEP}?
-      (?:#{RATE}\s*(kb\/s)#{SEP}?)?                             # video bit rate
-      (?:#{RATE}\s*(?:tbr|tb\(r\)|#{FPS})#{SEP}?)?              # frame rate
-      (?:#{RATE}\s*tbn#{SEP}?)?                                 # time base
-      (?:#{RATE}\s*tbc#{SEP}?)?                                 # codec time base
+      (?:#{RATE}\s*(kb\/s)#{SEP}?)?                               # video bit rate
+      (?:#{RATE}\s*(?:tb\(?r\)?|#{FPS})#{SEP}?)?                  # frame rate
+      (?:#{RATE}\s*tbn#{SEP}?)?                                   # time base
+      (?:#{RATE}\s*tbc#{SEP}?)?                                   # codec time base
     /x
     
     def video_match

data/lib/rvideo/tools/abstract_tool.rb

@@ -60,10 +60,10 @@ module RVideo # :nodoc:
           # nice the command if option :nice was given
           # accepts a number 1..19 (nice value) or anything evaluating to true
           unless RUBY_PLATFORM.downcase.include?("mswin")
-            if @options.has_key? :nice
-              if (1..19) === @options[:nice]
-                final_command = "nice -n#{@options[:nice]} #{final_command}"
-              elsif @options[:nice]
+            if @options.has_key? 'nice'
+              if (1..19) === @options['nice']
+                final_command = "nice -n#{@options['nice']} #{final_command}"
+              elsif @options['nice']
                 final_command = "nice #{final_command}"
               end
             end

data/lib/rvideo/tools/ffmpeg.rb

@@ -120,6 +120,15 @@ module RVideo
         "-ar #{params[:sample_rate]}"
       end
       
+      def get_resolution
+        if @options['resolution'] && @options['resolution'].match(/(\d+)x(\d+)/)
+          options['width'] = $1
+          options['height'] = $2
+          get_specific_resolution
+        else
+          super
+        end
+      end
       
       private
       

data/rvideo.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvideo}
-  s.version = "0.9.6.3"
+  s.version = "0.9.6.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Boling, Jonathan Dahl (Slantwise Design), Seth Thomas Rasmussen, Kai Krakow"]
-  s.date = %q{2009-04-05}
+  s.date = %q{2009-05-16}
   s.description = %q{Inspect and transcode video and audio files.}
   s.email = %q{sethrasmussen@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/rvideo/errors.rb", "lib/rvideo/float.rb", "lib/rvideo/frame_capturer.rb", "lib/rvideo/inspector.rb", "lib/rvideo/reporter/views/index.html.erb", "lib/rvideo/reporter/views/report.css", "lib/rvideo/reporter/views/report.html.erb", "lib/rvideo/reporter/views/report.js", "lib/rvideo/reporter.rb", "lib/rvideo/string.rb", "lib/rvideo/tools/abstract_tool.rb", "lib/rvideo/tools/ffmpeg.rb", "lib/rvideo/tools/ffmpeg2theora.rb", "lib/rvideo/tools/flvtool2.rb", "lib/rvideo/tools/mencoder.rb", "lib/rvideo/tools/mp4box.rb", "lib/rvideo/tools/mp4creator.rb", "lib/rvideo/tools/mplayer.rb", "lib/rvideo/tools/qtfaststart.rb", "lib/rvideo/tools/yamdi.rb", "lib/rvideo/transcoder.rb", "lib/rvideo/version.rb", "lib/rvideo.rb", "LICENSE", "README", "tasks/deployment.rake", "tasks/testing.rake", "tasks/transcoding.rake", "tasks/website.rake"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--quiet", "--title", "rvideo documentation", "--opname", "index.html", "--line-numbers", "--main", "README", "--inline-source"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rvideo}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Inspect and transcode video and audio files.}
 
   if s.respond_to? :specification_version then

data/spec/integrations/inspection_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 
 module RVideo
   describe Inspector, "with boat.avi" do
-    setup do
+    before :each do
       @i = Inspector.new :file => spec_file("boat.avi")
     end
     
@@ -97,7 +97,7 @@ module RVideo
   end
   
   describe Inspector, "with kites.mp4" do
-    setup do
+    before :each do
       @i = Inspector.new :file => spec_file("kites.mp4")
     end
     
@@ -109,4 +109,4 @@ module RVideo
       assert_equal "11:9", @i.display_aspect_ratio
     end
   end
-end
+end

data/spec/units/abstract_tool_spec.rb

@@ -57,6 +57,18 @@ module RVideo
       it "should ignore extra options (not needed by the recipe)" do
         Ffmpeg.new(@simple_avi, @options.merge(:foo => "bar"))
       end
+
+      # FIXME This won't work here as final_command is not exposed to the testing framework and it will work different on mswin32 if not at all - needs fixing
+      #
+      #it "should be nice if given :nice => true" do
+      #  ffmpeg = Ffmpeg.new(@simple_avi, @options.merge(:nice => true))
+      #  ffmpeg.command.should == "nice ffmpeg -i '#{@options[:input_file]}' -ar 44100 -ab 64 -vcodec xvid -acodec mp3 -r 29.97 -y '#{@options[:output_file]}'"
+      #end
+      #
+      #it "should be nice if given an arbitrary :nice value" do
+      #  ffmpeg = Ffmpeg.new(@simple_avi, @options.merge(:nice => 12))
+      #  ffmpeg.command.should == "nice -n12 ffmpeg -i '#{@options[:input_file]}' -ar 44100 -ab 64 -vcodec xvid -acodec mp3 -r 29.97 -y '#{@options[:output_file]}'"
+      #end
       
       it "should interpolate variables successfully" do
         ffmpeg = Ffmpeg.new(@simple_avi, @options)

data/spec/units/frame_capturer_spec.rb

@@ -15,7 +15,7 @@ describe FrameCapturer, "calculating offset from a timecode argument" do
   end
   
   it "should calculate a timecode, when given a frame" do
-    @file.inspector.fps.should == "10.00"
+    @file.inspector.fps.should == "10"
     @file.calculate_time("10f").should be_close(1.0, 0.1)
     @file.calculate_time("27.6f").should be_close(2.76, 0.1)
     
@@ -49,7 +49,7 @@ describe FrameCapturer, "calculating offset from a timecode argument" do
   it "captures one frame at the start with no arguments" do
     f = FrameCapturer.new :input => spec_file('kites.mp4')
     assert_equal \
-      %{ffmpeg -i '#{f.input}' -ss 0 -r 1 '#{f.output}'},
+      %{ffmpeg -i '#{f.input}' -ss 0 -r 1 -f image2 -vframes 1 '#{f.output}'},
       f.command
   end
   
@@ -57,7 +57,7 @@ describe FrameCapturer, "calculating offset from a timecode argument" do
     f = FrameCapturer.new :input => spec_file('kites.mp4'),
       :offset => 10
     assert_equal \
-      %{ffmpeg -i '#{f.input}' -ss 10.0 -r 1 '#{f.output}'},
+      %{ffmpeg -i '#{f.input}' -ss 10.0 -r 1 -f image2 -vframes 1 '#{f.output}'},
       f.command
   end
   
@@ -65,7 +65,7 @@ describe FrameCapturer, "calculating offset from a timecode argument" do
     f = FrameCapturer.new :input => spec_file('kites.mp4'),
       :interval => 5
     assert_equal \
-      %{ffmpeg -i '#{f.input}' -ss 0 -r 0.2 '#{f.output}'},
+      %{ffmpeg -i '#{f.input}' -ss 0 -r 0.2 -f image2 -vframes 1 '#{f.output}'},
       f.command
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kakra-rvideo
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.3
+  version: 0.9.6.6
 platform: ruby
 authors: 
 - Peter Boling, Jonathan Dahl (Slantwise Design), Seth Thomas Rasmussen, Kai Krakow
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -07:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency