Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/atom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ macro_rules! nested {
Any::Unknown(kind, _) => {
tracing::warn!("unknown box: {:?}", kind);
},
Any::Skip(atom) => tracing::debug!("skipping skip box of size {}", atom.zeroed.size),
Any::Free(atom) => tracing::debug!("skipping free box of size {}", atom.zeroed.size),
_ => return Err(Error::UnexpectedBox(atom.kind())),
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/free.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
use crate::*;

///
/// Free padding space, will be automatically skipped during parsing.
/// Also see [`Skip`] for a similar atom.
///
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct Free {
Expand Down
9 changes: 2 additions & 7 deletions src/moov/udta/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ use crate::*;
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct Udta {
pub meta: Option<Meta>,
pub skip: Option<Skip>,
}

impl Atom for Udta {
const KIND: FourCC = FourCC::new(b"udta");

nested! {
required: [ ],
optional: [ Meta, Skip ],
optional: [ Meta ],
multiple: [ ],
}
}
Expand All @@ -27,10 +26,7 @@ mod tests {

#[test]
fn test_udta_empty() {
let expected = Udta {
meta: None,
skip: None,
};
let expected = Udta { meta: None };

let mut buf = Vec::new();
expected.encode(&mut buf).unwrap();
Expand All @@ -50,7 +46,6 @@ mod tests {
},
items: vec![],
}),
skip: None,
};

let mut buf = Vec::new();
Expand Down
4 changes: 4 additions & 0 deletions src/moov/udta/skip.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
use crate::*;

///
/// Free padding space, will be automatically skipped during parsing.
/// Also see [`Free`] for a similar atom.
///
#[derive(Debug, Clone, PartialEq, Eq, Default)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct Skip {
Expand Down
1 change: 0 additions & 1 deletion src/test/av1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,6 @@ fn av1() {
},
items: vec![Ilst::default().into()],
}),
skip: None,
})
}
);
Expand Down
1 change: 0 additions & 1 deletion src/test/bbb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@ fn bbb() {
hdlr: Hdlr{ handler: FourCC::new(b"mdir"), name: "".into() },
items: vec![Ilst::default().into()],
}),
..Default::default()
}),

..Default::default()
Expand Down
5 changes: 1 addition & 4 deletions src/test/esds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,7 @@ fn esds() {
..Default::default()
}],
udta: Some(Udta {
skip: Some(Skip {
zeroed: 82.into(),
}),
..Default::default()
meta: None,
}),

..Default::default()
Expand Down
7 changes: 1 addition & 6 deletions src/test/h264.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,7 @@ fn avcc_ext() {
udta: None,
},
],
udta: Some(Udta {
meta: None,
skip: Some(Skip {
zeroed: Zeroed { size: 81 },
}),
}),
udta: Some(Udta { meta: None }),
};

assert_eq!(moov, expected, "different decoded result");
Expand Down
1 change: 0 additions & 1 deletion src/test/hevc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@ fn hevc() {
},
items: vec![Ilst::default().into(),],
}),
skip: None,
})
}
);
Expand Down
1 change: 0 additions & 1 deletion src/test/uncompressed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ fn uncompressed() {
},
items: vec![Ilst::default().into()],
}),
skip: None,
})
}
);
Expand Down