Allow multiple audio DecoderSpecificInfo entries outside of strict mode.

Author: kinetiknz

mp4parse/src/lib.rs

@@ -200,7 +200,7 @@ pub enum Status {
     ElstBadVersion,
     EsdsBadAudioSampleEntry,
     EsdsBadDescriptor,
-    EsdsDecSpecificIntoTagQuantity,
+    EsdsDecSpecificInfoTagQuantity,
     FtypBadSize,
     FtypNotFirst,
     HdlrNameNoNul,
@@ -514,7 +514,7 @@ impl From<Status> for &str {
             Status::EsdsBadDescriptor => {
                 "Invalid descriptor."
             }
-            Status::EsdsDecSpecificIntoTagQuantity => {
+            Status::EsdsDecSpecificInfoTagQuantity => {
                 "There can be only one DecSpecificInfoTag descriptor"
             }
             Status::FtypBadSize => {
@@ -5041,7 +5041,7 @@ fn get_audio_object_type(bit_reader: &mut BitReader) -> Result<u16> {
 fn read_ds_descriptor(
     data: &[u8],
     esds: &mut ES_Descriptor,
-    _strictness: ParseStrictness,
+    strictness: ParseStrictness,
 ) -> Result<()> {
     #[cfg(feature = "mp4v")]
     // Check if we are in a Visual esda Box.
@@ -5198,7 +5198,10 @@ fn read_ds_descriptor(
             esds.audio_sample_rate = Some(sample_frequency_value);
             esds.audio_channel_count = Some(channel_counts);
             if !esds.decoder_specific_data.is_empty() {
-                return Status::EsdsDecSpecificIntoTagQuantity.into();
+                fail_with_status_if(
+                    strictness == ParseStrictness::Strict,
+                    Status::EsdsDecSpecificInfoTagQuantity,
+                )?;
             }
             esds.decoder_specific_data.extend_from_slice(data)?;
 

mp4parse/src/tests.rs

@@ -1318,6 +1318,30 @@ fn read_esds_redundant_descriptor() {
     }
 }
 
+#[test]
+fn read_esds_multiple_descriptors() {
+    // Permit multiple descriptors in non-strict mode.
+    // Extracted from BMO #1936124 using Bento4.
+    // "mp4extract --payload-only moov/trak[0]/mdia/minf/stbl/stsd/mp4a/esds bug1936124.mp4 /dev/stdout | xxd -i -c 15"
+    let esds = vec![
+        0x03, 0x1d, 0x00, 0x00, 0x00, 0x04, 0x15, 0x40, 0x15, 0x00, 0x06, 0x00, 0x00, 0x01, 0x77,
+        0x00, 0x00, 0x01, 0x77, 0x00, 0x05, 0x02, 0x11, 0x90, 0x05, 0x02, 0x11, 0x90, 0x06, 0x01,
+        0x02,
+    ];
+
+    let mut stream = make_box(BoxSize::Auto, b"esds", |s| {
+        s.B32(0) // reserved
+            .append_bytes(esds.as_slice())
+    });
+    let mut iter = super::BoxIter::new(&mut stream);
+    let mut stream = iter.next_box().unwrap().unwrap();
+
+    match super::read_esds(&mut stream, ParseStrictness::Normal) {
+        Ok(esds) => assert_eq!(esds.audio_codec, super::CodecType::AAC),
+        _ => panic!("unexpected result with multiple descriptors"),
+    }
+}
+
 #[test]
 fn read_stsd_lpcm() {
     // Extract from sample converted by ffmpeg.