mediainfo 0.5.1 → 0.6.0

data/Changelog

@@ -1,14 +1,19 @@
+v0.6.0 XML Output
+- v0.7.25 of the Mediainfo CLI is now required, as the Mediainfo class'
+  parsing implementation is now based on parsing XML output. REXML will 
+  be used by default, but Hpricot and Nokogiri are also supported.
+
 v0.5.1 Packaging Fix
 - Gemspec was referencing a missing file
 - Behold: THREE DIGIT VERSION NUMBER. Serious business now!
 
-v0.5 Raw, Son
+v0.5.0 Raw, Son
 - You can now initialize an instance from raw CLI output
 
-v0.4 Mediainfo Respects Your Existing Customs
+v0.4.0 Mediainfo Respects Your Existing Customs
 - Define String#shell_escape only if it is not already defined
 
-v0.3 Mediainfo Is High Class
+v0.3.0 Mediainfo Is High Class
 - Class instead of instance-level customization of mediainfo binary path. 
   Set Mediainfo.path = /path/to/binary if mediainfo is not in your shell 
   path.
@@ -18,7 +23,7 @@ v0.3 Mediainfo Is High Class
   Mediainfo::ExecutionError instead of RuntimeError if the system command 
   exits with anything other than 0.
 
-v0.2 Escape from the Shell
+v0.2.0 Escape from the Shell
 - Added proper escaping for funky filenames. Thanks to Peter Vandenberk!
 
-v0.1 Initial Release
+v0.1.0 Initial Release

data/README.markdown

