web_video 1.1.1 → 1.1.2

data/lib/web_video/adapters/ffmpeg_adapter.rb

@@ -60,7 +60,7 @@ module WebVideo
             metadata[:bitrate] = $1 if ffmpeg_output =~ /\,\s+bitrate\:\s+(.*)$/i
             
             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])
+              metadata[:streams] << WebVideo::Stream.new(:type => match[3], :codec => match[4], :details => match[5])
             end
             
             return metadata

data/lib/web_video/stream.rb

@@ -1,6 +1,6 @@
 module WebVideo
   class Stream
-    attr_accessor :type, :codec, :details, :resolution
+    attr_accessor :type, :codec, :details, :width, :height
     
     #
     # stream = Stream.new :type => 'Video', :codec => 'mpeg4', :details => 'yuv420p, 640x480 [PAR 1:1 DAR 4:3], 30 tbr, 30 tbn, 30 tbc'
@@ -13,7 +13,8 @@ module WebVideo
       @type = options[:type].to_s.downcase
       @codec = options[:codec]
       @details = options[:details]
-      @resolution = extract_resolution_from_details(@details)
+      
+      extract_resolution_from_details
     end
     
     def video?
@@ -24,20 +25,19 @@ module WebVideo
       @type == 'audio'
     end
     
-    def width
-      @resolution ? @resolution[/^\d+/] : nil
-    end
-    
-    def height
-      @resolution ? @resolution[/\d+$/] : nil
+    def resolution
+      if width && height
+        "#{width}x#{height}"
+      end
     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 
+    
+      def extract_resolution_from_details
+        if @details =~ /[\s+\,](\d+)x(\d+)[\s+\,]/
+          @width = $1.to_i
+          @height = $2.to_i
+        end
       end
   end
 end

data/lib/web_video/version.rb

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

metadata

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