web_video 1.1.0 → 1.1.1

data/README.rdoc

@@ -1,29 +1,30 @@
-=WebVideo
+= WebVideo
 
 WebVideo allows you to inspect and process video files.
 
-==Installation
-You need install 'ffmpeg' liblary ant it's dependent's...
+== Install
 
-===Mac OS
-  sudo port install ffmpeg +lame +libogg +vorbis +faac +faad +xvid +x264 +a52
+  gem 'web_video'
+
+== Dependencies
+
+You need install 'ffmpeg' liblary and it's dependent's...
+
+== Linux
+
+Install instructions for Ubuntu: http://ubuntuforums.org/showthread.php?t=786095
 
-===Linux (Ubuntu)
   sudo apt-get install ffmpeg
   sudo apt-get install libfaac-dev libxvidcore4-dev liba52-0.7.4 liba52-0.7.4-dev libx264-dev
   sudo apt-get install libavutil49 libavutil-dev libavcodec-dev
   sudo apt-get install libavcodec-unstripped-52
 
-===Install "WebVideo" via plugin
-  rails plugin install http://github.com/galetahub/web_video.git
+=== MacOS
 
-===Install "WebVideo" via gem
-Directly from repository:
-  sudo gem install web_video
-Or in your application "Gemfile":
-  gem "web_video"
+  sudo port install ffmpeg +lame +libogg +vorbis +faac +faad +xvid +x264 +a52
+  
+== Logger
 
-==Logger
 You can put it in "config/initializers/web_video.rb".
 
   logfile = File.open(Rails.root.join('log', 'video.log'), 'w')
@@ -31,9 +32,10 @@ You can put it in "config/initializers/web_video.rb".
 
   WebVideo.logger = Logger.new(logfile)
 
-==Example
+== Usage
 
 Read video information
+
   video = WebVideo::Adapters::FfmpegAdapter.new('demo.avi')
   
   video.filename # => "demo.avi"
@@ -49,11 +51,15 @@ Read video information
     #   #<WebVideo::Stream @codec="mp3", @type="Audio", @details="44100 Hz, stereo, s16, 128 kb/s">]
 
 Video Convertation
+
   transcoder = WebVideo::Transcoder.new("demo.avi")
+  
 or
+
   transcoder = WebVideo::Transcoder.new(video)
 
 Transcoder attributes
+
   transcoder.adapter # => :ffmpeg
   
   transcoder.source  # => return WebVideo::Adapters::FfmpegAdapter instance (video)
@@ -98,7 +104,8 @@ Next code will generate five images: demo_01.jpg, demo_02.jpg, demo_03.jpg ...
     WebVideo.logger.error("Unable to transcode video: #{e.class} - #{e.message}")
   end
 
-==TODO
+== TODO
+
 1. Add adapter for support 'mencoder' tool
 2. More information about video file (class Stream must parse details)
 3. Add support for 'flvtool2'

data/lib/web_video/adapters/ffmpeg_adapter.rb

@@ -4,8 +4,10 @@ module WebVideo
       
       # 00:21:41.18
       def duration_in_seconds
-        if @metadata[:duration] =~ /([0-9][0-9])\:([0-9][0-9])\:([0-9][0-9])\.([0-9][0-9])/
+        if @metadata[:duration] =~ /(\d+)\:(\d+)\:(\d+)\.(\d+)/
           ( $1.to_i * 60 * 60 ) + ( $2.to_i * 60 ) + ( $3.to_i ) + ( ($4.to_i/100) * 60 )
+        else
+          0
         end
       end
       
@@ -50,17 +52,15 @@ module WebVideo
       private
         def parse
           if installed?
-            metadata = {}
+            metadata = { :streams => [] }
             
             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\: (.*)$/
+            metadata[:duration] = $1 if ffmpeg_output =~ /Duration\:\s+(\d+\:\d+\:\d+\.\d+)\,/i
+            metadata[:bitrate] = $1 if ffmpeg_output =~ /\,\s+bitrate\:\s+(.*)$/i
             
-            metadata[:streams] = []
-            
-            ffmpeg_output.scan(/stream #0.([0-9])(\[.+\])?:\s(.*):\s([^,]*),\s(.*)/i).each do |match|
-              metadata[:streams] << WebVideo::Stream.new(:type => match[2], :codec => match[3], :details => match[4])
+            ffmpeg_output.scan(/Stream\s+#0.(\d+)(\[.+\])?(\(.+\))?:\s(.*):\s([^,]*),\s(.*)/i).each do |match|
+              metadata[:streams] << WebVideo::Stream.new(:type => match[4], :codec => match[5], :details => match[5])
             end
             
             return metadata

data/lib/web_video/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: web_video
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Igor Galeta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +03:00
+date: 2011-05-10 00:00:00 +03:00
 default_executable: 
 dependencies: []