Add support for AMR-NB and AMR-WB.

mp4parse/src/boxes.rs

@@ -137,6 +137,9 @@ box_database!(
     H263SpecificBox                   0x6432_3633, // "d263"
     MP4AudioSampleEntry               0x6d70_3461, // "mp4a"
     MP4VideoSampleEntry               0x6d70_3476, // "mp4v"
+    AMRNBSampleEntry                  0x7361_6d72, // "samr" - AMR narrow-band
+    AMRWBSampleEntry                  0x7361_7762, // "sawb" - AMR wide-band
+    AMRSpecificBox                    0x6461_6d72, // "damr"
     ESDBox                            0x6573_6473, // "esds"
     VP8SampleEntry                    0x7670_3038, // "vp08"
     VP9SampleEntry                    0x7670_3039, // "vp09"

mp4parse/src/lib.rs

@@ -399,6 +399,10 @@ pub enum AudioCodecSpecific {
     ALACSpecificBox(ALACSpecificBox),
     MP3,
     LPCM,
+    AMRSpecificBox(TryVec<u8>),
+    // Some mp4 file with AMR doesn't have above AMRSpecificBox "damr",
+    // we use empty box instead.
+    AMRSpecificEmptyBox,
 }
 
 #[derive(Debug)]
@@ -1113,6 +1117,8 @@ pub enum CodecType {
     LPCM, // QT
     ALAC,
     H263,
+    AMRNB,
+    AMRWB,
 }
 
 impl Default for CodecType {
@@ -3742,6 +3748,16 @@ fn read_audio_sample_entry<T: Read>(src: &mut BMFFBox<T>) -> Result<SampleEntry>
     let (mut codec_type, mut codec_specific) = match name {
         BoxType::MP3AudioSampleEntry => (CodecType::MP3, Some(AudioCodecSpecific::MP3)),
         BoxType::LPCMAudioSampleEntry => (CodecType::LPCM, Some(AudioCodecSpecific::LPCM)),
+        // Some mp4 file with AMR doesn't have AMRSpecificBox "damr" in followed while loop,
+        // we use empty box by default.
+        BoxType::AMRNBSampleEntry => (
+            CodecType::AMRNB,
+            Some(AudioCodecSpecific::AMRSpecificEmptyBox),
+        ),
+        BoxType::AMRWBSampleEntry => (
+            CodecType::AMRWB,
+            Some(AudioCodecSpecific::AMRSpecificEmptyBox),
+        ),
         _ => (CodecType::Unknown, None),
     };
     let mut protection_info = TryVec::new();
@@ -3801,6 +3817,19 @@ fn read_audio_sample_entry<T: Read>(src: &mut BMFFBox<T>) -> Result<SampleEntry>
                 codec_type = CodecType::EncryptedAudio;
                 protection_info.push(sinf)?;
             }
+            BoxType::AMRSpecificBox => {
+                if codec_type != CodecType::AMRNB && codec_type != CodecType::AMRWB {
+                    return Err(Error::InvalidData("malformed audio sample entry"));
+                }
+                let amr_dec_spec_struc_size = b
+                    .head
+                    .size
+                    .checked_sub(b.head.offset)
+                    .expect("offset invalid");
+                let amr_dec_spec_struc = read_buf(&mut b.content, amr_dec_spec_struc_size)?;
+                debug!("{:?} (AMRDecSpecStruc)", amr_dec_spec_struc);
+                codec_specific = Some(AudioCodecSpecific::AMRSpecificBox(amr_dec_spec_struc));
+            }
             _ => {
                 debug!("Unsupported audio codec, box {:?} found", b.head.name);
                 skip_box_content(&mut b)?;

mp4parse/tests/public.rs

@@ -44,6 +44,12 @@ static AVIF_CORRUPT_IMAGES: &str = "tests/corrupt";
 // The 1 frame h263 3gp file can be generated by ffmpeg with command
 // "ffmpeg -i [input file] -f 3gp -vcodec h263 -vf scale=176x144 -frames:v 1 -an output.3gp"
 static VIDEO_H263_3GP: &str = "tests/bbb_sunflower_QCIF_30fps_h263_noaudio_1f.3gp";
+// The 1 frame AMR-NB 3gp file can be generated by ffmpeg with command
+// "ffmpeg -i [input file] -f 3gp -acodec amr_nb -ar 8000 -ac 1 -frames:a 1 -vn output.3gp"
+static AUDIO_AMRNB_3GP: &str = "tests/amr_nb_1f.3gp";
+// The 1 frame AMR-WB 3gp file can be generated by ffmpeg with command
+// "ffmpeg -i [input file] -f 3gp -acodec amr_wb -ar 16000 -ac 1 -frames:a 1 -vn output.3gp"
+static AUDIO_AMRWB_3GP: &str = "tests/amr_wb_1f.3gp";
 
 // Adapted from https://github.com/GuillaumeGomez/audio-video-metadata/blob/9dff40f565af71d5502e03a2e78ae63df95cfd40/src/metadata.rs#L53
 #[test]
@@ -157,6 +163,10 @@ fn public_api() {
                         mp4::AudioCodecSpecific::LPCM => {
                             "LPCM"
                         }
+                        mp4::AudioCodecSpecific::AMRSpecificBox(_)
+                        | mp4::AudioCodecSpecific::AMRSpecificEmptyBox => {
+                            "AMR"
+                        }
                     },
                     "ES"
                 );
@@ -797,3 +807,53 @@ fn public_video_h263() {
         };
     }
 }
