Skip to content

Allow unknown codecs when the ParseStrictness is not Strict#438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdrianEddy wants to merge 7 commits into
base:master
Choose a base branch
from
Open

Allow unknown codecs when the ParseStrictness is not Strict #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
07d0872
Don't fail when the wave atom contains different atoms than esds
AdrianEddy Aug 28, 2025
ba94d82
Allow unknown codecs when the ParseStrictness is not Strict
AdrianEddy Aug 28, 2025
35c5c63
Formatting
AdrianEddy Aug 28, 2025
a8c0632
Add missing argument to read_video_sample_entry in tests
AdrianEddy Aug 28, 2025
abc1f9d
Fix clippy
AdrianEddy Aug 28, 2025
abb2cd7
Merge branch 'master' into master
AdrianEddy Dec 16, 2025
ff910c6
Merge branch 'mozilla:master' into master
AdrianEddy Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions mp4parse/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5533,7 +5533,10 @@ fn read_hdlr<T: Read>(src: &mut BMFFBox<T>, strictness: ParseStrictness) -> Resu
}

/// Parse an video description inside an stsd box.
fn read_video_sample_entry<T: Read>(src: &mut BMFFBox<T>) -> Result<SampleEntry> {
fn read_video_sample_entry<T: Read>(
src: &mut BMFFBox<T>,
strictness: ParseStrictness,
) -> Result<SampleEntry> {
let name = src.get_header().name;
let codec_type = match name {
BoxType::AVCSampleEntry | BoxType::AVC3SampleEntry => CodecType::H264,
Expand DownExpand Up@@ -5688,7 +5691,12 @@ fn read_video_sample_entry<T: Read>(src: &mut BMFFBox<T>) -> Result<SampleEntry>
skip_box_content(&mut b)?;
}
}
check_parser_state!(b.content);
if strictness == ParseStrictness::Strict {
check_parser_state!(b.content);
} else {
// Padding may be present in some content.
skip_box_remain(&mut b)?;
}
}

Ok(
Expand DownExpand Up@@ -5836,11 +5844,18 @@ fn read_audio_sample_entry<T: Read>(
codec_type = CodecType::ALAC;
codec_specific = Some(AudioCodecSpecific::ALACSpecificBox(alac));
}
BoxType::QTWaveAtom => {
let qt_esds = read_qt_wave_atom(&mut b, strictness)?;
codec_type = qt_esds.audio_codec;
codec_specific = Some(AudioCodecSpecific::ES_Descriptor(qt_esds));
}
BoxType::QTWaveAtom => match read_qt_wave_atom(&mut b, strictness) {
Ok(qt_esds) => {
codec_type = qt_esds.audio_codec;
codec_specific = Some(AudioCodecSpecific::ES_Descriptor(qt_esds));
}
Err(e) => {
warn!("Failed to parse wave atom: {e:?}");
if strictness == ParseStrictness::Strict {
return Err(e);
}
}
},
BoxType::ProtectionSchemeInfoBox => {
if name != BoxType::ProtectedAudioSampleEntry {
return Status::StsdBadAudioSampleEntry.into();
Expand DownExpand Up@@ -5908,9 +5923,9 @@ fn read_stsd<T: Read>(
while descriptions.len() < description_count {
if let Some(mut b) = iter.next_box()? {
let description = match track.track_type {
TrackType::Video => read_video_sample_entry(&mut b),
TrackType::Picture => read_video_sample_entry(&mut b),
TrackType::AuxiliaryVideo => read_video_sample_entry(&mut b),
TrackType::Video => read_video_sample_entry(&mut b, strictness),
TrackType::Picture => read_video_sample_entry(&mut b, strictness),
TrackType::AuxiliaryVideo => read_video_sample_entry(&mut b, strictness),
TrackType::Audio => read_audio_sample_entry(&mut b, strictness),
TrackType::Metadata => Err(Error::Unsupported("metadata track")),
TrackType::Unknown => Err(Error::Unsupported("unknown track type")),
Expand Down
5 changes: 3 additions & 2 deletions mp4parse/src/tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1147,7 +1147,8 @@ fn read_stsd_mp4v() {
let mut iter = super::BoxIter::new(&mut stream);
let mut stream = iter.next_box().unwrap().unwrap();

let sample_entry = super::read_video_sample_entry(&mut stream).unwrap();
let sample_entry =
super::read_video_sample_entry(&mut stream, ParseStrictness::Normal).unwrap();

match sample_entry {
super::SampleEntry::Video(v) => {
Expand DownExpand Up@@ -1247,7 +1248,7 @@ fn unknown_video_sample_entry() {
});
let mut iter = super::BoxIter::new(&mut stream);
let mut stream = iter.next_box().unwrap().unwrap();
match super::read_video_sample_entry(&mut stream) {
match super::read_video_sample_entry(&mut stream, ParseStrictness::Normal) {
Ok(super::SampleEntry::Unknown) => (),
_ => panic!("expected a different error result"),
}
Expand Down