andrey/retina
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mp4 example: avoid panic with non-aac audio

Browse Source
This commit is contained in:
Scott Lamb 2021-09-10 13:45:50 -07:00
parent 379bf840c1
commit 0ddb1423c6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/client/mp4.rs
View File

@ -454,7 +454,11 @@ impl<W: AsyncWrite + AsyncSeek + Send + Unpin> Mp4Writer<W> {
write_box!(buf, b"stsd", { write_box!(buf, b"stsd", {
buf.put_u32(0); // version buf.put_u32(0); // version
buf.put_u32(1); // entry_count buf.put_u32(1); // entry_count
buf.extend_from_slice(&parameters.sample_entry().unwrap()[..]); buf.extend_from_slice(
&parameters
.sample_entry()
.expect("all added streams have sample entries")[..],
);
}); });
self.audio_trak.write_common_stbl_parts(buf)?; self.audio_trak.write_common_stbl_parts(buf)?;
@ -722,7 +726,11 @@ pub async fn run(opts: Opts) -> Result<(), Error> {
.iter() .iter()
.enumerate() .enumerate()
.find_map(|(i, s)| match s.parameters() { .find_map(|(i, s)| match s.parameters() {
Some(retina::codec::Parameters::Audio(a)) => Some((i, a.clone())), // Only consider audio streams that can produce a .mp4 sample
// entry.
Some(retina::codec::Parameters::Audio(a)) if a.sample_entry().is_some() => {
Some((i, a.clone()))
}
_ => None, _ => None,
}) })
} else { } else {