+
+#[test]
+fn public_audio_amrnb() {
+    let mut fd = File::open(AUDIO_AMRNB_3GP).expect("Unknown file");
+    let mut buf = Vec::new();
+    fd.read_to_end(&mut buf).expect("File error");
+
+    let mut c = Cursor::new(&buf);
+    let context = mp4::read_mp4(&mut c).expect("read_mp4 failed");
+    for track in context.tracks {
+        let stsd = track.stsd.expect("expected an stsd");
+        let a = match stsd.descriptions.first().expect("expected a SampleEntry") {
+            mp4::SampleEntry::Audio(ref v) => v,
+            _ => panic!("expected a AudioSampleEntry"),
+        };
+        assert!(a.codec_type == mp4::CodecType::AMRNB);
+        let _codec_specific = match a.codec_specific {
+            mp4::AudioCodecSpecific::AMRSpecificBox(_)
+            | mp4::AudioCodecSpecific::AMRSpecificEmptyBox => true,
+            _ => {
+                panic!("expected a AMRSpecificBox",);
+            }
+        };
+    }
+}
+
+#[test]
+fn public_audio_amrwb() {
+    let mut fd = File::open(AUDIO_AMRWB_3GP).expect("Unknown file");
+    let mut buf = Vec::new();
+    fd.read_to_end(&mut buf).expect("File error");
+
+    let mut c = Cursor::new(&buf);
+    let context = mp4::read_mp4(&mut c).expect("read_mp4 failed");
+    for track in context.tracks {
+        let stsd = track.stsd.expect("expected an stsd");
+        let a = match stsd.descriptions.first().expect("expected a SampleEntry") {
+            mp4::SampleEntry::Audio(ref v) => v,
+            _ => panic!("expected a AudioSampleEntry"),
+        };
+        assert!(a.codec_type == mp4::CodecType::AMRWB);
+        let _codec_specific = match a.codec_specific {
+            mp4::AudioCodecSpecific::AMRSpecificBox(_)
+            | mp4::AudioCodecSpecific::AMRSpecificEmptyBox => true,
+            _ => {
+                panic!("expected a AMRSpecificBox",);
+            }
+        };
+    }
+}

mp4parse_capi/src/lib.rs

@@ -126,6 +126,8 @@ pub enum Mp4parseCodec {
     Ec3,
     Alac,
     H263,
+    AMRNB,
+    AMRWB,
 }
 
 impl Default for Mp4parseCodec {
@@ -895,6 +897,14 @@ fn get_track_audio_info(
             }
             AudioCodecSpecific::MP3 => Mp4parseCodec::Mp3,
             AudioCodecSpecific::ALACSpecificBox(_) => Mp4parseCodec::Alac,
+            AudioCodecSpecific::AMRSpecificBox(_) | AudioCodecSpecific::AMRSpecificEmptyBox
+                if audio.codec_type == CodecType::AMRNB =>
+            {
+                Mp4parseCodec::AMRNB
+            }
+            AudioCodecSpecific::AMRSpecificBox(_) | AudioCodecSpecific::AMRSpecificEmptyBox => {
+                Mp4parseCodec::AMRWB
+            }
         };
         sample_info.channels = audio.channelcount as u16;
         sample_info.bit_depth = audio.samplesize;
@@ -955,7 +965,10 @@ fn get_track_audio_info(
                 sample_info.codec_specific_config.length = alac.data.len() as u32;
                 sample_info.codec_specific_config.data = alac.data.as_ptr();
             }
-            AudioCodecSpecific::MP3 | AudioCodecSpecific::LPCM => (),
+            AudioCodecSpecific::MP3
+            | AudioCodecSpecific::LPCM
+            | AudioCodecSpecific::AMRSpecificBox(_)
+            | AudioCodecSpecific::AMRSpecificEmptyBox => (),
         }
 
         if let Some(p) = audio