diff --git a/crates/core/src/bcmedia/de.rs b/crates/core/src/bcmedia/de.rs index 6dca3ee..8b3d07e 100644 --- a/crates/core/src/bcmedia/de.rs +++ b/crates/core/src/bcmedia/de.rs @@ -282,11 +282,14 @@ fn bcmedia_aac(buf: &[u8]) -> IResult<&[u8], BcMediaAac> { } fn bcmedia_adpcm(buf: &[u8]) -> IResult<&[u8], BcMediaAdpcm> { + const BLOCK_HEADER_SIZE: u16 = 4; + let (buf, payload_size) = le_u16(buf)?; let (buf, _payload_size_b) = le_u16(buf)?; let (buf, _magic) = verify(le_u16, |x| *x == MAGIC_HEADER_BCMEDIA_ADPCM_DATA)(buf)?; - let (buf, block_size) = le_u16(buf)?; - let (buf, data_slice) = take!(buf, block_size)?; + // This `block_size` is bigendian for some reason. It is block size + let (buf, block_size) = be_u16(buf)?; + let (buf, data_slice) = take!(buf, block_size + BLOCK_HEADER_SIZE)?; let pad_size = match payload_size as u32 % PAD_SIZE { 0 => 0, n => PAD_SIZE - n, diff --git a/crates/core/src/bcmedia/ser.rs b/crates/core/src/bcmedia/ser.rs index e5bb801..2e8771c 100644 --- a/crates/core/src/bcmedia/ser.rs +++ b/crates/core/src/bcmedia/ser.rs @@ -183,6 +183,6 @@ fn bcmedia_adpcm(payload: &BcMediaAdpcm) -> impl SerializeFn { le_u16((payload.data.len() + 4) as u16), // Payload + 2 byte magic + 2byte block size le_u16((payload.data.len() + 4) as u16), // Payload + 2 byte magic + 2byte block size le_u16(MAGIC_HEADER_BCMEDIA_ADPCM_DATA), // magic - le_u16((payload.data.len()) as u16), // block size + predictor state size (4bytes) + be_u16((payload.data.len() - 4) as u16), // block size = len - predictor state size (4bytes) )) }