MP4Info 0.2 → 0.3

data/README

@@ -4,7 +4,8 @@ It is based on the Perl module MP4::Info (http://search.cpan.org/~jhar/MP4-Info/
 Note: MP4Info does not currently support Unicode strings.
 
 = License
-Copyright (C) 2006 Jason Terk <rain@xidus.net>
+Copyright (c) 2004-2007 Jonathan Harris <jhar@cpan.org>
+Copyright (C) 2006-2007 Jason Terk <rain@xidus.net>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of version 2 of the GNU General Public License as

data/lib/mp4info.rb

@@ -4,7 +4,8 @@
 # Note: MP4Info does not currently support Unicode strings.
 #
 # = License
-# Copyright (C) 2006 Jason Terk <rain@xidus.net>
+# Copyright (c) 2004-2007 Jonathan Harris <jhar@cpan.org>
+# Copyright (C) 2006-2007 Jason Terk <rain@xidus.net>
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -21,6 +22,8 @@
 #
 # See the README file for usage information.
 
+require 'tempfile'
+
 class MP4Info
   # Initialize a new MP4Info object from an IO object
   def initialize(io_stream)
@@ -51,7 +54,8 @@ class MP4Info
     # Non standard data atoms
     @other_atoms = {
       "MDAT" => :parse_mdat, "META" => :parse_meta,
-      "MVHD" => :parse_mvhd, "STSD" => :parse_stsd
+      "MVHD" => :parse_mvhd, "STSD" => :parse_stsd,
+      "MOOV" => :parse_moov
     }
     
     # Info/Tag aliases
@@ -62,7 +66,7 @@ class MP4Info
     
     # Sanity check
     head = read_or_raise(io_stream, 8, "#{io_stream} does not appear to be an IO stream")
-    raise "#{io_stream} does not appear to be an IO stream" unless head[4..7].downcase == "ftyp"
+    raise "#{io_stream} does not appear to be an MP4 file" unless head[4..7].downcase == "ftyp"
     
     # Back to the beginning
     io_stream.rewind
@@ -101,38 +105,54 @@ class MP4Info
   private
     # Parse a container
     def parse_container(io_stream, level, size)
-      level = level + 1
-      cont_end = io_stream.pos + size
+      level += 1
+      container_end = io_stream.pos + size
       
-      while io_stream.pos < cont_end do
-        parse_atom io_stream, level
+      while io_stream.pos < container_end do
+        parse_atom io_stream, level, container_end - io_stream.pos
       end
       
-      if (io_stream.pos != cont_end)
+      if (io_stream.pos != container_end)
         raise "Parse error"
       end
     end
     
     # Parse an atom
-    def parse_atom(io_stream, level)
+    def parse_atom(io_stream, level, parent_size)
       head = read_or_raise(io_stream, 8, "Premature end of file")
       
       size, id = head.unpack("Na4")
-      if (size == 1)
+      
+      if (size == 0)
+        position = io_stream.pos
+        io_stream.seek(0, 2)
+        size = io_stream.pos - position
+        io_stream.seek(position, 0)
+      elsif (size == 1)
         # Extended size, whatever that means
         head = read_or_raise(io_stream, 8, "Premature end of file")
         hi, low = head.unpack("NN")
         size = hi * (2**32) + low - 16
+        
+        if (size > parent_size)
+          # Atom extends outside of parent container; skip to the end
+          io_stream.seek(parent_size - 16, 1)
+          return
+        end
+        
+        size -= 16
       else
-        size = size - 8
-      end
-      
-      if (size <= 0)
-        if (size == 0 and level ==1)
+        if (size > parent_size)
+          # Atom extends outside of parent container; skip to the end
+          io_stream.seek(parent_size - 8, 1)
           return
-        else
-          raise "Parse error"
         end
+        
+        size -= 8;
+      end
+      
+      if (size < 0)
+        raise "Parse error"
       end
       
       re = /[^\w\-]/
@@ -153,6 +173,25 @@ class MP4Info
       end
     end
     
+    # Parse a MOOV container
+    #
+    # Pre-conditions: size = size of atom contents
+    #                 io_stream points to start of atom contents
+    #
+    # Post-condition: io_stream points past end of atom contents
+    def parse_moov(io_stream, level, size)
+      data = read_or_raise(io_stream, size, "Premature end of file")
+      
+      cache = Tempfile.new "mp4info"
+      cache.write data
+      cache.open
+      cache.rewind
+      
+      parse_container(cache, level, size)
+      
+      cache.close!
+    end
+    
     # Parse an MDAT atom
     #
     # Pre-conditions: size = size of atom contents
@@ -161,7 +200,7 @@ class MP4Info
     # Post-condition: io_stream points past end of atom contents
     def parse_mdat(io_stream, level, size)
       @info_atoms["SIZE"] = 0 unless @info_atoms["SIZE"]
-      @info_atoms["SIZE"] = @info_atoms["SIZE"] + size
+      @info_atoms["SIZE"] += size
       io_stream.seek(size, 1)
     end
     
@@ -225,7 +264,9 @@ class MP4Info
       # Is this an audio track?
       if (data_format == "mp4a" || data_format == "drms" ||
           data_format == "samr" || data_format == "sawb" ||
-          data_format == "sawp" || data_format == "enca")
+          data_format == "sawp" || data_format == "enca" ||
+          data_format == "alac" )
+        @info_atoms["ENCODING"] = data_format
         @info_atoms["FREQUENCY"] = (data[40..43].unpack("N")[0] * 1.0) / 65536000
         printf "  %sFreq=%s\n", ' ' * ( 2 * level ), @info_atoms["FREQUENCY"] if $DEBUG
       end
@@ -234,6 +275,45 @@ class MP4Info
         @info_atoms["ENCRYPTED"] = true;
       end
     end
+
+    # User-defined box. Used by PSP - See ffmpeg libavformat/movenc.c
+    #
+    # Pre-conditions: size = size of atom contents
+    #                 io_stream points to start of atom contents
+    #
+    # Post-condition: io_stream points past end of atom contents
+    def parse_uuid(io_stream, level, size)
+      data = read_or_raise(io_stream, size, "Premature end of file")
+      
+      return unless size > 26
+      
+      u1, u2, u3, u4 = data.unpack 'a4NNN'
+      
+      if (u1 == "USMT")
+        pspsize, pspid = data[16..23].unpack 'Na4'
+        
+        return unless pspsize == size - 16
+        
+        if (pspid == "MTDT")
+          nblocks = data[24..25].unpack 'n'
+          data = data[26..(data.length - 1)]
+          
+          while nblocks
+            bsize, btype, flags, ptype = data.unpack 'nNnn'
+            
+            if (btype == 1 && bsize == 12 &&
+                ptype == 1 && @data_atoms["NAM"].nil?)
+              @data_atoms["NAM"] = data[10..(10 + bsize - 11)]
+            elsif (btype == 4 && bsize > 12 && ptype == 1)
+              @data_atoms["TOO"] = data[10..(10 + bsize - 11)]
+            end
+            
+            data = data[bsize..(data.length - 1)]
+            nblocks -= 1
+          end
+        end
+      end
+    end
     
     def parse_data(io_stream, level, size, id)
       # Possible genres...
@@ -322,27 +402,38 @@ class MP4Info
         ver = data.unpack("N")[0]
         if (ver == 0)
           return unless size > 7
-          size = size - 7
+          size -= 7
           type = 1
           data = data[6..(6 + size - 1)]
           
           if (id == "TITL")
-            return if @data_atoms["NAM"] != nil
+            return if !@data_atoms["NAM"].nil?
             id = "NAM"
           elsif (id == "DSCP")
-            return if @data_atoms["CMT"] != nil
+            return if !@data_atoms["CMT"].nil?
             id = "CMT"
           elsif (id == "PERF")
-            return if @data_atoms["ART"] != nil
+            return if !@data_atoms["ART"].nil?
             id = "ART"
           elsif (id == "AUTH")
-            return if @data_atoms["WRT"] != nil
+            return if !@data_atoms["WRT"].nil?
             id = "WRT"
           end
         end
       end
         
-      if (type == nil)
+      if (id == "MEAN" || id == "NAME" || id == "DATA")
+        if id == "DATA"
+          data = data[8..(data.length - 1)]
+        else
+          data = data[4..(data.length - 1)]
+        end
+        
+        @data_atoms[id] = data
+        return
+      end
+      
+      if (type.nil?)
         return unless size > 16
         size, atom, type = data.unpack("Na4N")
         
@@ -355,21 +446,23 @@ class MP4Info
       
       printf "  %sType=#{type}, Size=#{size}\n", ' ' * ( 2 * level ) if $DEBUG
       
-      if (type == 0)
+      if (id == "COVR")
+        @data_atoms[id] = data
+      elsif (type == 0)
         ints = data.unpack("n" * (size / 2))
         if (id == "GNRE")
           @data_atoms[id] = mp4_genres[ints[0]]
-        elsif (size >= 6)
-          @data_atoms[id] = [ints[1], ints[2]]
-        else
+        elsif (id == "DISK" || id == "TRKN")
+          @data_atoms[id] = [ints[1], (size >= 6 ? ints[2] : 0)] if size >= 4
+        elsif (size >= 4)
           @data_atoms[id] = ints[1]
         end
       elsif (type == 1)
         if (id == "GEN")
-          return if @data_atoms["GNRE"] != nil
+          return if !@data_atoms["GNRE"].nil?
           id = "GNRE"
         elsif (id == "AART")
-          return if @data_atoms["ART"] != nil
+          return if !@data_atoms["ART"].nil?
           id = "ART"
         elsif (id == "DAY")
           data = data[0..3]

data/test/test.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-# Copyright (C) 2006 Jason Terk <rain@xidus.net>
+# Copyright (c) 2004-2007 Jonathan Harris <jhar@cpan.org>
+# Copyright (C) 2006-2007 Jason Terk <rain@xidus.net>
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -73,33 +74,33 @@ class TestMP4Info < Test::Unit::TestCase
     
     info = {
       :ALB => 'Album',
-			:APID => nil,
-			:ART => 'Artist',
-			:CMT => "Comment\r\n2nd line",
-			:COVR => nil,
-			:CPIL	=> 0,
-			:CPRT => nil,
-			:DAY => '2004',
-			:DISK	=> [3,4],
-			:GNRE	=> 'Acid Jazz',
-			:GRP => 'Grouping',
-			:NAM => 'Name',
-			:TMPO	=> 100,
-			:TOO => 'iTunes v4.6.0.15, QuickTime 6.5.1',
-			:TRKN	=> [1,2],
-			:WRT => 'Composer',
-			:VERSION => 4,
-			:LAYER => 1,
-			:BITRATE => 50,
-			:FREQUENCY => 44.1,
-			:SIZE	=> 6962,
-			:SECS	=> 1,
-			:MM	=> 0,
-			:SS	=> 1,
-			:MS	=> 90,
-			:TIME	=> '00:01',
-			:COPYRIGHT => nil,
-			:ENCRYPTED => nil
+      :APID => nil,
+      :ART => 'Artist',
+      :CMT => "Comment\r\n2nd line",
+      :COVR => nil,
+      :CPIL	=> 0,
+      :CPRT => nil,
+      :DAY => '2004',
+      :DISK	=> [3,4],
+      :GNRE	=> 'Acid Jazz',
+      :GRP => 'Grouping',
+      :NAM => 'Name',
+      :TMPO	=> 100,
+      :TOO => 'iTunes v4.6.0.15, QuickTime 6.5.1',
+      :TRKN	=> [1,2],
+      :WRT => 'Composer',
+      :VERSION => 4,
+      :LAYER => 1,
+      :BITRATE => 50,
+      :FREQUENCY => 44.1,
+      :SIZE	=> 6962,
+      :SECS	=> 1,
+      :MM	=> 0,
+      :SS	=> 1,
+      :MS	=> 90,
+      :TIME	=> '00:01',
+      :COPYRIGHT => nil,
+      :ENCRYPTED => nil
     }
     
     mp4 = MP4Info.open(file)
@@ -115,33 +116,33 @@ class TestMP4Info < Test::Unit::TestCase
     
     info = {
       :ALB => nil,
-			:APID => nil,
-			:ART => 'Artist',
-			:CMT => nil,
-			:COVR => nil,
-			:CPIL => nil,
-			:CPRT => nil,
-			:DAY => nil,
-			:DISK => nil,
-			:GNRE => nil,
-			:GRP => nil,
-			:NAM => 'Name',
-			:TMPO => nil,
-			:TOO => 'Nero AAC Codec 2.9.9.91',
-			:TRKN => nil,
-			:WRT => nil,
-			:VERSION => 4,
-			:LAYER => 1,
-			:BITRATE => 21,
-			:FREQUENCY => 8,
-			:SIZE	=> 3030,
-			:SECS	=> 1,
-			:MM	=> 0,
-			:SS	=> 1,
-			:MS	=> 153,
-			:TIME	=> '00:01',
-			:COPYRIGHT => nil,
-			:ENCRYPTED => nil
+      :APID => nil,
+      :ART => 'Artist',
+      :CMT => nil,
+      :COVR => nil,
+      :CPIL => nil,
+      :CPRT => nil,
+      :DAY => nil,
+      :DISK => nil,
+      :GNRE => nil,
+      :GRP => nil,
+      :NAM => 'Name',
+      :TMPO => nil,
+      :TOO => 'Nero AAC Codec 2.9.9.91',
+      :TRKN => nil,
+      :WRT => nil,
+      :VERSION => 4,
+      :LAYER => 1,
+      :BITRATE => 21,
+      :FREQUENCY => 8,
+      :SIZE	=> 3030,
+      :SECS	=> 1,
+      :MM	=> 0,
+      :SS	=> 1,
+      :MS	=> 153,
+      :TIME	=> '00:01',
+      :COPYRIGHT => nil,
+      :ENCRYPTED => nil
     }
     
     mp4 = MP4Info.open(file)
@@ -161,33 +162,33 @@ class TestMP4Info < Test::Unit::TestCase
     
     info = {
       :ALB	=> 'Album',
-			:APID => nil,
-			:ART	=> 'AÆtist',
-			:CMT	=> 'Comment',
-			:COVR => nil,
-			:CPIL => nil,
-			:CPRT => nil,
-			:DAY	=> 2004,
-			:DISK => nil,
-			:GNRE	=> 'Acid Jazz',
-			:GRP => nil,
-			:NAM	=> 'N™me',
-			:TMPO => nil,
-			:TOO	=> 'Helix Producer SDK 10.0 for Windows, Build 10.0.0.240',
-			:TRKN	=> [1,0],
-			:WRT => nil,
-			:VERSION	=> 4,
-			:LAYER	=> 1,
-			:BITRATE	=> 93,
-			:FREQUENCY => 1,	# What part of "the sampling rate of the audio should be ... documented in the samplerate field" don't Real understand?
-			:SIZE	=> 131682,
-			:SECS	=> 11,
-			:MM	=> 0,
-			:SS	=> 11,
-			:MS	=> 53,
-			:TIME	=> '00:11',
-			:COPYRIGHT => nil,
-			:ENCRYPTED => nil
+      :APID => nil,
+      :ART	=> 'AÆtist',
+      :CMT	=> 'Comment',
+      :COVR => nil,
+      :CPIL => nil,
+      :CPRT => nil,
+      :DAY	=> 2004,
+      :DISK => nil,
+      :GNRE	=> 'Acid Jazz',
+      :GRP => nil,
+      :NAM	=> 'N™me',
+      :TMPO => nil,
+      :TOO	=> 'Helix Producer SDK 10.0 for Windows, Build 10.0.0.240',
+      :TRKN	=> [1,0],
+      :WRT => nil,
+      :VERSION	=> 4,
+      :LAYER	=> 1,
+      :BITRATE	=> 93,
+      :FREQUENCY => 1,	# What part of "the sampling rate of the audio should be ... documented in the samplerate field" don't Real understand?
+      :SIZE	=> 131682,
+      :SECS	=> 11,
+      :MM	=> 0,
+      :SS	=> 11,
+      :MS	=> 53,
+      :TIME	=> '00:11',
+      :COPYRIGHT => nil,
+      :ENCRYPTED => nil
     }
     
     mp4 = MP4Info.open(file)

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: MP4Info
 version: !ruby/object:Gem::Version 
-  version: "0.2"
-date: 2006-05-23 00:00:00 -04:00
+  version: "0.3"
+date: 2007-04-15 00:00:00 -04:00
 summary: MP4 tag reading library
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Jason Terk
 files: