Merge pull request #416 from kinetiknz/mvhd_trailing

Ignore unused trailing data in `mvhd`.

Author: padenot

mp4parse/src/lib.rs

@@ -4517,8 +4517,11 @@ fn read_mvhd<T: Read>(src: &mut BMFFBox<T>) -> Result<MovieHeaderBox> {
         }
         _ => unreachable!("Should have returned Status::MvhdBadVersion"),
     };
-    // Skip remaining fields.
+    // Skip remaining valid fields.
     skip(src, 80)?;
+
+    // Padding could be added in some contents.
+    skip_box_remain(src)?;
     Ok(MovieHeaderBox {
         timescale,
         duration,

mp4parse/src/tests.rs

@@ -423,6 +423,25 @@ fn read_mvhd_unknown_duration() {
     assert_eq!(parsed.duration, ::std::u64::MAX);
 }
 
+#[test]
+fn read_mvhd_v0_trailing_data() {
+    let mut stream = make_fullbox(BoxSize::Short(110), b"mvhd", 0, |s| {
+        s.B32(0)
+            .B32(0)
+            .B32(1234)
+            .B32(5678)
+            .append_repeated(0, 80)
+            .B16(0)
+    });
+    let mut iter = super::BoxIter::new(&mut stream);
+    let mut stream = iter.next_box().unwrap().unwrap();
+    assert_eq!(stream.head.name, BoxType::MovieHeaderBox);
+    assert_eq!(stream.head.size, 110);
+    let parsed = super::read_mvhd(&mut stream).unwrap();
+    assert_eq!(parsed.timescale, 1234);
+    assert_eq!(parsed.duration, 5678);
+}
+
 #[test]
 fn read_vpcc_version_0() {
     let data_length = 12u16;