mirror of
https://github.com/alfg/mp4-rust.git
synced 2024-06-10 17:09:22 +00:00
Merge 8de496ee0c
into b4fca8a199
This commit is contained in:
commit
495a8d400f
109
src/mp4box/adrm.rs
Normal file
109
src/mp4box/adrm.rs
Normal file
|
@ -0,0 +1,109 @@
|
||||||
|
use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
|
||||||
|
|
||||||
|
use serde::Serialize;
|
||||||
|
use std::io::{Read, Seek, Write};
|
||||||
|
|
||||||
|
use crate::mp4box::*;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||||
|
pub struct AdrmBox {
|
||||||
|
#[serde(serialize_with = "<[_]>::serialize")]
|
||||||
|
pub drm_blob: [u8; 48],
|
||||||
|
pub file_checksum: [u8; 20],
|
||||||
|
#[serde(serialize_with = "<[_]>::serialize")]
|
||||||
|
pub unknown0: [u8; 60],
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Mp4Box for AdrmBox {
|
||||||
|
fn box_type(&self) -> BoxType {
|
||||||
|
BoxType::AdrmBox
|
||||||
|
}
|
||||||
|
|
||||||
|
fn box_size(&self) -> u64 {
|
||||||
|
156
|
||||||
|
}
|
||||||
|
|
||||||
|
fn to_json(&self) -> Result<String> {
|
||||||
|
Ok(serde_json::to_string(&self).unwrap())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn summary(&self) -> Result<String> {
|
||||||
|
let mut s = String::with_capacity(49);
|
||||||
|
s.push_str("checksum=");
|
||||||
|
for b in self.file_checksum.iter() {
|
||||||
|
s.push_str(&format!("{:02x}", b));
|
||||||
|
}
|
||||||
|
Ok(s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<R: Read + Seek> ReadBox<&mut R> for AdrmBox {
|
||||||
|
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||||
|
let start = box_start(reader)?;
|
||||||
|
|
||||||
|
let mut result = AdrmBox {
|
||||||
|
drm_blob: [0u8; 48],
|
||||||
|
file_checksum: [0u8; 20],
|
||||||
|
unknown0: [0u8; 60],
|
||||||
|
};
|
||||||
|
|
||||||
|
reader.read_u32::<BigEndian>()?; // 56
|
||||||
|
reader.read_u32::<BigEndian>()?; // 1
|
||||||
|
reader.read_exact(&mut result.drm_blob)?;
|
||||||
|
reader.read_u32::<BigEndian>()?; // 0
|
||||||
|
reader.read_u32::<BigEndian>()?; // 1
|
||||||
|
reader.read_u32::<BigEndian>()?; // 0
|
||||||
|
reader.read_exact(&mut result.file_checksum)?;
|
||||||
|
reader.read_exact(&mut result.unknown0)?;
|
||||||
|
|
||||||
|
assert_eq!(reader.stream_position()?, start + size);
|
||||||
|
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<W: Write> WriteBox<&mut W> for AdrmBox {
|
||||||
|
fn write_box(&self, writer: &mut W) -> Result<u64> {
|
||||||
|
let size = self.box_size();
|
||||||
|
BoxHeader::new(self.box_type(), size).write(writer)?;
|
||||||
|
|
||||||
|
writer.write_u32::<BigEndian>(56)?;
|
||||||
|
writer.write_u32::<BigEndian>(1)?;
|
||||||
|
writer.write_all(&self.drm_blob)?;
|
||||||
|
writer.write_u32::<BigEndian>(0)?;
|
||||||
|
writer.write_u32::<BigEndian>(1)?;
|
||||||
|
writer.write_u32::<BigEndian>(0)?;
|
||||||
|
writer.write_all(&self.file_checksum)?;
|
||||||
|
writer.write_all(&self.unknown0)?;
|
||||||
|
|
||||||
|
Ok(size)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use crate::mp4box::BoxHeader;
|
||||||
|
use std::io::Cursor;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_adrm() {
|
||||||
|
let src_box = AdrmBox {
|
||||||
|
drm_blob: [29u8; 48],
|
||||||
|
file_checksum: [244u8; 20],
|
||||||
|
unknown0: [113u8; 60],
|
||||||
|
};
|
||||||
|
|
||||||
|
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::AdrmBox);
|
||||||
|
assert_eq!(src_box.box_size(), header.size);
|
||||||
|
|
||||||
|
let dst_box = AdrmBox::read_box(&mut reader, header.size).unwrap();
|
||||||
|
assert_eq!(src_box, dst_box);
|
||||||
|
}
|
||||||
|
}
|
|
@ -62,6 +62,7 @@ use std::io::{Read, Seek, SeekFrom, Write};
|
||||||
|
|
||||||
use crate::*;
|
use crate::*;
|
||||||
|
|
||||||
|
pub(crate) mod adrm;
|
||||||
pub(crate) mod avc1;
|
pub(crate) mod avc1;
|
||||||
pub(crate) mod co64;
|
pub(crate) mod co64;
|
||||||
pub(crate) mod ctts;
|
pub(crate) mod ctts;
|
||||||
|
@ -237,6 +238,7 @@ boxtype! {
|
||||||
DayBox => 0xa9646179,
|
DayBox => 0xa9646179,
|
||||||
CovrBox => 0x636f7672,
|
CovrBox => 0x636f7672,
|
||||||
DescBox => 0x64657363,
|
DescBox => 0x64657363,
|
||||||
|
AdrmBox => 0x6164726d,
|
||||||
WideBox => 0x77696465
|
WideBox => 0x77696465
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use std::io::{Read, Seek, Write};
|
use std::io::{Read, Seek, Write};
|
||||||
|
|
||||||
use crate::mp4box::*;
|
use crate::{adrm::AdrmBox, mp4box::*};
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||||
pub struct Mp4aBox {
|
pub struct Mp4aBox {
|
||||||
|
@ -12,6 +12,7 @@ pub struct Mp4aBox {
|
||||||
|
|
||||||
#[serde(with = "value_u32")]
|
#[serde(with = "value_u32")]
|
||||||
pub samplerate: FixedPointU16,
|
pub samplerate: FixedPointU16,
|
||||||
|
pub adrm: Option<AdrmBox>,
|
||||||
pub esds: Option<EsdsBox>,
|
pub esds: Option<EsdsBox>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,6 +23,7 @@ impl Default for Mp4aBox {
|
||||||
channelcount: 2,
|
channelcount: 2,
|
||||||
samplesize: 16,
|
samplesize: 16,
|
||||||
samplerate: FixedPointU16::new(48000),
|
samplerate: FixedPointU16::new(48000),
|
||||||
|
adrm: None,
|
||||||
esds: Some(EsdsBox::default()),
|
esds: Some(EsdsBox::default()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -34,6 +36,7 @@ impl Mp4aBox {
|
||||||
channelcount: config.chan_conf as u16,
|
channelcount: config.chan_conf as u16,
|
||||||
samplesize: 16,
|
samplesize: 16,
|
||||||
samplerate: FixedPointU16::new(config.freq_index.freq() as u16),
|
samplerate: FixedPointU16::new(config.freq_index.freq() as u16),
|
||||||
|
adrm: None,
|
||||||
esds: Some(EsdsBox::new(config)),
|
esds: Some(EsdsBox::new(config)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -89,9 +92,10 @@ impl<R: Read + Seek> ReadBox<&mut R> for Mp4aBox {
|
||||||
reader.read_u32::<BigEndian>()?; // pre-defined, reserved
|
reader.read_u32::<BigEndian>()?; // pre-defined, reserved
|
||||||
let samplerate = FixedPointU16::new_raw(reader.read_u32::<BigEndian>()?);
|
let samplerate = FixedPointU16::new_raw(reader.read_u32::<BigEndian>()?);
|
||||||
|
|
||||||
|
let mut adrm = None;
|
||||||
let mut esds = None;
|
let mut esds = None;
|
||||||
let current = reader.stream_position()?;
|
let mut current = reader.stream_position()?;
|
||||||
if current < start + size {
|
while current < start + size {
|
||||||
let header = BoxHeader::read(reader)?;
|
let header = BoxHeader::read(reader)?;
|
||||||
let BoxHeader { name, size: s } = header;
|
let BoxHeader { name, size: s } = header;
|
||||||
if s > size {
|
if s > size {
|
||||||
|
@ -100,10 +104,19 @@ impl<R: Read + Seek> ReadBox<&mut R> for Mp4aBox {
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
if name == BoxType::EsdsBox {
|
match name {
|
||||||
esds = Some(EsdsBox::read_box(reader, s)?);
|
BoxType::AdrmBox => {
|
||||||
|
adrm = Some(AdrmBox::read_box(reader, s)?);
|
||||||
|
}
|
||||||
|
BoxType::EsdsBox => {
|
||||||
|
esds = Some(EsdsBox::read_box(reader, s)?);
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
skip_box(reader, s)?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
skip_bytes_to(reader, start + size)?;
|
|
||||||
|
current = reader.stream_position()?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(Mp4aBox {
|
Ok(Mp4aBox {
|
||||||
|
@ -111,6 +124,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for Mp4aBox {
|
||||||
channelcount,
|
channelcount,
|
||||||
samplesize,
|
samplesize,
|
||||||
samplerate,
|
samplerate,
|
||||||
|
adrm,
|
||||||
esds,
|
esds,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -605,6 +619,7 @@ mod tests {
|
||||||
channelcount: 2,
|
channelcount: 2,
|
||||||
samplesize: 16,
|
samplesize: 16,
|
||||||
samplerate: FixedPointU16::new(48000),
|
samplerate: FixedPointU16::new(48000),
|
||||||
|
adrm: None,
|
||||||
esds: Some(EsdsBox {
|
esds: Some(EsdsBox {
|
||||||
version: 0,
|
version: 0,
|
||||||
flags: 0,
|
flags: 0,
|
||||||
|
@ -647,6 +662,7 @@ mod tests {
|
||||||
channelcount: 2,
|
channelcount: 2,
|
||||||
samplesize: 16,
|
samplesize: 16,
|
||||||
samplerate: FixedPointU16::new(48000),
|
samplerate: FixedPointU16::new(48000),
|
||||||
|
adrm: None,
|
||||||
esds: None,
|
esds: None,
|
||||||
};
|
};
|
||||||
let mut buf = Vec::new();
|
let mut buf = Vec::new();
|
||||||
|
|
|
@ -107,6 +107,10 @@ impl<R: Read + Seek> ReadBox<&mut R> for StsdBox {
|
||||||
BoxType::Tx3gBox => {
|
BoxType::Tx3gBox => {
|
||||||
tx3g = Some(Tx3gBox::read_box(reader, s)?);
|
tx3g = Some(Tx3gBox::read_box(reader, s)?);
|
||||||
}
|
}
|
||||||
|
// aavd
|
||||||
|
BoxType::UnknownBox(0x61617664) => {
|
||||||
|
mp4a = Some(Mp4aBox::read_box(reader, s)?);
|
||||||
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue