web_video 1.0.0 → 1.1.0

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Brainberry
+Copyright (c) 2011 Aimbulance
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -78,8 +78,9 @@ Generate flv file. Next example will generate "demo.flv" from "demo.avi".
 
 Generate images from video
 By default screenshot starts at '00:00:01', to change it pass option :at => '00:05:00' (at five minutes)
+Or you can pass :at => :center, to get screenshot from video center
 
-  transcoder.screenshot("demo.jpg", :resolution => "480x360")
+  transcoder.screenshot("demo.jpg", :resolution => "480x360", :at => :center)
   
 Next code will generate five images: demo_01.jpg, demo_02.jpg, demo_03.jpg ...
   
@@ -104,4 +105,4 @@ Next code will generate five images: demo_01.jpg, demo_02.jpg, demo_03.jpg ...
 4. Write more documentation
 5. Write tests
 
-Copyright (c) 2010 Brainberry, released under the MIT license
+Copyright (c) 2011 Aimbulance, released under the MIT license

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require File.join(File.dirname(__FILE__), 'lib', 'web_video', 'version')
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -26,13 +27,13 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "web_video"
-    gemspec.version = '1.0.0'
+    gemspec.version = WebVideo::VERSION.dup
     gemspec.summary = "WebVideo allows you to inspect and process video files"
     gemspec.description = "WebVideo allows you to inspect, convert and take screenshots from video files"
     gemspec.email = "galeta.igor@gmail.com"
     gemspec.homepage = "http://github.com/galetahub/web_video"
     gemspec.authors = ["Igor Galeta"]
-    gemspec.files = FileList["[A-Z]*", "{lib}/**/*"]
+    gemspec.files = FileList["[A-Z]*", "{lib, test}/**/*"]
     gemspec.rubyforge_project = "web_video"
   end
   

data/lib/web_video/adapters/abstract_adapter.rb

@@ -1,7 +1,7 @@
 module WebVideo
   module Adapters
     class AbstractAdapter
-      attr_accessor :filepath, :filename, :path
+      attr_accessor :filepath, :filename, :path, :video_streams
       
       def initialize(filepath, options = {})
         @filepath = filepath
@@ -33,6 +33,14 @@ module WebVideo
         @metadata[:streams]
       end
       
+      def video_stream
+        video_streams.first
+      end
+      
+      def video_streams
+        @video_streams ||= streams.select{ |stream| stream.video? }
+      end
+      
       def command_name
         ''
       end

data/lib/web_video/adapters/ffmpeg_adapter.rb

@@ -52,7 +52,7 @@ module WebVideo
           if installed?
             metadata = {}
             
-            ffmpeg_output = WebVideo::Tools.run(command_name, "-i #{@filepath}", [0,1])
+            ffmpeg_output = WebVideo::Tools.run(command_name, "-i #{@filepath.inspect}", [0,1])
             
             metadata[:duration] = $1 if ffmpeg_output =~ /Duration\: ([0-9][0-9]\:[0-9][0-9]\:[0-9][0-9]\.[0-9][0-9])\,/
             metadata[:bitrate] = $1 if ffmpeg_output =~ /\, bitrate\: (.*)$/

data/lib/web_video/stream.rb

@@ -1,6 +1,6 @@
 module WebVideo
   class Stream
-    attr_accessor :type, :codec, :details
+    attr_accessor :type, :codec, :details, :resolution
     
     #
     # stream = Stream.new :type => 'Video', :codec => 'mpeg4', :details => 'yuv420p, 640x480 [PAR 1:1 DAR 4:3], 30 tbr, 30 tbn, 30 tbc'
@@ -13,6 +13,7 @@ module WebVideo
       @type = options[:type].to_s.downcase
       @codec = options[:codec]
       @details = options[:details]
+      @resolution = extract_resolution_from_details(@details)
     end
     
     def video?
@@ -22,5 +23,21 @@ module WebVideo
     def audio?
       @type == 'audio'
     end
+    
+    def width
+      @resolution ? @resolution[/^\d+/] : nil
+    end
+    
+    def height
+      @resolution ? @resolution[/\d+$/] : nil
+    end
+    
+    private
+      def extract_resolution_from_details(details)
+        return nil if details.blank?
+        
+        result = details[/\s\d+x\d+\s/]
+        result.blank? ? nil : result.strip 
+      end
   end
 end

data/lib/web_video/transcoder.rb

@@ -41,14 +41,19 @@ module WebVideo
     # options:
     #   :count  - count images to generate
     #   :format - image decoder
-    #   :at     - time to start make screenshots from
+    #   :at     - sets that image should be taken from the point x seconds from the beginning
     #   :resolution - image resolution
     def screenshot(destination, options = {}, &block)
-      options.symbolize_keys!
+      options = { 
+        :count => 1, 
+        :format => "image2", 
+        :at => "00:00:01" 
+      }.merge(options.symbolize_keys)
       
-      options[:count] ||= 1
-      options[:format] ||= "image2"
-      options[:at] ||= "00:00:01"
+      # Calculate middle video position
+      if options[:at].is_a?(Symbol) && [:center, :middle].include?(options[:at])
+        options[:at] = @source.duration_in_seconds / 2
+      end
       
       process(destination, @source.screenshot_command, options, &block)
     end

data/lib/web_video/version.rb

@@ -0,0 +1,3 @@
+module WebVideo
+  VERSION = "1.1.0".freeze
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: web_video
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Igor Galeta
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 +03:00
+date: 2011-05-06 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -36,36 +37,40 @@ files:
 - lib/web_video/stream.rb
 - lib/web_video/tools.rb
 - lib/web_video/transcoder.rb
+- lib/web_video/version.rb
 has_rdoc: true
 homepage: http://github.com/galetahub/web_video
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: web_video
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: WebVideo allows you to inspect and process video files
-test_files: 
-- test/web_video_test.rb
-- test/test_helper.rb
+test_files: []
+

data/test/test_helper.rb

@@ -1,3 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'active_support'

data/test/web_video_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class WebVideoTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end