@@ -2,37 +2,37 @@
 
 Mediainfo is a class wrapping [the mediainfo CLI](http://mediainfo.sourceforge.net).
 
+## Installation
+  
+  $ gem install mediainfo -s http://gemcutter.org
+  
 ## Usage
   
     info = Mediainfo.new "/path/to/file"
   
 That will issue the system call to `mediainfo` and parse the output. 
-From there, you can call numerous methods to get a variety of information 
-about a file. Some attributes may be present for some files where others 
-are not.
+You can specify an alternate path if necessary:
+  
+    Mediainfo.path = "/opt/local/bin/mediainfo"
+  
+Once you've got an instance setup, you can call numerous methods to get 
+a variety of information about a file. Some attributes may be present 
+for some files where others are not, but any supported attribute 
+should at least return `nil`.
 
 For a list of all possible attributes supported:
   
     Mediainfo.supported_attributes
   
-In addition to the stock arguments provided by parsing `mediainfo` output, 
-some convenience methods and added behavior is added.
-
-Mediainfo is inspired by RVideo::Inspector, part of the rvideo gem. 
-The rvideo inspector is based on output from ffmpeg which is not 
-intended to be machine parseable. I spent a little while chasing 
-the ffmpeg development team, and decided finally that perhaps other 
-tools were better. As such, some of the API for Mediainfo is straight 
-from RVideo::Inspector. Some is not. Just saying.
-
 ## Requirements
 
-This library is compatible with:
+This requires at least the following version of the Mediainfo CLI:
   
   MediaInfo Command line, 
-  MediaInfoLib - v0.7.11
+  MediaInfoLib - v0.7.25
   
-to the extent that is documented in the tests.
+Previous versions of this gem(<= 0.5.1) worked against v0.7.11, which did not 
+generate XML output, and is no longer supported.
 
 ## Contributors
 

data/Rakefile

@@ -1,37 +1,60 @@
-require "rake/testtask"
-load "Rakefile.cloud" if File.exist? "Rakefile.cloud"
-
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/*_test.rb"]
-  t.verbose = true
-end
+require "rubygems"
+require "echoe"
 
-task :default => :test
-
-namespace :mediainfo do
-  task :fixture do
-    unless file = ENV["file"]
-      puts "Usage: rake mediainfo:fixture file=/path/to/file"
-      exit
-    end
-    fixture = File.expand_path "./test/fixtures/#{File.basename file}.txt"
-    system "mediainfo #{file} > #{fixture}"
-    if File.exist? fixture
-      puts "Generated fixture #{fixture}."
-    else
-      puts "Error generating fixture. #{fixture} not created."
-    end
+class Echoe
+  def honor_gitignore!
+    self.ignore_pattern += \
+      Dir["**/.gitignore"].inject([]) do |pattern,gitignore| 
+        pattern.concat \
+          File.readlines(gitignore).
+            map    { |line| line.strip }.
+            reject { |line| "" == line }.
+            map    { |glob| 
+              d = File.dirname(gitignore)
+              d == "." ? glob : File.join(d, glob)
+            }
+      end.flatten.uniq
   end
 end
 
-require "rubygems"
-require "echoe"
-
 Echoe.new "mediainfo" do |p|
   p.description = "Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)"
   p.author = "Seth Thomas Rasmussen"
   p.email = "sethrasmussen@gmail.com"
   p.url = "http://greatseth.com"
   p.ignore_pattern = %w( test/**/* )
+  p.honor_gitignore!
+end
+
+task :rexml do
+  ENV.delete "MEDIAINFO_XML_PARSER"
+  Rake::Task[:test].invoke
+end
+
+task :hpricot do
+  ENV["MEDIAINFO_XML_PARSER"] = "hpricot"
+  Rake::Task[:test].invoke
+end
+
+task :nokogiri do
+  ENV["MEDIAINFO_XML_PARSER"] = "nokogiri"
+  Rake::Task[:test].invoke
+end
+
+# TODO This doesn't work.
+task :all => [:rexml, :nokogiri, :hpricot]
+
+
+task :fixture do
+  unless file = ENV["FILE"]
+    puts "Usage: rake mediainfo:fixture file=/path/to/file"
+    exit
+  end
+  fixture = File.expand_path "./test/fixtures/#{File.basename file}.xml"
+  system "mediainfo #{file} --Output=XML > #{fixture}"
+  if File.exist? fixture
+    puts "Generated fixture #{fixture}."
+  else
+    puts "Error generating fixture. #{fixture} not created."
+  end
 end

data/lib/mediainfo.rb

@@ -33,7 +33,7 @@ require "mediainfo/attr_readers"
 class Mediainfo
   extend AttrReaders
   
-  SECTIONS = %w( Audio Video Image ) # and General
+  SECTIONS = %w( audio video image ) # and General
   
   ### GENERAL
   
@@ -48,7 +48,7 @@ class Mediainfo
   mediainfo_attr_reader :writing_application
   mediainfo_attr_reader :writing_library
   
-  def size; File.size(@full_filename); end
+  def size; File.size(@full_filename) if @full_filename; end
   
   mediainfo_date_reader :mastered_date
   mediainfo_date_reader :tagged_date
@@ -58,8 +58,6 @@ class Mediainfo
   
   mediainfo_section_query :video
   
-  # XXX this breaks from RVideo::Inspector which returns 
-  # something like "#0.1" instead of "1"
   mediainfo_attr_reader :video_stream_id, "ID"
   
   mediainfo_duration_reader :video_duration
@@ -92,6 +90,9 @@ class Mediainfo
   # Format settings, QPel            : No
   # Format settings, GMC             : No warppoints
   # mediainfo_attr_reader :video_format_settings_qpel, "Format settings, QPel"
+  mediainfo_attr_reader :video_color_primaries
+  mediainfo_attr_reader :video_transfer_characteristics
+  mediainfo_attr_reader :video_matrix_coefficients
   
   mediainfo_attr_reader :video_codec_id, "Codec ID"
   mediainfo_attr_reader :video_codec_info, "Codec ID/Info"
@@ -100,6 +101,14 @@ class Mediainfo
   def fps; video_frame_rate[/[\d.]+/].to_f if video?; end
   alias_method :framerate, :fps
   
+  mediainfo_attr_reader :video_minimum_frame_rate
+  def min_fps; video_minimum_frame_rate[/[\d.]+/].to_f if video?; end
+  alias_method :min_framerate, :min_fps
+  
+  mediainfo_attr_reader :video_maximum_frame_rate
+  def max_fps; video_maximum_frame_rate[/[\d.]+/].to_f if video?; end
+  alias_method :max_framerate, :max_fps
+  
   mediainfo_attr_reader :video_frame_rate_mode
   
   mediainfo_attr_reader :video_display_aspect_ratio
@@ -121,8 +130,6 @@ class Mediainfo
   
   mediainfo_section_query :audio
   
-  # XXX this breaks from RVideo::Inspector which returns 
-  # something like "#0.1" instead of "1"
   mediainfo_attr_reader :audio_stream_id, "ID"
   
   mediainfo_duration_reader :audio_duration
@@ -155,10 +162,9 @@ class Mediainfo
   mediainfo_attr_reader :audio_format_settings_sign, "Format settings, Sign"
   mediainfo_attr_reader :audio_codec_id, "Codec ID"
   mediainfo_attr_reader :audio_codec_info, "Codec ID/Info"
+  mediainfo_attr_reader :audio_codec_id_hint
   mediainfo_attr_reader :audio_channel_positions
   
-  # XXX this breaks from RVideo::Inspector which returns 
-  # strings like "mono" or "stereo" for this method.
   mediainfo_int_reader :audio_channels, "Channel(s)"
   def stereo?; 2 == audio_channels; end
   def mono?;   1 == audio_channels; end
@@ -180,81 +186,150 @@ class Mediainfo
   attr_reader :raw_response, :parsed_response,
     :full_filename, :filename, :path, :escaped_full_filename
   
+  ###
+  
+  class Error < StandardError; end
+  class ExecutionError < Error; end
+  class IncompatibleVersionError < Error; end
+  
+  def self.version
+    @version ||= `#{path} --Version`[/v([\d.]+)/, 1]
+  end
+  
+  ###
+  
   def initialize(full_filename = nil)
+    if mediainfo_version < "0.7.25"
+      raise IncompatibleVersionError,
+        "Your version of mediainfo, #{mediainfo_version}, " +
+        "is not compatible with this gem. >= 0.7.25 required."
+    end
+    
     if full_filename
       @full_filename = File.expand_path full_filename
       @path          = File.dirname  @full_filename
       @filename      = File.basename @full_filename
-
+      
       raise ArgumentError, "need a path to a video file, got nil" unless @full_filename
       raise ArgumentError, "need a path to a video file, #{@full_filename} does not exist" unless File.exist? @full_filename
-
+      
       @escaped_full_filename = @full_filename.shell_escape
-
+      
       self.raw_response = mediainfo!
     end
   end
-
-  def raw_response=(mediainfo_cli_output)
-    @raw_response = mediainfo_cli_output
+  
+  def raw_response=(response)
+    raise ArgumentError, "raw response is nil" if response.nil?
+    @raw_response = response
     parse!
     @raw_response
   end
   
-  class << self; attr_accessor :path; end
+  class << self
+    attr_accessor :path
+    
+    def load_xml_parser!(parser = xml_parser)
+      begin
+        gem     parser
+        require parser
+      rescue Gem::LoadError => e
+        raise Gem::LoadError,
+          "your specified XML parser, #{parser.inspect}, could not be loaded: #{e}"
+      end
+    end
+    
+    attr_reader :xml_parser
+    def xml_parser=(parser)
+      load_xml_parser! parser
+      @xml_parser = parser
+    end
+  end
+  
+  unless ENV["MEDIAINFO_XML_PARSER"].to_s.strip.empty?
+    self.xml_parser = ENV["MEDIAINFO_XML_PARSER"]
+  end
+  
   def path; self.class.path; end
+  def xml_parser; self.class.xml_parser; end
   
   def self.default_mediainfo_path!; self.path = "mediainfo"; end
   default_mediainfo_path! unless path
   
   def mediainfo_version
-    `#{path} --Version`[/v([\d.]+)/, 1]
+    self.class.version
   end
   
   attr_reader :last_command
   
-  class Error < StandardError; end
-  class ExecutionError < Error; end
-  
   def inspect
     super.sub /@raw_response=".+?", @/, %{@raw_response="...", @}
   end
   
 private
   def mediainfo!
-    # for bash, see: http://www.faqs.org/docs/bashman/bashref_12.html
-    # but appears to be working for other shells: sh, zsh, ksh, dash
-    @last_command = "#{path} #{@escaped_full_filename}"
-    run_last_command!
+    @last_command = "#{path} #{@escaped_full_filename} --Output=XML"
+    run_command!
   end
   
-  def run_last_command!
-    raw_response = `#{@last_command}`
+  def run_command!
+    raw_response = `#{@last_command} 2>&1`
     unless $? == 0
-      raise ExecutionError, "Execution of `#{@last_command}` failed: #{raw_response.inspect}"
+      raise ExecutionError,
+        "Execution of `#{@last_command}` failed: #{raw_response.inspect}"
     end
     raw_response
   end
   
   def parse!
+    if xml_parser
+      self.class.load_xml_parser!
+    else
+      require "rexml/document"
+    end
+    
     @parsed_response = {}
-    subsection = nil
     
-    @raw_response.to_s.split("\n").map { |x| x.strip }.each do |line|
-      next if line.empty? || line == "General"
-      
-      if SECTIONS.include? line
-        subsection = line
-        @parsed_response[subsection] = {}
-        next
-      end
-      
-      bucket = @parsed_response
-      bucket = bucket[subsection] if subsection
-      
-      key, value = line.split(":", 2).map { |x| x.strip }
-      
-      bucket[key] = value
+    case xml_parser
+    when "nokogiri"
+      Nokogiri::XML(@raw_response).xpath("//track").each { |t|
+        bucket = bucket_for t['type']
+        
+        t.xpath("*").each do |c|
+          bucket[key_for(c)] = c.content.strip
+        end
+      }
+    when "hpricot"
+      Hpricot::XML(@raw_response).search("track").each { |t|
+        bucket = bucket_for t['type']
+
+        t.children.select { |n| n.is_a? Hpricot::Elem }.each do |c|
+          bucket[key_for(c)] = c.inner_html.strip
+        end
+      }
+    else
+      REXML::Document.new(@raw_response).elements.each("/Mediainfo/File/track") { |t|
+        bucket = bucket_for t.attributes['type']
+        
+        t.children.select { |n| n.is_a? REXML::Element }.each do |c|
+          bucket[key_for(c)] = c.text.strip
+        end
+      }
+    end
+  end
+  
+  def key_for(attribute_node)
+    attribute_node.name.downcase.gsub(/_+/, "_").gsub(/_s(\W|$)/, "s").strip
+  end
+  
+  def bucket_for(section)
+    section = section.downcase if section
+    
+    if section == "general"
+      @parsed_response
+    else
+      @parsed_response[section] ||= {}
+      @parsed_response[section]
     end
   end
 end

data/lib/mediainfo/attr_readers.rb

@@ -1,5 +1,5 @@
-require "rubygems"
-require "active_support" # TODO selective includes once they are released
+require "time"
+require "mediainfo/string"
 
 class  Mediainfo
 module AttrReaders
@@ -10,17 +10,19 @@ module AttrReaders
   def mediainfo_attr_reader(name, mediainfo_key = nil)
     supported_attributes << name
     attr_name = "#{name}_before_type_cast"
+    mediainfo_key = mediainfo_key.gsub(/\W+/, "_").downcase if mediainfo_key
+    
     define_method attr_name do
       if v = instance_variable_get("@#{attr_name}")
         v
       else
         v = if md = name.to_s.match(/^(#{SECTIONS.map { |x| x.underscore } * "|"})_(.+)$/)
-          k = mediainfo_key ? mediainfo_key : md[2].humanize.capitalize
-          if subsection = @parsed_response[md[1].capitalize]
+          k = mediainfo_key ? mediainfo_key : md[2]
+          if subsection = @parsed_response[md[1]]
             subsection[k]
           end
         else
-          k = mediainfo_key ? mediainfo_key : name.to_s.humanize.capitalize
+          k = mediainfo_key ? mediainfo_key : name.to_s
           @parsed_response[k]
         end
         
@@ -70,7 +72,7 @@ module AttrReaders
   end
   
   def mediainfo_section_query(name)
-    define_method("#{name}?") { @parsed_response.key? name.to_s.capitalize }
+    define_method("#{name}?") { @parsed_response.key? name.to_s }
   end
 end
 end

data/lib/mediainfo/string.rb

@@ -6,4 +6,14 @@ class String
     # but appears to be working for other shells: sh, zsh, ksh, dash
     "$'#{gsub(/\\|'/) { |c| "\\#{c}" }}'"
   end unless method_defined?(:shell_escape)
+  
+  # stolen from active_support/inflector
+  # TODO require "active_support/core_ext/string/inflections" when 3.0 is released
+  def underscore
+    gsub(/::/, '/').
+    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    tr("-", "_").
+    downcase
+  end unless method_defined?(:underscore)
 end

data/mediainfo.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mediainfo}
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seth Thomas Rasmussen"]
-  s.date = %q{2009-11-19}
+  s.date = %q{2009-11-25}
   s.description = %q{Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)}
   s.email = %q{sethrasmussen@gmail.com}
   s.extra_rdoc_files = ["LICENSE", "README.markdown", "lib/mediainfo.rb", "lib/mediainfo/attr_readers.rb", "lib/mediainfo/string.rb"]
-  s.files = ["Changelog", "LICENSE", "Manifest", "README.markdown", "Rakefile", "lib/mediainfo.rb", "lib/mediainfo/attr_readers.rb", "lib/mediainfo/string.rb", "mediainfo.gemspec", "test/mediainfo_awaywego_encoded_test.rb", "test/mediainfo_awaywego_test.rb", "test/mediainfo_dinner_test.rb", "test/mediainfo_hats_test.rb", "test/mediainfo_string_test.rb", "test/mediainfo_test.rb", "test/mediainfo_vimeo_test.rb", "test/mediainfo_vimeoimage_test.rb", "test/test_helper.rb"]
+  s.files = ["Changelog", "LICENSE", "Manifest", "README.markdown", "Rakefile", "lib/mediainfo.rb", "lib/mediainfo/attr_readers.rb", "lib/mediainfo/string.rb", "mediainfo.gemspec", "test/mediainfo_awaywego_test.rb", "test/mediainfo_broken_embraces_test.rb", "test/mediainfo_dinner_test.rb", "test/mediainfo_hats_test.rb", "test/mediainfo_omen_image_test.rb", "test/mediainfo_string_test.rb", "test/mediainfo_test.rb", "test/mediainfo_vimeo_test.rb", "test/test_helper.rb"]
   s.homepage = %q{http://greatseth.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Mediainfo", "--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{mediainfo}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)}
-  s.test_files = ["test/mediainfo_awaywego_encoded_test.rb", "test/mediainfo_awaywego_test.rb", "test/mediainfo_dinner_test.rb", "test/mediainfo_hats_test.rb", "test/mediainfo_string_test.rb", "test/mediainfo_test.rb", "test/mediainfo_vimeo_test.rb", "test/mediainfo_vimeoimage_test.rb", "test/test_helper.rb"]
+  s.test_files = ["test/mediainfo_awaywego_test.rb", "test/mediainfo_broken_embraces_test.rb", "test/mediainfo_dinner_test.rb", "test/mediainfo_hats_test.rb", "test/mediainfo_omen_image_test.rb", "test/mediainfo_string_test.rb", "test/mediainfo_test.rb", "test/mediainfo_vimeo_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/mediainfo_awaywego_test.rb

@@ -129,8 +129,8 @@ class MediainfoAwaywegoTest < ActiveSupport::TestCase
   end
 
   test "video   Display aspect ratio" do
-    assert_equal "2.25", @info.video_display_aspect_ratio
-    assert_equal "2.25", @info.display_aspect_ratio
+    assert_equal "2.25:1", @info.video_display_aspect_ratio
+    assert_equal "2.25:1", @info.display_aspect_ratio
   end
 
   test "video frame rate" do
@@ -173,12 +173,26 @@ class MediainfoAwaywegoTest < ActiveSupport::TestCase
   
   test "video encoded date" do
     assert_kind_of Time, @info.video_encoded_date
-    # assert_equal "UTC 2009-03-30 19:57:50", @info.video_encoded_date
   end
   
   test "video tagged date" do
     assert_kind_of Time, @info.video_tagged_date
-    # assert_equal "UTC 2009-03-30 19:57:57", @info.video_tagged_date
+  end
+  
+  test "video color primaries" do
+    assert_equal \
+      "BT.709-5, BT.1361, IEC 61966-2-4, SMPTE RP177",
+      @info.video_color_primaries
+  end
+  
+  test "video transfer characteristics" do
+    assert_equal "BT.709-5, BT.1361", @info.video_transfer_characteristics
+  end
+  
+  test "video matrix coefficients" do
+    assert_equal \
+      "BT.709-5, BT.1361, IEC 61966-2-4 709, SMPTE RP177",
+      @info.video_matrix_coefficients
   end
 
   ### AUDIO
@@ -261,12 +275,10 @@ class MediainfoAwaywegoTest < ActiveSupport::TestCase
   
   test "audio encoded date" do
     assert_kind_of Time, @info.audio_encoded_date
-    # assert_equal "UTC 2009-03-30 19:57:50", @info.audio_encoded_date
   end
   
   test "audio tagged date" do
     assert_kind_of Time, @info.audio_tagged_date
-    # assert_equal "UTC 2009-03-30 19:57:57", @info.audio_tagged_date
   end
   
   ### IMAGE

data/test/{mediainfo_awaywego_encoded_test.rb → mediainfo_broken_embraces_test.rb}

@@ -1,9 +1,9 @@
 require "test_helper"
 require "mediainfo_test_helper"
 
-class MediainfoAwaywegoEncodedTest < ActiveSupport::TestCase
+class MediainfoBrokenEmbracesTest < ActiveSupport::TestCase
   def setup
-    @info = mediainfo_mock "AwayWeGo_24fps_253_15000_1920x840.mov"
+    @info = mediainfo_mock "Broken Embraces_510_780_576x432.mp4"
   end
 
   ### GENERAL
@@ -17,26 +17,26 @@ class MediainfoAwaywegoEncodedTest < ActiveSupport::TestCase
   end
   
   test "format" do
-    assert_equal "MPEG-PS", @info.format
+    assert_equal "MPEG-4", @info.format
   end
 
   test "format profile" do
-    assert_nil @info.format_profile
+    assert_equal "Base Media", @info.format_profile
   end
 
   test "codec id" do
-    assert_nil @info.codec_id
+    assert_equal "isom", @info.codec_id
   end
 
   mediainfo_test_size
 
   test "duration" do
-    assert_equal 36224, @info.duration
-    assert_equal "36s 224ms", @info.duration_before_type_cast
+    assert_equal 106000, @info.duration
+    assert_equal "1mn 46s", @info.duration_before_type_cast
   end
 
   test "overall bitrate" do
-    assert_equal "17.3 Mbps", @info.overall_bit_rate
+    assert_equal "911 Kbps", @info.overall_bit_rate
   end
 
   test "encoded date" do
@@ -48,7 +48,7 @@ class MediainfoAwaywegoEncodedTest < ActiveSupport::TestCase
   end
 
   test "writing application" do
-    assert_nil @info.writing_application
+    assert_equal "Lavf52.39.0", @info.writing_application
   end
 
   test "writing library" do
@@ -58,138 +58,136 @@ class MediainfoAwaywegoEncodedTest < ActiveSupport::TestCase
   ### VIDEO
   
   test "video stream id" do
-    assert_equal "224 (0xE0)", @info.video_stream_id
+    assert_equal "1", @info.video_stream_id
   end
 
   test "video   Format" do
-    assert_equal "MPEG Video", @info.video_format
+    assert_equal "AVC", @info.video_format
   end
   
   test "video format version" do
-    assert_equal "Version 2", @info.video_format_version
+    assert_nil @info.video_format_version
   end
   
   test "video format settings Matrix" do
-    assert_equal "Default", @info.video_format_settings_matrix
+    assert_nil @info.video_format_settings_matrix
   end
   
   test "video format profile" do
-    assert_nil @info.video_format_profile
+    assert_equal "High@L3.0", @info.video_format_profile
   end
   
   test "video format settings CABAC" do
-    assert_nil @info.video_format_settings_cabac
+    assert_equal "Yes", @info.video_format_settings_cabac
   end
   
   test "video format settings ReFrames" do
-    assert_nil @info.video_format_settings_reframes
+    assert_equal "4 frames", @info.video_format_settings_reframes
   end
 
   test "video   Codec ID" do
-    assert_nil @info.video_codec_id
+    assert_equal "avc1", @info.video_codec_id
   end
   
   test "video codec info" do
-    assert_nil @info.video_codec_info
+    assert_equal "Advanced Video Coding", @info.video_codec_info
   end
 
   test "video   Duration" do
-    assert_equal 36202, @info.video_duration
-    assert_equal "36s 202ms", @info.video_duration_before_type_cast
+    assert_equal 106000, @info.video_duration
+    assert_equal "1mn 46s", @info.video_duration_before_type_cast
   end
   
   test "video bit rate mode" do
-    assert_equal "Constant", @info.video_bit_rate_mode
-    assert !@info.vbr?
-    assert @info.cbr?
+    assert_equal "Variable", @info.video_bit_rate_mode
+    assert @info.vbr?
+    assert !@info.cbr?
   end
 
   test "video   Bit rate" do
-    assert_equal "16.0 Mbps", @info.video_bit_rate
+    assert_equal "780 Kbps", @info.video_bit_rate
   end
   
   test "video nominal bit rate" do
-    assert_equal "15.0 Mbps", @info.video_nominal_bit_rate
+    assert_nil @info.video_nominal_bit_rate
   end
   
   test "resolution" do
-    assert_equal "1920x1080", @info.resolution
+    assert_equal "576x432", @info.resolution
   end
   
   test "video   Width" do
-    assert_equal 1920, @info.video_width
-    assert_equal 1920, @info.width
+    assert_equal 576, @info.video_width
+    assert_equal 576, @info.width
   end
 
   test "video   Height" do
-    assert_equal 1080, @info.video_height
-    assert_equal 1080, @info.height
+    assert_equal 432, @info.video_height
+    assert_equal 432, @info.height
   end
 
   test "video   Display aspect ratio" do
-    assert_equal "16/9", @info.video_display_aspect_ratio
-    assert_equal "16/9", @info.display_aspect_ratio
+    assert_equal "4:3", @info.video_display_aspect_ratio
+    assert_equal "4:3", @info.display_aspect_ratio
   end
 
   test "video   Frame rate" do
-    assert_equal "29.970 fps", @info.video_frame_rate
-    assert_equal 29.97, @info.fps
-    assert_equal 29.97, @info.framerate
+    assert_equal "23.976 fps", @info.video_frame_rate
+    assert_equal 23.976, @info.fps
+    assert_equal 23.976, @info.framerate
   end
   
   test "video frame rate mode" do
-    assert_nil @info.video_frame_rate_mode
+    assert_equal "Variable", @info.video_frame_rate_mode
   end
 
   test "video   Resolution" do
-    assert_nil @info.video_resolution
+    assert_equal 24, @info.video_resolution
   end
   
   test "video colorimetry" do
-    assert_equal "4:2:2", @info.video_colorimetry
-    assert_equal "4:2:2", @info.video_colorspace
+    assert_equal "4:2:0", @info.video_colorimetry
+    assert_equal "4:2:0", @info.video_colorspace
   end
 
   test "video   Scan type" do
-    assert_equal "Interlaced", @info.video_scan_type
-    assert @info.interlaced?
-    assert !@info.progressive?
+    assert_equal "Progressive", @info.video_scan_type
+    assert !@info.interlaced?
+    assert @info.progressive?
   end
   
   test "video scan order" do
-    assert_equal "Bottom Field First", @info.video_scan_order
+    assert_nil @info.video_scan_order
   end
 
   test "video   Bits/(Pixel*Frame)" do
-    assert_equal "0.258", @info.video_bits_pixel_frame
+    assert_equal "0.131", @info.video_bits_pixel_frame
   end
 
   test "video   Stream size" do
-    assert_nil @info.video_stream_size
+    assert_equal "9.84 MiB (85%)", @info.video_stream_size
   end
   
   test "video encoded date" do
     assert_nil @info.video_encoded_date
-    # assert_equal "UTC 2009-03-30 19:57:50", @info.video_encoded_date
   end
   
   test "video tagged date" do
     assert_nil @info.video_tagged_date
-    # assert_equal "UTC 2009-03-30 19:57:57", @info.video_tagged_date
   end
 
   ### AUDIO
   
   test "audio stream id" do
-    assert_equal "128 (0x80)", @info.audio_stream_id
+    assert_equal "2", @info.audio_stream_id
   end
   
   test "audio   Format" do 
-    assert_equal "AC-3", @info.audio_format
+    assert_equal "AAC", @info.audio_format
   end
   
   test "audio format info" do
-    assert_equal "Audio Coding 3", @info.audio_format_info
+    assert_equal "Advanced Audio Codec", @info.audio_format_info
   end
   
   test "audio Format settings, Endianness" do
@@ -201,7 +199,7 @@ class MediainfoAwaywegoEncodedTest < ActiveSupport::TestCase
   end
   
   test "audio   Codec ID" do
-    assert_nil @info.audio_codec_id
+    assert_equal "40", @info.audio_codec_id
   end
 
   test "audio   Codec ID/Info" do
@@ -209,16 +207,16 @@ class MediainfoAwaywegoEncodedTest < ActiveSupport::TestCase
   end
 
   test "audio   Duration" do
-    assert_equal 36224, @info.audio_duration
-    assert_equal "36s 224ms", @info.audio_duration_before_type_cast
+    assert_equal 106000, @info.audio_duration
+    assert_equal "1mn 46s", @info.audio_duration_before_type_cast
   end
 
   test "audio   Bit rate mode" do
-    assert_equal "Constant", @info.audio_bit_rate_mode
+    assert_equal "Variable", @info.audio_bit_rate_mode
   end
 
   test "audio   Bit rate" do
-    assert_equal "64.0 Kbps", @info.audio_bit_rate
+    assert_equal "128 Kbps", @info.audio_bit_rate
   end
 
   test "audio   Channel(s)" do
@@ -238,17 +236,17 @@ class MediainfoAwaywegoEncodedTest < ActiveSupport::TestCase
   end
 
   test "audio   Sampling rate" do
-    assert_equal 48000, @info.audio_sample_rate
-    assert_equal 48000, @info.audio_sampling_rate
-    assert_equal "48.0 KHz", @info.audio_sampling_rate_before_type_cast
+    assert_equal 44100, @info.audio_sample_rate
+    assert_equal 44100, @info.audio_sampling_rate
+    assert_equal "44.1 KHz", @info.audio_sampling_rate_before_type_cast
   end
 
   test "audio   Resolution" do
-    assert_nil @info.audio_resolution
+    assert_equal 16, @info.audio_resolution
   end
 
   test "audio   Stream size" do
-    assert_nil @info.audio_stream_size
+    assert_equal "1.62 MiB (14%)", @info.audio_stream_size
   end
 
   test "audio   Interleave, duration" do
@@ -257,12 +255,10 @@ class MediainfoAwaywegoEncodedTest < ActiveSupport::TestCase
   
   test "audio encoded date" do
     assert_nil @info.audio_encoded_date
-    # assert_equal "UTC 2009-03-30 19:57:50", @info.audio_encoded_date
   end
   
   test "audio tagged date" do
     assert_nil @info.audio_tagged_date
-    # assert_equal "UTC 2009-03-30 19:57:57", @info.audio_tagged_date
   end
   
   ### IMAGE

data/test/mediainfo_dinner_test.rb

@@ -74,7 +74,7 @@ class MediainfoDinnerTest < ActiveSupport::TestCase
   end
   
   test "video format settings Matrix" do
-    assert_equal "Default", @info.video_format_settings_matrix
+    assert_equal "Default (H.263)", @info.video_format_settings_matrix
   end
   
   test "video format settings CABAC" do
@@ -131,6 +131,14 @@ class MediainfoDinnerTest < ActiveSupport::TestCase
     assert_equal "14.875 fps", @info.video_frame_rate
     assert_equal 14.875, @info.fps
     assert_equal 14.875, @info.framerate
+    
+    assert_equal "2.370 fps", @info.video_minimum_frame_rate
+    assert_equal 2.370, @info.min_fps
+    assert_equal 2.370, @info.min_framerate
+    
+    assert_equal "27.778 fps", @info.video_maximum_frame_rate
+    assert_equal 27.778, @info.max_fps
+    assert_equal 27.778, @info.max_framerate
   end
   
   test "video frame rate mode" do
@@ -209,7 +217,7 @@ class MediainfoDinnerTest < ActiveSupport::TestCase
   end
 
   test "audio   Channel(s)" do
-    assert_equal 11, @info.audio_channels
+    assert_equal 1, @info.audio_channels
   end
   
   test "audio channel positions" do
@@ -221,7 +229,7 @@ class MediainfoDinnerTest < ActiveSupport::TestCase
   end
   
   test "mono?" do
-    assert !@info.mono?
+    assert @info.mono?
   end
 
   test "audio   Sampling rate" do

data/test/{mediainfo_vimeoimage_test.rb → mediainfo_omen_image_test.rb}

@@ -1,9 +1,9 @@
 require "test_helper"
 require "mediainfo_test_helper"
 
-class MediainfoVimeoimageTest < ActiveSupport::TestCase
+class MediainfoOmenImageTest < ActiveSupport::TestCase
   def setup
-    @info = mediainfo_mock "vimeo.57652_55_500.jpg"
+    @info = mediainfo_mock "omen1976_464_0_480x336-6.jpg"
   end
 
   ### GENERAL
@@ -93,7 +93,7 @@ class MediainfoVimeoimageTest < ActiveSupport::TestCase
   end
   
   test "resolution" do
-    assert_equal "640x360", @info.resolution
+    assert_equal "480x336", @info.resolution
   end
 
   test "video   Width" do
@@ -219,13 +219,13 @@ class MediainfoVimeoimageTest < ActiveSupport::TestCase
   end
   
   test "image width" do
-    assert_equal 640, @info.image_width
-    assert_equal 640, @info.width
+    assert_equal 480, @info.image_width
+    assert_equal 480, @info.width
   end
   
   test "image height" do
-    assert_equal 360, @info.image_height
-    assert_equal 360, @info.height
+    assert_equal 336, @info.image_height
+    assert_equal 336, @info.height
   end
   
   test "image resolution" do

data/test/mediainfo_test.rb

@@ -37,6 +37,8 @@ class MediainfoTest < ActiveSupport::TestCase
     :video_codec_id,
     :video_codec_info,
     :video_frame_rate,
+    :video_minimum_frame_rate,
+    :video_maximum_frame_rate,
     :video_frame_rate_mode,
     :video_display_aspect_ratio,
     :video_bits_pixel_frame,
@@ -44,6 +46,9 @@ class MediainfoTest < ActiveSupport::TestCase
     :video_height,
     :video_encoded_date,
     :video_tagged_date,
+    :video_color_primaries,
+    :video_transfer_characteristics,
+    :video_matrix_coefficients,
 
     ### AUDIO
 
@@ -60,6 +65,7 @@ class MediainfoTest < ActiveSupport::TestCase
     :audio_format_settings_endianness,
     :audio_format_settings_sign,
     :audio_codec_id,
+    :audio_codec_id_hint,
     :audio_codec_info,
     :audio_channel_positions,
     :audio_channels,
@@ -87,20 +93,26 @@ class MediainfoTest < ActiveSupport::TestCase
   end
   
   test "retains last system command generated" do
-    m = Mediainfo.new "/dev/null"
-    assert_equal "mediainfo $'/dev/null'", m.last_command
+    p = File.expand_path "./test/fixtures/dinner.3g2.xml"
+    m = Mediainfo.new p
+    assert_equal "mediainfo $'#{p}' --Output=XML", m.last_command
   end
   
   test "allows customization of path to mediainfo binary" do
-    Mediainfo.any_instance.stubs(:run_last_command!)
+    Mediainfo.any_instance.stubs(:run_command!).returns("test")
     
     assert_equal "mediainfo", Mediainfo.path
     
+    m = Mediainfo.new "/dev/null"
+    assert_equal "mediainfo $'/dev/null' --Output=XML", m.last_command
+    
+    Mediainfo.any_instance.stubs(:mediainfo_version).returns("0.7.25")
+    
     Mediainfo.path = "/opt/local/bin/mediainfo"
     assert_equal "/opt/local/bin/mediainfo", Mediainfo.path
     
     m = Mediainfo.new "/dev/null"
-    assert_equal "/opt/local/bin/mediainfo $'/dev/null'", m.last_command
+    assert_equal "/opt/local/bin/mediainfo $'/dev/null' --Output=XML", m.last_command
   end
   
   test "can be initialized with a raw response" do
@@ -109,4 +121,9 @@ class MediainfoTest < ActiveSupport::TestCase
     assert m.video?
     assert m.audio?
   end
+  
+  test "cannot be initialized with version < 0.7.25" do
+    Mediainfo.any_instance.stubs(:mediainfo_version).returns("0.7.10")
+    assert_raises(Mediainfo::IncompatibleVersionError) { Mediainfo.new }
+  end
 end

data/test/mediainfo_vimeo_test.rb

@@ -39,6 +39,10 @@ class MediainfoVimeoTest < ActiveSupport::TestCase
     assert_equal "2 078 Kbps", @info.overall_bit_rate
   end
   
+  test "mastered date" do
+    assert_nil @info.encoded_date
+  end
+  
   test "encoded date" do
     assert_nil @info.encoded_date
   end
@@ -57,8 +61,8 @@ class MediainfoVimeoTest < ActiveSupport::TestCase
 
   ### VIDEO
   
-  test "video stream id" do
-    assert_nil @info.video_stream_id
+  test "video stream  id" do
+    assert_equal "0", @info.video_stream_id
   end
   
   test "video   Format" do
@@ -123,8 +127,8 @@ class MediainfoVimeoTest < ActiveSupport::TestCase
   end
 
   test "video   Display aspect ratio" do
-    assert_equal "4/3", @info.video_display_aspect_ratio
-    assert_equal "4/3", @info.display_aspect_ratio
+    assert_equal "4:3", @info.video_display_aspect_ratio
+    assert_equal "4:3", @info.display_aspect_ratio
   end
 
   test "video frame rate" do
@@ -179,6 +183,10 @@ class MediainfoVimeoTest < ActiveSupport::TestCase
     assert_nil @info.audio_format_info
   end
   
+  test "audio codec id hint" do
+    assert_equal "Intel", @info.audio_codec_id_hint
+  end
+  
   test "audio Format settings, Endianness" do
     assert_nil @info.audio_format_settings_endianness
   end
@@ -192,7 +200,7 @@ class MediainfoVimeoTest < ActiveSupport::TestCase
   end
 
   test "audio   Codec ID/Info" do
-    assert_equal "Intel ADPCM", @info.audio_codec_info
+    assert_nil @info.audio_codec_info
   end
 
   test "audio   Duration" do

data/test/test_helper.rb

@@ -1,5 +1,9 @@
 require "test/unit"
 
+require "rubygems"
+require "mocha"
+begin; require "redgreen"; rescue LoadError; end
+
 module ActiveSupport
   class TestCase < Test::Unit::TestCase
     def self.test(desc, &block)
@@ -10,9 +14,6 @@ module ActiveSupport
   end
 end
 
-require "rubygems"
-require "mocha"
-begin; require "redgreen"; rescue LoadError; end
 
 $: << File.dirname(__FILE__) + "/../lib"
 require "mediainfo"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mediainfo
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors: 
 - Seth Thomas Rasmussen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -05:00
+date: 2009-11-25 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -69,12 +69,12 @@ signing_key:
 specification_version: 3
 summary: Mediainfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)
 test_files: 
-- test/mediainfo_awaywego_encoded_test.rb
 - test/mediainfo_awaywego_test.rb
+- test/mediainfo_broken_embraces_test.rb
 - test/mediainfo_dinner_test.rb
 - test/mediainfo_hats_test.rb
+- test/mediainfo_omen_image_test.rb
 - test/mediainfo_string_test.rb
 - test/mediainfo_test.rb
 - test/mediainfo_vimeo_test.rb
-- test/mediainfo_vimeoimage_test.rb
 - test/test_helper.rb