aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2020-12-14 17:11:38 +0100
committerKostya Shishkov <kostya.shishkov@gmail.com>2020-12-14 17:11:38 +0100
commitb9862e981309216dda3a1265b9c22b42c55ff592 (patch)
tree3b3ef23144028f17986b01d7373ffa1d38f5da21
parent15395de63e3c784e0e4d21de655efa991643e33d (diff)
downloadnihav-b9862e981309216dda3a1265b9c22b42c55ff592.tar.gz
mov: skip common atoms in video codec extradata
-rw-r--r--nihav-commonfmt/src/demuxers/mov.rs15
1 files changed, 14 insertions, 1 deletions
diff --git a/nihav-commonfmt/src/demuxers/mov.rs b/nihav-commonfmt/src/demuxers/mov.rs
index ac124fa..da50591 100644
--- a/nihav-commonfmt/src/demuxers/mov.rs
+++ b/nihav-commonfmt/src/demuxers/mov.rs
@@ -605,8 +605,21 @@ fn read_stsd(track: &mut Track, br: &mut ByteReader, size: u64) -> DemuxerResult
let format = if depth > 8 { RGB24_FORMAT } else { PAL8_FORMAT };
let mut vhdr = NAVideoInfo::new(width, height, false, format);
vhdr.bits = depth as u8;
+ //skip various common atoms
+ while br.tell() - start_pos + 4 < size {
+ let mut buf = [0u8; 8];
+ br.peek_buf(&mut buf)?;
+ let tsize = read_u32be(&buf).unwrap() as usize;
+ let tag = &buf[4..8];
+ validate!(tsize >= 8);
+ match tag {
+ b"pasp" | b"clap" => {
+ br.read_skip(tsize)?;
+ },
+ _ => break,
+ };
+ }
let edata = if br.tell() - start_pos + 4 < size {
-//todo skip various common atoms
let edata_size = br.read_u32be()? as usize;
validate!(edata_size >= 4);
let mut buf = vec![0; edata_size - 4];