kakra-rvideo 0.9.6.6 → 0.9.6.7

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} -f image2 -vframes 1 #{@output.shell_quoted}"
+      @command = "ffmpeg -i #{@input.shell_quoted} -ss #{@offset} -r #{@rate} -f image2 #{"-vframes #{@limit} " if @limit}#{@output.shell_quoted}"
     end
     
     def capture!
@@ -100,12 +100,11 @@ module RVideo
       offset = options[:offset] ? calculate_time(options[:offset]) : 0
       rate   = options[:interval] ? (1 / options[:interval].to_f) : 1
       
-      limit  = nil
-      # if options[:limit]
-      #   options[:limit]
-      # elsif not options[:interval]
-      #   1
-      # end
+      limit  = if options[:limit]
+                  options[:limit]
+                elsif not options[:interval]
+                  1
+                end
       
       output = if options[:output]
         options[:output]
@@ -126,4 +125,4 @@ module RVideo
       [offset, rate, limit, output]
     end
   end
-end
+end

data/lib/rvideo/inspector.rb

@@ -466,13 +466,13 @@ module RVideo # :nodoc:
       Video:\s*                                                   
       #{VAL}#{SEP}                                                # codec
       (?:#{VAL}#{SEP})?                                           # color space
-      (\d+)x(\d+)                                                 # resolution
+      (\d+)x(\d+)#{SEP}?                                          # 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*(?:tb\(?r\)?|#{FPS})#{SEP}?)?                  # frame rate
-      (?:#{RATE}\s*tbn#{SEP}?)?                                   # time base
-      (?:#{RATE}\s*tbc#{SEP}?)?                                   # codec time base
+      (?:#{RATE}\s*tb\(?n\)?#{SEP}?)?                             # time base
+      (?:#{RATE}\s*tb\(?c\)?#{SEP}?)?                             # codec time base
     /x
     
     def video_match

data/lib/rvideo/tools/ffmpeg.rb

@@ -122,8 +122,8 @@ module RVideo
       
       def get_resolution
         if @options['resolution'] && @options['resolution'].match(/(\d+)x(\d+)/)
-          options['width'] = $1
-          options['height'] = $2
+          @options['width'] = $1
+          @options['height'] = $2
           get_specific_resolution
         else
           super

data/rvideo.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvideo}
-  s.version = "0.9.6.6"
+  s.version = "0.9.6.7"
 
   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-05-16}
+  s.date = %q{2009-07-03}
   s.description = %q{Inspect and transcode video and audio files.}
-  s.email = %q{sethrasmussen@gmail.com}
+  s.email = %q{hurikhan77@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"]
   s.files = ["CHANGELOG", "config/boot.rb", "ENV", "ENV2", "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", "Manifest", "Rakefile", "README", "RULES", "rvideo.gemspec", "scripts/txt2html", "setup.rb", "spec/files/boat.avi", "spec/files/kites.mp4", "spec/fixtures/ffmpeg_builds.yml", "spec/fixtures/ffmpeg_results.yml", "spec/fixtures/files.yml", "spec/fixtures/recipes.yml", "spec/integrations/formats_spec.rb", "spec/integrations/frame_capturer_spec.rb", "spec/integrations/inspection_spec.rb", "spec/integrations/recipes_spec.rb", "spec/integrations/rvideo_spec.rb", "spec/integrations/transcoder_integration_spec.rb", "spec/integrations/transcoding_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/support.rb", "spec/units/abstract_tool_spec.rb", "spec/units/ffmpeg_spec.rb", "spec/units/flvtool2_spec.rb", "spec/units/frame_capturer_spec.rb", "spec/units/inspector_spec.rb", "spec/units/mencoder_spec.rb", "spec/units/mp4box_spec.rb", "spec/units/mp4creator_spec.rb", "spec/units/mplayer_spec.rb", "spec/units/qtfaststart_spec.rb", "spec/units/string_spec.rb", "spec/units/transcoder_spec.rb", "tasks/deployment.rake", "tasks/testing.rake", "tasks/transcoding.rake", "tasks/website.rake"]
   s.has_rdoc = true
-  s.homepage = %q{http://github.com/greatseth/rvideo}
+  s.homepage = %q{http://github.com/kakra/rvideo}
   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}

data/spec/units/ffmpeg_spec.rb

@@ -81,6 +81,12 @@ module RVideo
         ffmpeg.command.should == "ffmpeg -i '#{@options[:input_file]}' -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 -s 480x360 -y '#{@options[:output_file]}'"
       end
       
+      it 'supports :resolution' do
+        @options.merge! :resolution => "640x360"
+        ffmpeg = Ffmpeg.new("ffmpeg -i $input_file$ -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 $resolution$ -y $output_file$", @options)
+        ffmpeg.command.should == "ffmpeg -i '#{@options[:input_file]}' -ar 44100 -ab 64 -vcodec xvid -acodec libmp3lame -r 29.97 -s 640x360 -y '#{@options[:output_file]}'"
+      end
+      
       ###
       
       it 'supports :video_bit_rate' do

data/spec/units/frame_capturer_spec.rb

@@ -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 image2 -vframes 1 '#{f.output}'},
+      %{ffmpeg -i '#{f.input}' -ss 0 -r 0.2 -f image2 '#{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.6
+  version: 0.9.6.7
 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-05-16 00:00:00 -07:00
+date: 2009-07-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
         version: "0"
     version: 
 description: Inspect and transcode video and audio files.
-email: sethrasmussen@gmail.com
+email: hurikhan77@gmail.com
 executables: []
 
 extensions: []
@@ -138,7 +138,7 @@ files:
 - tasks/transcoding.rake
 - tasks/website.rake
 has_rdoc: true
-homepage: http://github.com/greatseth/rvideo
+homepage: http://github.com/kakra/rvideo
 post_install_message: 
 rdoc_options: 
 - --quiet