mirror of
https://github.com/alfg/mp4-rust.git
synced 2024-06-02 13:39:54 +00:00
Add trun box.
This commit is contained in:
parent
a1f7902c6c
commit
13a60121d8
|
@ -32,6 +32,7 @@ pub(crate) mod tkhd;
|
|||
pub(crate) mod tfhd;
|
||||
pub(crate) mod trak;
|
||||
pub(crate) mod traf;
|
||||
pub(crate) mod trun;
|
||||
pub(crate) mod tx3g;
|
||||
pub(crate) mod vmhd;
|
||||
|
||||
|
@ -99,6 +100,7 @@ boxtype! {
|
|||
Co64Box => 0x636F3634,
|
||||
TrakBox => 0x7472616b,
|
||||
TrafBox => 0x74726166,
|
||||
TrunBox => 0x7472756E,
|
||||
UdtaBox => 0x75647461,
|
||||
DinfBox => 0x64696e66,
|
||||
SmhdBox => 0x736d6864,
|
||||
|
|
|
@ -7,6 +7,8 @@ use crate::mp4box::{mfhd::MfhdBox, traf::TrafBox};
|
|||
#[derive(Debug, Clone, PartialEq, Default, Serialize)]
|
||||
pub struct MoofBox {
|
||||
pub mfhd: MfhdBox,
|
||||
|
||||
#[serde(rename = "traf")]
|
||||
pub trafs: Vec<TrafBox>,
|
||||
}
|
||||
|
||||
|
|
|
@ -7,6 +7,8 @@ use crate::mp4box::{mvhd::MvhdBox, trak::TrakBox};
|
|||
#[derive(Debug, Clone, PartialEq, Default, Serialize)]
|
||||
pub struct MoovBox {
|
||||
pub mvhd: MvhdBox,
|
||||
|
||||
#[serde(rename = "trak")]
|
||||
pub traks: Vec<TrakBox>,
|
||||
}
|
||||
|
||||
|
|
|
@ -2,11 +2,12 @@ use std::io::{Read, Seek, SeekFrom, Write};
|
|||
use serde::{Serialize};
|
||||
|
||||
use crate::mp4box::*;
|
||||
use crate::mp4box::{tfhd::TfhdBox};
|
||||
use crate::mp4box::{tfhd::TfhdBox, trun::TrunBox};
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Default, Serialize)]
|
||||
pub struct TrafBox {
|
||||
pub tfhd: TfhdBox,
|
||||
pub trun: Option<TrunBox>,
|
||||
}
|
||||
|
||||
impl TrafBox {
|
||||
|
@ -17,6 +18,9 @@ impl TrafBox {
|
|||
pub fn get_size(&self) -> u64 {
|
||||
let mut size = HEADER_SIZE;
|
||||
size += self.tfhd.box_size();
|
||||
if let Some(ref trun) = self.trun {
|
||||
size += trun.box_size();
|
||||
}
|
||||
size
|
||||
}
|
||||
}
|
||||
|
@ -45,6 +49,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for TrafBox {
|
|||
let start = box_start(reader)?;
|
||||
|
||||
let mut tfhd = None;
|
||||
let mut trun = None;
|
||||
|
||||
let mut current = reader.seek(SeekFrom::Current(0))?;
|
||||
let end = start + size;
|
||||
|
@ -57,6 +62,9 @@ impl<R: Read + Seek> ReadBox<&mut R> for TrafBox {
|
|||
BoxType::TfhdBox => {
|
||||
tfhd = Some(TfhdBox::read_box(reader, s)?);
|
||||
}
|
||||
BoxType::TrunBox => {
|
||||
trun = Some(TrunBox::read_box(reader, s)?);
|
||||
}
|
||||
_ => {
|
||||
// XXX warn!()
|
||||
skip_box(reader, s)?;
|
||||
|
@ -74,6 +82,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for TrafBox {
|
|||
|
||||
Ok(TrafBox {
|
||||
tfhd: tfhd.unwrap(),
|
||||
trun,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
142
src/mp4box/trun.rs
Normal file
142
src/mp4box/trun.rs
Normal file
|
@ -0,0 +1,142 @@
|
|||
use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
|
||||
use std::io::{Read, Seek, Write};
|
||||
use serde::{Serialize};
|
||||
|
||||
use crate::mp4box::*;
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Default, Serialize)]
|
||||
pub struct TrunBox {
|
||||
pub version: u8,
|
||||
pub flags: u32,
|
||||
pub sample_count: u32,
|
||||
pub data_offset: i32,
|
||||
|
||||
// #[serde(skip_serializing)]
|
||||
pub sample_sizes: Vec<u32>,
|
||||
}
|
||||
|
||||
impl TrunBox {
|
||||
pub fn get_type(&self) -> BoxType {
|
||||
BoxType::TrunBox
|
||||
}
|
||||
|
||||
pub fn get_size(&self) -> u64 {
|
||||
HEADER_SIZE + HEADER_EXT_SIZE + 8 + (4 * self.sample_sizes.len() as u64)
|
||||
}
|
||||
}
|
||||
|
||||
impl Mp4Box for TrunBox {
|
||||
fn box_type(&self) -> BoxType {
|
||||
return self.get_type();
|
||||
}
|
||||
|
||||
fn box_size(&self) -> u64 {
|
||||
return self.get_size();
|
||||
}
|
||||
|
||||
fn to_json(&self) -> Result<String> {
|
||||
Ok(serde_json::to_string(&self).unwrap())
|
||||
}
|
||||
|
||||
fn summary(&self) -> Result<String> {
|
||||
let s = format!("sample_size={}",
|
||||
self.sample_count);
|
||||
Ok(s)
|
||||
}
|
||||
}
|
||||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for TrunBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
let sample_count = reader.read_u32::<BigEndian>()?;
|
||||
let data_offset = reader.read_i32::<BigEndian>()?;
|
||||
|
||||
let mut sample_sizes = Vec::with_capacity(sample_count as usize);
|
||||
for _ in 0..sample_count {
|
||||
let sample_duration = reader.read_u32::<BigEndian>()?;
|
||||
sample_sizes.push(sample_duration);
|
||||
}
|
||||
|
||||
skip_bytes_to(reader, start + size)?;
|
||||
|
||||
Ok(TrunBox {
|
||||
version,
|
||||
flags,
|
||||
sample_count,
|
||||
data_offset,
|
||||
sample_sizes,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl<W: Write> WriteBox<&mut W> for TrunBox {
|
||||
fn write_box(&self, writer: &mut W) -> Result<u64> {
|
||||
let size = self.box_size();
|
||||
BoxHeader::new(self.box_type(), size).write(writer)?;
|
||||
|
||||
write_box_header_ext(writer, self.version, self.flags)?;
|
||||
|
||||
writer.write_u32::<BigEndian>(self.sample_count)?;
|
||||
writer.write_i32::<BigEndian>(self.data_offset)?;
|
||||
assert_eq!(self.sample_count, self.sample_sizes.len() as u32);
|
||||
for sample_number in self.sample_sizes.iter() {
|
||||
writer.write_u32::<BigEndian>(*sample_number)?;
|
||||
}
|
||||
|
||||
Ok(size)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::mp4box::BoxHeader;
|
||||
use std::io::Cursor;
|
||||
|
||||
#[test]
|
||||
fn test_trun_same_size() {
|
||||
let src_box = TrunBox {
|
||||
version: 0,
|
||||
flags: 0,
|
||||
data_offset: 0,
|
||||
sample_count: 0,
|
||||
sample_sizes: vec![],
|
||||
};
|
||||
let mut buf = Vec::new();
|
||||
src_box.write_box(&mut buf).unwrap();
|
||||
assert_eq!(buf.len(), src_box.box_size() as usize);
|
||||
|
||||
let mut reader = Cursor::new(&buf);
|
||||
let header = BoxHeader::read(&mut reader).unwrap();
|
||||
assert_eq!(header.name, BoxType::TrunBox);
|
||||
assert_eq!(src_box.box_size(), header.size);
|
||||
|
||||
let dst_box = TrunBox::read_box(&mut reader, header.size).unwrap();
|
||||
assert_eq!(src_box, dst_box);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_trun_many_sizes() {
|
||||
let src_box = TrunBox {
|
||||
version: 0,
|
||||
flags: 0,
|
||||
data_offset: 0,
|
||||
sample_count: 9,
|
||||
sample_sizes: vec![1165, 11, 11, 8545, 10126, 10866, 9643, 9351, 7730],
|
||||
};
|
||||
let mut buf = Vec::new();
|
||||
src_box.write_box(&mut buf).unwrap();
|
||||
assert_eq!(buf.len(), src_box.box_size() as usize);
|
||||
|
||||
let mut reader = Cursor::new(&buf);
|
||||
let header = BoxHeader::read(&mut reader).unwrap();
|
||||
assert_eq!(header.name, BoxType::TrunBox);
|
||||
assert_eq!(src_box.box_size(), header.size);
|
||||
|
||||
let dst_box = TrunBox::read_box(&mut reader, header.size).unwrap();
|
||||
assert_eq!(src_box, dst_box);
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue