Add support for MP4 UUID and MOV XMP boxes

Source/com/drew/metadata/mp4/Mp4BoxHandler.java

@@ -27,6 +27,8 @@
 import com.drew.lang.annotations.Nullable;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.mp4.boxes.*;
+import com.drew.metadata.mp4.media.Mp4UserBoxDirectory;
+import com.drew.metadata.mp4.media.Mp4UserBoxHandler;
 
 import java.io.IOException;
 
@@ -56,7 +58,8 @@ public boolean shouldAcceptBox(@NotNull Box box)
             || box.type.equals(Mp4BoxTypes.BOX_MOVIE_HEADER)
             || box.type.equals(Mp4BoxTypes.BOX_HANDLER)
             || box.type.equals(Mp4BoxTypes.BOX_MEDIA_HEADER)
-            || box.type.equals(Mp4BoxTypes.BOX_TRACK_HEADER);
+            || box.type.equals(Mp4BoxTypes.BOX_TRACK_HEADER)
+            || box.type.equals(Mp4BoxTypes.BOX_USER_DEFINED);
     }
 
     @Override
@@ -84,6 +87,9 @@ public Mp4Handler processBox(@NotNull Box box, @Nullable byte[] payload, Mp4Cont
                 processMediaHeader(reader, box, context);
             } else if (box.type.equals(Mp4BoxTypes.BOX_TRACK_HEADER)) {
                 processTrackHeader(reader, box);
+            } else if (box.type.equals(Mp4BoxTypes.BOX_USER_DEFINED)) {
+                Mp4UserBoxHandler userBoxHandler = new Mp4UserBoxHandler(metadata);
+                userBoxHandler.processBox(box, payload, context);
             }
         } else {
             if (box.type.equals(Mp4ContainerTypes.BOX_COMPRESSED_MOVIE)) {

Source/com/drew/metadata/mp4/Mp4BoxTypes.java

@@ -38,6 +38,7 @@ public class Mp4BoxTypes
     public static final String BOX_TIME_TO_SAMPLE                   = "stts";
     public static final String BOX_MEDIA_HEADER                     = "mdhd";
     public static final String BOX_TRACK_HEADER                     = "tkhd";
+    public static final String BOX_USER_DEFINED                     = "uuid";
 
     private static final ArrayList<String> _boxList = new ArrayList<String>();
 
@@ -53,5 +54,6 @@ public class Mp4BoxTypes
         _boxList.add(BOX_TIME_TO_SAMPLE);
         _boxList.add(BOX_MEDIA_HEADER);
         _boxList.add(BOX_TRACK_HEADER);
+        _boxList.add(BOX_USER_DEFINED);
     }
 }

Source/com/drew/metadata/mp4/boxes/Box.java

@@ -42,9 +42,6 @@ public Box(SequentialReader reader) throws IOException
         } else if (size == 0) {
             size = -1;
         }
-        if (type.equals("uuid")) {
-            usertype = reader.getString(16);
-        }
     }
 
     public Box(Box box)

Source/com/drew/metadata/mp4/boxes/MediaHeaderBox.java

@@ -22,7 +22,6 @@
 
 import com.drew.lang.SequentialReader;
 import com.drew.metadata.mp4.Mp4Context;
-import com.drew.metadata.mp4.Mp4HandlerFactory;
 
 import java.io.IOException;
 

Source/com/drew/metadata/mp4/boxes/UserBox.java

@@ -0,0 +1,39 @@
+package com.drew.metadata.mp4.boxes;
+
+import com.drew.lang.SequentialReader;
+import com.drew.metadata.mp4.Mp4Directory;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+
+import static com.drew.metadata.mp4.media.Mp4UserBoxDirectory.*;
+
+public class UserBox extends Box {
+
+    private byte[] userData;
+
+    public UserBox(SequentialReader reader, Box box) throws IOException {
+        super(box);
+
+        if (type.equals("uuid")) {
+            usertype = getUuid(reader.getBytes(16));
+        }
+
+        userData = reader.getBytes(reader.available());
+    }
+
+    public void addMetadata(Mp4Directory directory)
+    {
+        directory.setString(TAG_UUID, usertype);
+        directory.setLong(TAG_LENGTH, userData.length);
+        directory.setByteArray(TAG_USER_DATA, userData);
+    }
+
+    public String getUuid(byte[] bytes) {
+        ByteBuffer bb = ByteBuffer.wrap(bytes);
+        UUID uuid = new UUID(bb.getLong(), bb.getLong());
+
+        return uuid.toString();
+    }
+}

Source/com/drew/metadata/mp4/media/Mp4UserBoxDescriptor.java

@@ -0,0 +1,10 @@
+package com.drew.metadata.mp4.media;
+
+import com.drew.metadata.TagDescriptor;
+
+public class Mp4UserBoxDescriptor extends TagDescriptor<Mp4UserBoxDirectory> {
+
+    public Mp4UserBoxDescriptor(Mp4UserBoxDirectory directory) {
+        super(directory);
+    }
+}

Source/com/drew/metadata/mp4/media/Mp4UserBoxDirectory.java

@@ -0,0 +1,37 @@
+package com.drew.metadata.mp4.media;
+
+import com.drew.lang.annotations.NotNull;
+
+import java.util.HashMap;
+
+public class Mp4UserBoxDirectory extends Mp4MediaDirectory {
+    public static final Integer TAG_UUID = 901;
+    public static final Integer TAG_LENGTH = 902;
+    public static final Integer TAG_USER_DATA = 903;
+
+    @NotNull
+    private static final HashMap<Integer, String> _tagNameMap = new HashMap<Integer, String>();
+
+    static {
+        Mp4UserBoxDirectory.addMp4MediaTags(_tagNameMap);
+        _tagNameMap.put(TAG_UUID, "uuid");
+        _tagNameMap.put(TAG_LENGTH, "length");
+        _tagNameMap.put(TAG_USER_DATA, "data");
+    }
+
+    public Mp4UserBoxDirectory() {
+        this.setDescriptor(new Mp4UserBoxDescriptor(this));
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return "UserData";
+    }
+
+    @NotNull
+    @Override
+    protected HashMap<Integer, String> getTagNameMap() {
+        return _tagNameMap;
+    }
+}

Source/com/drew/metadata/mp4/media/Mp4UserBoxHandler.java

@@ -0,0 +1,44 @@
+package com.drew.metadata.mp4.media;
+
+import com.drew.imaging.mp4.Mp4Handler;
+import com.drew.lang.SequentialByteArrayReader;
+import com.drew.lang.SequentialReader;
+import com.drew.metadata.Metadata;
+import com.drew.metadata.mp4.Mp4Context;
+import com.drew.metadata.mp4.boxes.Box;
+import com.drew.metadata.mp4.boxes.UserBox;
+
+import java.io.IOException;
+
+public class Mp4UserBoxHandler<T extends Mp4UserBoxDirectory> extends Mp4Handler<Mp4UserBoxDirectory> {
+
+    public Mp4UserBoxHandler(Metadata metadata) {
+        super(metadata);
+    }
+
+    @Override
+    protected Mp4UserBoxDirectory getDirectory() {
+        return new Mp4UserBoxDirectory();
+    }
+
+    @Override
+    protected boolean shouldAcceptBox(Box box) {
+        return box.type.equals("uuid");
+    }
+
+    @Override
+    protected boolean shouldAcceptContainer(Box box) {
+        return false;
+    }
+
+    @Override
+    public Mp4Handler processBox(Box box, byte[] payload, Mp4Context context) throws IOException {
+        if (payload != null) {
+            SequentialReader reader = new SequentialByteArrayReader(payload);
+            UserBox userBox = new UserBox(reader, box);
+            userBox.addMetadata(directory);
+        }
+
+        return this;
+    }
+}