mirrors/mp4-rust
1
0
Fork 0
mirror of https://github.com/alfg/mp4-rust.git synced 2024-06-10 17:09:22 +00:00
Code Issues Projects Releases Wiki Activity

fix(trex): write trexbox and make it a vec

Browse source
This commit is contained in:
Stuart Woodbury 2023-07-14 16:53:49 -04:00
parent aeb75eb9f2
commit 4b88f0459e
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mp4box/moov.rs
View file

@ -140,7 +140,6 @@ impl<W: Write> WriteBox<&mut W> for MoovBox {
for trak in self.traks.iter() { for trak in self.traks.iter() {
trak.write_box(writer)?; trak.write_box(writer)?;
} }
if let Some(udta) = &self.udta { if let Some(udta) = &self.udta {
udta.write_box(writer)?; udta.write_box(writer)?;
} }

21
src/mp4box/mvex.rs
View file

@ -7,8 +7,7 @@ use crate::mp4box::{mehd::MehdBox, trex::TrexBox};
#[derive(Debug, Clone, PartialEq, Eq, Default, Serialize)] #[derive(Debug, Clone, PartialEq, Eq, Default, Serialize)]
pub struct MvexBox { pub struct MvexBox {
pub mehd: Option<MehdBox>, pub mehd: Option<MehdBox>,
// todo: this should be a vec pub trex: Vec<TrexBox>,
pub trex: TrexBox,
} }
impl MvexBox { impl MvexBox {
@ -17,7 +16,8 @@ impl MvexBox {
} }
pub fn get_size(&self) -> u64 { pub fn get_size(&self) -> u64 {
HEADER_SIZE + self.mehd.as_ref().map(|x| x.box_size()).unwrap_or(0) + self.trex.box_size() let trex_sizes = self.trex.iter().fold(0, |acc, x| acc + x.box_size());
HEADER_SIZE + self.mehd.as_ref().map(|x| x.box_size()).unwrap_or(0) + trex_sizes
} }
} }
@ -45,7 +45,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MvexBox {
let start = box_start(reader)?; let start = box_start(reader)?;
let mut mehd = None; let mut mehd = None;
let mut trex = None; let mut trex: Vec<TrexBox> = Vec::new();
let mut current = reader.stream_position()?; let mut current = reader.stream_position()?;
let end = start + size; let end = start + size;
@ -64,7 +64,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MvexBox {
mehd = Some(MehdBox::read_box(reader, s)?); mehd = Some(MehdBox::read_box(reader, s)?);
} }
BoxType::TrexBox => { BoxType::TrexBox => {
trex = Some(TrexBox::read_box(reader, s)?); trex.push(TrexBox::read_box(reader, s)?);
} }
_ => { _ => {
// XXX warn!() // XXX warn!()
@ -75,16 +75,13 @@ impl<R: Read + Seek> ReadBox<&mut R> for MvexBox {
current = reader.stream_position()?; current = reader.stream_position()?;
} }
if trex.is_none() { if trex.is_empty() {
return Err(Error::BoxNotFound(BoxType::TrexBox)); return Err(Error::BoxNotFound(BoxType::TrexBox));
} }
skip_bytes_to(reader, start + size)?; skip_bytes_to(reader, start + size)?;
Ok(MvexBox { Ok(MvexBox { mehd, trex })
mehd,
trex: trex.unwrap(),
})
} }
} }
@ -96,7 +93,9 @@ impl<W: Write> WriteBox<&mut W> for MvexBox {
if let Some(mehd) = &self.mehd { if let Some(mehd) = &self.mehd {
mehd.write_box(writer)?; mehd.write_box(writer)?;
} }
self.trex.write_box(writer)?; for trex in self.trex {
trex.write_box(writer)?;
}
Ok(size) Ok(size)
} }