'chan' box could be exist in other audio entry.

Author: alfredoyang

mp4parse/src/boxes.rs

@@ -137,6 +137,5 @@ box_database!(
     OriginalFormatBox                 0x66726d61, // "frma"
     MP3AudioSampleEntry               0x2e6d7033, // ".mp3" - from F4V.
     CompositionOffsetBox              0x63747473, // "ctts"
-    AudioChannelLayoutAtom            0x6368616E, // "chan" - quicktime atom
     LPCMAudioSampleEntry              0x6C70636D, // "lpcm" - quicktime atom
 );

mp4parse/src/lib.rs

@@ -1863,12 +1863,11 @@ fn read_audio_sample_entry<T: Read>(src: &mut BMFFBox<T>) -> Result<(CodecType,
         _ => return Err(Error::Unsupported("unsupported non-isom audio sample entry")),
     }
 
-    let mut codec_type = CodecType::Unknown;
-    let mut codec_specific = None;
-    if name == BoxType::MP3AudioSampleEntry {
-        codec_type = CodecType::MP3;
-        codec_specific = Some(AudioCodecSpecific::MP3);
-    }
+    let (mut codec_type, mut codec_specific) = match name {
+        BoxType::MP3AudioSampleEntry => (CodecType::MP3, Some(AudioCodecSpecific::MP3)),
+        BoxType::LPCMAudioSampleEntry => (CodecType::LPCM, Some(AudioCodecSpecific::LPCM)),
+        _ => (CodecType::Unknown, None),
+    };
     let mut protection_info = Vec::new();
     let mut iter = src.box_iter();
     while let Some(mut b) = iter.next_box()? {
@@ -1916,15 +1915,6 @@ fn read_audio_sample_entry<T: Read>(src: &mut BMFFBox<T>) -> Result<(CodecType,
                 codec_type = CodecType::EncryptedAudio;
                 vec_push(&mut protection_info, sinf)?;
             }
-            BoxType::AudioChannelLayoutAtom => {
-                if name != BoxType::LPCMAudioSampleEntry {
-                    return Err(Error::InvalidData("malformed audio sample entry"));
-                }
-                // skip 'chan' for now.
-                skip_box_content(&mut b)?;
-                codec_type = CodecType::LPCM;
-                codec_specific = Some(AudioCodecSpecific::LPCM);
-            }
             _ => {
                 log!("Unsupported audio codec, box {:?} found", b.head.name);
                 skip_box_content(&mut b)?;

mp4parse/src/tests.rs

@@ -848,6 +848,9 @@ fn read_qt_wave_atom() {
          .B8(0x6b)  // mp3
          .append_repeated(0, 12)
     }).into_inner();
+    let chan = make_box(BoxSize::Auto, b"chan", |s| {
+        s.append_repeated(0, 10)    // we don't care its data.
+    }).into_inner();
     let wave = make_box(BoxSize::Auto, b"wave", |s| {
         s.append_bytes(esds.as_slice())
     }).into_inner();
@@ -862,6 +865,7 @@ fn read_qt_wave_atom() {
          .B32(48000 << 16)
          .append_repeated(0, 16)
          .append_bytes(wave.as_slice())
+         .append_bytes(chan.as_slice())
     });
 
     let mut iter = super::BoxIter::new(&mut stream);
@@ -1172,4 +1176,3 @@ fn read_stsd_lpcm() {
     }
 
 }
-