1 files changed, 66 insertions, 0 deletions
diff --git a/Src/external_dependencies/libmp4v2/atom_hdlr.cpp b/Src/external_dependencies/libmp4v2/atom_hdlr.cpp
new file mode 100644
index 00000000..8461f45a
--- /dev/null
+++ b/Src/external_dependencies/libmp4v2/atom_hdlr.cpp
@@ -0,0 +1,66 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is MPEG4IP.
+ * 
+ * The Initial Developer of the Original Code is Cisco Systems Inc.
+ * Portions created by Cisco Systems Inc. are
+ * Copyright (C) Cisco Systems Inc. 2001.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *		Dave Mackie		dmackie@cisco.com
+ */
+
+#include "mp4common.h"
+
+MP4HdlrAtom::MP4HdlrAtom() 
+	: MP4Atom("hdlr")
+{
+	AddVersionAndFlags(); /* 0, 1 */
+	AddReserved("reserved1", 4); /* 2 */
+	MP4StringProperty* pProp = new MP4StringProperty("handlerType");
+	pProp->SetFixedLength(4);
+	AddProperty(pProp); /* 3 */
+	AddReserved("reserved2", 12); /* 4 */
+	AddProperty( /* 5 */
+		new MP4StringProperty("name"));
+}
+
+// There is a spec incompatiblity between QT and MP4
+// QT says name field is a counted string
+// MP4 says name field is a null terminated string
+// Here we attempt to make all things work
+void MP4HdlrAtom::Read() 
+{
+	// read all the properties but the "name" field
+	ReadProperties(0, 5);
+	uint64_t pos = m_pFile->GetPosition();
+	uint64_t end = GetEnd();
+	if (pos == end) return;
+
+	// take a peek at the next byte
+	u_int8_t strLength;
+	m_pFile->PeekBytes(&strLength, 1);
+	// if the value matches the remaining atom length
+	if (pos + strLength + 1 == end) {
+		// read a counted string
+		MP4StringProperty* pNameProp = 
+			(MP4StringProperty*)m_pProperties[5];
+		pNameProp->SetCountedFormat(true);
+		ReadProperties(5);
+		pNameProp->SetCountedFormat(false);
+	} else {
+		// read a null terminated string
+		ReadProperties(5);
+	}
+
+	Skip();	// to end of atom
+}