From d6c38642de48360693132fd07552a454016d71c3 Mon Sep 17 00:00:00 2001
From: w-flo <w-flo@users.noreply.github.com>
Date: Sat, 29 Jul 2023 06:06:22 +0200
Subject: [PATCH] Try to skip extended header in MetaBox. (#111)

Fixes #102

Co-authored-by: Alfred Gutierrez <alfg@users.noreply.github.com>
---
 src/mp4box/meta.rs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/mp4box/meta.rs b/src/mp4box/meta.rs
index 6e155a2..56ca816 100644
--- a/src/mp4box/meta.rs
+++ b/src/mp4box/meta.rs
@@ -90,9 +90,19 @@ impl<R: Read + Seek> ReadBox<&mut R> for MetaBox {
     fn read_box(reader: &mut R, size: u64) -> Result<Self> {
         let start = box_start(reader)?;
 
-        let (version, _) = read_box_header_ext(reader)?;
-        if version != 0 {
-            return Err(Error::UnsupportedBoxVersion(BoxType::UdtaBox, version));
+        let extended_header = reader.read_u32::<BigEndian>()?;
+        if extended_header != 0 {
+            // ISO mp4 requires this header (version & flags) to be 0. Some
+            // files skip the extended header and directly start the hdlr box.
+            let possible_hdlr = BoxType::from(reader.read_u32::<BigEndian>()?);
+            if possible_hdlr == BoxType::HdlrBox {
+                // This file skipped the extended header! Go back to start.
+                reader.seek(SeekFrom::Current(-8))?;
+            } else {
+                // Looks like we actually have a bad version number or flags.
+                let v = (extended_header >> 24) as u8;
+                return Err(Error::UnsupportedBoxVersion(BoxType::MetaBox, v));
+            }
         }
 
         let mut current = reader.stream_position()?;