mirror of
https://github.com/alfg/mp4-rust.git
synced 2024-05-19 16:58:04 +00:00
Merge branch 'master' into feature/fragment_handling
This commit is contained in:
commit
eba4ba0c85
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "mp4"
|
||||
version = "0.13.0"
|
||||
version = "0.14.0"
|
||||
authors = ["Alf <alf.g.jr@gmail.com>"]
|
||||
edition = "2018"
|
||||
description = "MP4 reader and writer library in Rust."
|
||||
|
|
|
@ -63,7 +63,7 @@ cargo add mp4
|
|||
```
|
||||
or add to your `Cargo.toml`:
|
||||
```toml
|
||||
mp4 = "0.13.0"
|
||||
mp4 = "0.14.0"
|
||||
```
|
||||
|
||||
#### Documentation
|
||||
|
|
|
@ -21,7 +21,7 @@ pub enum MetaBox {
|
|||
hdlr: HdlrBox,
|
||||
|
||||
#[serde(skip)]
|
||||
data: Vec<u8>,
|
||||
data: Vec<(BoxType, Vec<u8>)>,
|
||||
},
|
||||
}
|
||||
|
||||
|
@ -41,7 +41,13 @@ impl MetaBox {
|
|||
size += ilst.box_size();
|
||||
}
|
||||
}
|
||||
Self::Unknown { hdlr, data } => size += hdlr.box_size() + data.len() as u64,
|
||||
Self::Unknown { hdlr, data } => {
|
||||
size += hdlr.box_size()
|
||||
+ data
|
||||
.iter()
|
||||
.map(|(_, data)| data.len() as u64 + HEADER_SIZE)
|
||||
.sum::<u64>()
|
||||
}
|
||||
}
|
||||
size
|
||||
}
|
||||
|
@ -84,22 +90,56 @@ impl<R: Read + Seek> ReadBox<&mut R> for MetaBox {
|
|||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, _) = read_box_header_ext(reader)?;
|
||||
if version != 0 {
|
||||
return Err(Error::UnsupportedBoxVersion(BoxType::UdtaBox, version));
|
||||
let extended_header = reader.read_u32::<BigEndian>()?;
|
||||
if extended_header != 0 {
|
||||
// ISO mp4 requires this header (version & flags) to be 0. Some
|
||||
// files skip the extended header and directly start the hdlr box.
|
||||
let possible_hdlr = BoxType::from(reader.read_u32::<BigEndian>()?);
|
||||
if possible_hdlr == BoxType::HdlrBox {
|
||||
// This file skipped the extended header! Go back to start.
|
||||
reader.seek(SeekFrom::Current(-8))?;
|
||||
} else {
|
||||
// Looks like we actually have a bad version number or flags.
|
||||
let v = (extended_header >> 24) as u8;
|
||||
return Err(Error::UnsupportedBoxVersion(BoxType::MetaBox, v));
|
||||
}
|
||||
}
|
||||
|
||||
let hdlr_header = BoxHeader::read(reader)?;
|
||||
if hdlr_header.name != BoxType::HdlrBox {
|
||||
return Err(Error::BoxNotFound(BoxType::HdlrBox));
|
||||
}
|
||||
let hdlr = HdlrBox::read_box(reader, hdlr_header.size)?;
|
||||
|
||||
let mut ilst = None;
|
||||
|
||||
let mut current = reader.stream_position()?;
|
||||
let end = start + size;
|
||||
|
||||
let content_start = current;
|
||||
|
||||
// find the hdlr box
|
||||
let mut hdlr = None;
|
||||
while current < end {
|
||||
// Get box header.
|
||||
let header = BoxHeader::read(reader)?;
|
||||
let BoxHeader { name, size: s } = header;
|
||||
|
||||
match name {
|
||||
BoxType::HdlrBox => {
|
||||
hdlr = Some(HdlrBox::read_box(reader, s)?);
|
||||
}
|
||||
_ => {
|
||||
// XXX warn!()
|
||||
skip_box(reader, s)?;
|
||||
}
|
||||
}
|
||||
|
||||
current = reader.stream_position()?;
|
||||
}
|
||||
|
||||
let Some(hdlr) = hdlr else {
|
||||
return Err(Error::BoxNotFound(BoxType::HdlrBox));
|
||||
};
|
||||
|
||||
// rewind and handle the other boxes
|
||||
reader.seek(SeekFrom::Start(content_start))?;
|
||||
current = reader.stream_position()?;
|
||||
|
||||
let mut ilst = None;
|
||||
|
||||
match hdlr.handler_type {
|
||||
MDIR => {
|
||||
while current < end {
|
||||
|
@ -123,8 +163,27 @@ impl<R: Read + Seek> ReadBox<&mut R> for MetaBox {
|
|||
Ok(MetaBox::Mdir { ilst })
|
||||
}
|
||||
_ => {
|
||||
let mut data = vec![0u8; (end - current) as usize];
|
||||
reader.read_exact(&mut data)?;
|
||||
let mut data = Vec::new();
|
||||
|
||||
while current < end {
|
||||
// Get box header.
|
||||
let header = BoxHeader::read(reader)?;
|
||||
let BoxHeader { name, size: s } = header;
|
||||
|
||||
match name {
|
||||
BoxType::HdlrBox => {
|
||||
skip_box(reader, s)?;
|
||||
}
|
||||
_ => {
|
||||
let mut box_data = vec![0; (s - HEADER_SIZE) as usize];
|
||||
reader.read_exact(&mut box_data)?;
|
||||
|
||||
data.push((name, box_data));
|
||||
}
|
||||
}
|
||||
|
||||
current = reader.stream_position()?;
|
||||
}
|
||||
|
||||
Ok(MetaBox::Unknown { hdlr, data })
|
||||
}
|
||||
|
@ -154,7 +213,12 @@ impl<W: Write> WriteBox<&mut W> for MetaBox {
|
|||
ilst.write_box(writer)?;
|
||||
}
|
||||
}
|
||||
Self::Unknown { data, .. } => writer.write_all(data)?,
|
||||
Self::Unknown { data, .. } => {
|
||||
for (box_type, data) in data {
|
||||
BoxHeader::new(*box_type, data.len() as u64 + HEADER_SIZE).write(writer)?;
|
||||
writer.write_all(data)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(size)
|
||||
}
|
||||
|
@ -202,16 +266,35 @@ mod tests {
|
|||
assert_eq!(dst_box, src_box);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_meta_hdrl_non_first() {
|
||||
let data = b"\x00\x00\x00\x7fmeta\x00\x00\x00\x00\x00\x00\x00Qilst\x00\x00\x00I\xa9too\x00\x00\x00Adata\x00\x00\x00\x01\x00\x00\x00\x00TMPGEnc Video Mastering Works 7 Version 7.0.15.17\x00\x00\x00\"hdlr\x00\x00\x00\x00\x00\x00\x00\x00mdirappl\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
|
||||
let mut reader = Cursor::new(data);
|
||||
let header = BoxHeader::read(&mut reader).unwrap();
|
||||
assert_eq!(header.name, BoxType::MetaBox);
|
||||
|
||||
let meta_box = MetaBox::read_box(&mut reader, header.size).unwrap();
|
||||
|
||||
// this contains \xa9too box in the ilst
|
||||
// it designates the tool that created the file, but is not yet supported by this crate
|
||||
assert_eq!(
|
||||
meta_box,
|
||||
MetaBox::Mdir {
|
||||
ilst: Some(IlstBox::default())
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_meta_unknown() {
|
||||
let src_hdlr = HdlrBox {
|
||||
handler_type: FourCC::from(*b"test"),
|
||||
..Default::default()
|
||||
};
|
||||
let src_data = b"123";
|
||||
let src_data = (BoxType::UnknownBox(0x42494241), b"123".to_vec());
|
||||
let src_box = MetaBox::Unknown {
|
||||
hdlr: src_hdlr,
|
||||
data: src_data.to_vec(),
|
||||
data: vec![src_data],
|
||||
};
|
||||
|
||||
let mut buf = Vec::new();
|
||||
|
|
|
@ -85,7 +85,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for StscBox {
|
|||
let mut sample_id = 1;
|
||||
for i in 0..entry_count {
|
||||
let (first_chunk, samples_per_chunk) = {
|
||||
let mut entry = entries.get_mut(i as usize).unwrap();
|
||||
let entry = entries.get_mut(i as usize).unwrap();
|
||||
entry.first_sample = sample_id;
|
||||
(entry.first_chunk, entry.samples_per_chunk)
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue