vidibus-fileinfo 0.2.0 → 0.3.0

data/README.md

@@ -51,7 +51,7 @@ For images, a hash with following data will be returned:
 :height            # height of image
 :size              # file size in bytes
 :bit               # depth in bit
-:content_type      # content type of image, e.g. "jpeg"
+:content_type      # content type of image, e.g. "image/jpeg"
 :orientation       # visual position e.g. 6 (right top). See "Exif orientation" for more
 :quality           # quality of image
 ```
@@ -67,10 +67,12 @@ jpg, jpeg, png, gif
 For videos, a different hash will be returned:
 
 ``` ruby
-:width             # width of video
+:width             # width of video (without anamorphosis)
 :height            # height of video
+:aspect_ratio      # aspect ratio of video on display (DAR)
 :size              # file size in bytes
 :duration          # duration of video in seconds
+:content_type      # content type of video, e.g. "video/mp4"
 :fps               # frames per second
 :bitrate           # overall bit rate (video + audio)
 :video_codec       # codec of video stream, e.g. "h264"
@@ -81,9 +83,9 @@ For videos, a different hash will be returned:
 These video formats are currently supported:
 
 ```
-avi, flv, h261, h263, h264, ipod, m4v, mov, mp4, mpeg, mxf, ogg
+3g2, 3gp, asf, avi, dv, f4p, f4v, flv, ivf, m21, mj2, mjpg, mkv, mov, mp4, mpeg, mpg, mxf, ogg, ogv, rm, ts, webm, wmv
 ```
 
 ## Copyright
 
-Copyright (c) 2011 Andre Pankratz. See LICENSE for details.
+Copyright (c) 2011-2012 Andre Pankratz. See LICENSE for details.

data/lib/vidibus/fileinfo/processor/video.rb

@@ -2,8 +2,14 @@ module Vidibus
   module Fileinfo
     module Processor
       module Video
-        FORMATS = %w[3g2 3gp asf avi dv f4p f4v flv ivf m21 mj2 mjpg mkv mov mp4 mpeg mpg mxf ogg ogv rm ts webm wmv]
-        METADATA = %w[audio_codec audio_sample_rate content_type bitrate duration fps height size video_codec width]
+        FORMATS = %w[
+          3g2 3gp asf avi dv f4p f4v flv ivf m21 mj2 mjpg mkv mov mp4 mpeg mpg
+          mxf ogg ogv rm ts webm wmv
+        ]
+        METADATA = %w[
+          aspect_ratio audio_codec audio_sample_rate content_type bit_rate bitrate
+          duration fps frame_rate height size video_codec width
+        ]
 
         # FFmpeg command
         def cmd
@@ -30,16 +36,51 @@ module Vidibus
           end
         end
 
-        def bitrate
+        # Return the bit rate defined as "bitrate". Calculate it from
+        # file size and duration otherwise.
+        def bit_rate
           if match = @raw_metadata[/bitrate:\s(\d+)\skb\/s/, 1]
             match.to_i
+          elsif duration && duration > 0
+            (size.to_f/125/duration).round # /125 = /1000 (kB) *8 (bit)
           end
         end
+        alias :bitrate :bit_rate
 
         def content_type
           super('video')
         end
 
+        # Return display aspect ratio defined as DAR.
+        # If no value is defined, calculate it from dimensions.
+        # If no dimensions are given, nothing is returned.
+        def aspect_ratio
+          if matches = @raw_metadata.match(/DAR\s+([0-9]+):([0-9]+)/)
+            w = $1.to_f
+            h = $2.to_f
+          elsif dimension
+            w = dimension[0].to_f
+            h = dimension[1].to_f
+          end
+          if w && h && w > 0 && h > 0
+            w/h
+          end
+        end
+
+        # Return pixel aspect ratio defined as PAR.
+        # If no value is defined, 1.0 will be returned.
+        def pixel_aspect_ratio
+          ar = 1.0
+          if matches = @raw_metadata.match(/PAR\s+([0-9]+):([0-9]+)/)
+            w = $1.to_f
+            h = $2.to_f
+            if w > 0 && h > 0
+              ar = w/h
+            end
+          end
+          ar
+        end
+
         def duration
           if match = @raw_metadata[/Duration:\s+([0-9\:\.]+),/, 1]
             units = match.split(":").map(&:to_f)
@@ -48,25 +89,34 @@ module Vidibus
           end
         end
 
-        def fps
+        def frame_rate
           match = @raw_metadata[/([\d\.]+)\s+fps,/, 1]
           match ||= @raw_metadata[/([\d\.]+)\s+tbr,/, 1]
           if match
             match.to_f
           end
         end
+        alias :fps :frame_rate
 
         def height
           dimension[1] if dimension
         end
 
+        # Return height from dimensions and apply
+        # pixel aspect ratio.
         def width
-          dimension[0] if dimension
+          if dimension
+            w = dimension[0]
+            if pixel_aspect_ratio != 1
+              return (w * pixel_aspect_ratio).round
+            end
+            w
+          end
         end
 
         def dimension
           if match = @raw_metadata[/^.*Video:.*?,.*?(\d+x\d+)/, 1]
-            match.strip.split("x").map(&:to_i)
+            match.strip.split('x').map(&:to_i)
           end
         end
 

data/lib/vidibus/fileinfo/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Fileinfo
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-fileinfo
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-22 00:00:00 +01:00
+date: 2012-04-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency