mirrors/mp4-rust
1
0
Fork 0
mirror of https://github.com/alfg/mp4-rust.git synced 2024-06-02 13:39:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix descriptor size calculation bug

Browse source
This commit is contained in:
Ian Jun 2020-11-12 16:02:04 +09:00
parent 3a2bf2ea48
commit 8dc8ab20c2
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mp4box/mp4a.rs
View file

@ -257,7 +257,7 @@ impl Descriptor for ESDescriptor {
0x03
}
// XXX size > 0x7F
// XXX size < 0x80
fn desc_size() -> u32 {
2 + 3 + DecoderConfigDescriptor::desc_size() + SLConfigDescriptor::desc_size()
}
@ -274,7 +274,7 @@ impl<R: Read + Seek> ReadDesc<&mut R> for ESDescriptor {
let mut sl_config = None;
let mut current = reader.seek(SeekFrom::Current(0))?;
let end = start + size as u64 + 1; // XXX flags must be 0
let end = start + size as u64 + 2; // XXX size < 0x80
while current < end {
let (desc_tag, desc_size) = read_desc(reader)?;
match desc_tag {
@ -306,7 +306,7 @@ impl<R: Read + Seek> ReadDesc<&mut R> for ESDescriptor {
impl<W: Write> WriteDesc<&mut W> for ESDescriptor {
fn write_desc(&self, writer: &mut W) -> Result<u32> {
let size = Self::desc_size();
write_desc(writer, Self::desc_tag(), size - 2)?; // XXX size > 0x7F
write_desc(writer, Self::desc_tag(), size - 2)?; // XXX size < 0x80
writer.write_u16::<BigEndian>(self.es_id)?;
writer.write_u8(0)?;
@ -349,7 +349,7 @@ impl Descriptor for DecoderConfigDescriptor {
0x04
}
// XXX size > 0x7F
// XXX size < 0x80
fn desc_size() -> u32 {
2 + 13 + DecoderSpecificDescriptor::desc_size()
}
@ -370,7 +370,7 @@ impl<R: Read + Seek> ReadDesc<&mut R> for DecoderConfigDescriptor {
let mut dec_specific = None;
let mut current = reader.seek(SeekFrom::Current(0))?;
let end = start + size as u64 + 1; // XXX flags must be 0
let end = start + size as u64 + 2; // XXX size < 0x80
while current < end {
let (desc_tag, desc_size) = read_desc(reader)?;
match desc_tag {
@ -403,7 +403,7 @@ impl<R: Read + Seek> ReadDesc<&mut R> for DecoderConfigDescriptor {
impl<W: Write> WriteDesc<&mut W> for DecoderConfigDescriptor {
fn write_desc(&self, writer: &mut W) -> Result<u32> {
let size = Self::desc_size();
write_desc(writer, Self::desc_tag(), size - 2)?; // XXX size > 0x7F
write_desc(writer, Self::desc_tag(), size - 2)?; // XXX size < 0x80
writer.write_u8(self.object_type_indication)?;
writer.write_u8((self.stream_type << 2) + (self.up_stream & 0x02))?;
@ -439,7 +439,7 @@ impl Descriptor for DecoderSpecificDescriptor {
0x05
}
// XXX size > 0x7F
// XXX size < 0x80
fn desc_size() -> u32 {
2 + 2
}
@ -464,7 +464,7 @@ impl<R: Read + Seek> ReadDesc<&mut R> for DecoderSpecificDescriptor {
impl<W: Write> WriteDesc<&mut W> for DecoderSpecificDescriptor {
fn write_desc(&self, writer: &mut W) -> Result<u32> {
let size = Self::desc_size();
write_desc(writer, Self::desc_tag(), size - 2)?; // XXX size > 0x7F
write_desc(writer, Self::desc_tag(), size - 2)?; // XXX size < 0x80
writer.write_u8((self.profile << 3) + (self.freq_index >> 1))?;
writer.write_u8((self.freq_index << 7) + (self.chan_conf << 3))?;
@ -487,7 +487,7 @@ impl Descriptor for SLConfigDescriptor {
0x06
}
// XXX size > 0x7F
// XXX size < 0x80
fn desc_size() -> u32 {
2 + 1
}
@ -504,7 +504,7 @@ impl<R: Read + Seek> ReadDesc<&mut R> for SLConfigDescriptor {
impl<W: Write> WriteDesc<&mut W> for SLConfigDescriptor {
fn write_desc(&self, writer: &mut W) -> Result<u32> {
let size = Self::desc_size();
write_desc(writer, Self::desc_tag(), size - 2)?; // XXX size > 0x7F
write_desc(writer, Self::desc_tag(), size - 2)?; // XXX size < 0x80
writer.write_u8(0)?; // pre-defined
Ok(size)