diff --git a/crates/core/src/bcmedia/de.rs b/crates/core/src/bcmedia/de.rs index f6aa94a..e5324f3 100644 --- a/crates/core/src/bcmedia/de.rs +++ b/crates/core/src/bcmedia/de.rs @@ -240,11 +240,41 @@ fn bcmedia_iframe(buf: &[u8]) -> IResult<&[u8], BcMediaIframe> { verify(take4, |x| matches!(x, "H264" | "H265")), )(buf)?; let (buf, payload_size) = le_u32(buf)?; - let (buf, _unknown_a) = le_u32(buf)?; + let (buf, additional_header_size) = le_u32(buf)?; let (buf, microseconds) = le_u32(buf)?; let (buf, _unknown_b) = le_u32(buf)?; - let (buf, time) = le_u32(buf)?; - let (buf, _unknown_c) = le_u32(buf)?; + let (buf, time) = if additional_header_size >= 4 { + let (buf, time_value) = le_u32(buf)?; + (buf, Some(time_value)) + } else { + (buf, None) + }; + let (buf, _unknown_c) = if additional_header_size >= 8 { + let (buf, unknown_c) = le_u32(buf)?; + (buf, Some(unknown_c)) + } else { + (buf, None) + }; + let (buf, _unknown_d) = if additional_header_size >= 12 { + let (buf, unknown_d) = le_u32(buf)?; + (buf, Some(unknown_d)) + } else { + (buf, None) + }; + let (buf, _unknown_e) = if additional_header_size >= 16 { + let (buf, unknown_e) = le_u32(buf)?; + (buf, Some(unknown_e)) + } else { + (buf, None) + }; + let (buf, _unknown_remained) = if additional_header_size > 16 { + let remainder = additional_header_size - 16; + let (buf, unknown_remained) = take!(buf, remainder)?; + (buf, Some(unknown_remained)) + } else { + (buf, None) + }; + let (buf, data_slice) = take!(buf, payload_size)?; let pad_size = match payload_size % PAD_SIZE { 0 => 0, @@ -414,18 +444,46 @@ mod tests { } #[test] - // This method will test the decoding on argus2 cameras output + // This method will test the decoding of argus2 cameras output // - // This will do a full desearialise from Bc to BcMedia - // Crucially this is a battery camera - fn test_argus2_pframe_extended() { + // This packet has an extended iframe + fn test_argus2_iframe_extended() { init(); - let files: Vec<_> = (0..18) + let files: Vec<_> = (0..5) .into_iter() + .map(|i| sample(&format!("argus2_iframe_{}.raw", i))) + .collect(); + + let mut subsciber = FileSubscriber::from_files(files); + // Should derealise all of this + loop { + let e = BcMedia::deserialize(&mut subsciber); + match e { + Err(Error::IoError(e)) if e.kind() == ErrorKind::UnexpectedEof => { + // Reach end of files + break; + } + Err(e) => { + error!("{:?}", e); + panic!(); + } + Ok(_) => {} + } + } + } + + #[test] + // This method will test the decoding of argus2 cameras output + // + // This packet has an extended pframe + fn test_argus2_pframe_extended() { + init(); + + let files: Vec<_> = (0..18) + .into_iter() .map(|i| sample(&format!("argus2_pframe_{}.raw", i))) .collect(); - println!("files: {:?}", files); let mut subsciber = FileSubscriber::from_files(files); // Should derealise all of this @@ -442,7 +500,6 @@ mod tests { } Ok(_) => {} } - println!("\n\n\n\n\n\n\n\n\n\nPrevious: {:0x?}", e); } } @@ -492,7 +549,7 @@ mod tests { if let Ok(BcMedia::Iframe(BcMediaIframe { video_type: VideoType::H264, microseconds: 3557705112, - time: 1628085232, + time: Some(1628085232), data: d, })) = e { diff --git a/crates/core/src/bcmedia/model.rs b/crates/core/src/bcmedia/model.rs index 732028d..d191104 100644 --- a/crates/core/src/bcmedia/model.rs +++ b/crates/core/src/bcmedia/model.rs @@ -128,7 +128,7 @@ pub struct BcMediaIframe { pub microseconds: u32, // unknown: u32, // Known values 1-00/23/5A 2-00 3-00 4-00 /// POSIX time (seconds since 00:00:00 Jan 1 1970) - pub time: u32, + pub time: Option, //unknown: u32, // Known values 1-00/06/29 2-00/01 3-00/C3 4-00 /// Raw IFrame data pub data: Vec, diff --git a/crates/core/src/bcmedia/samples/argus2_iframe_0.raw b/crates/core/src/bcmedia/samples/argus2_iframe_0.raw new file mode 100644 index 0000000..674f8b2 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_iframe_0.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_iframe_1.raw b/crates/core/src/bcmedia/samples/argus2_iframe_1.raw new file mode 100644 index 0000000..313ae85 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_iframe_1.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_iframe_2.raw b/crates/core/src/bcmedia/samples/argus2_iframe_2.raw new file mode 100644 index 0000000..fdd9478 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_iframe_2.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_iframe_3.raw b/crates/core/src/bcmedia/samples/argus2_iframe_3.raw new file mode 100644 index 0000000..13233d5 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_iframe_3.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_iframe_4.raw b/crates/core/src/bcmedia/samples/argus2_iframe_4.raw new file mode 100644 index 0000000..2f2064b Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_iframe_4.raw differ diff --git a/crates/core/src/bcmedia/ser.rs b/crates/core/src/bcmedia/ser.rs index c5328cc..39b69a8 100644 --- a/crates/core/src/bcmedia/ser.rs +++ b/crates/core/src/bcmedia/ser.rs @@ -141,15 +141,27 @@ fn bcmedia_iframe(payload: &BcMediaIframe) -> impl SerializeFn { VideoType::H264 => "H264", VideoType::H265 => "H265", }; + let (extra_header, extra_header_size) = if let Some(payload_time) = payload.time { + let extra_header = slice( + gen(tuple((le_u32(payload_time), le_u32(0))), vec![]) + .unwrap() + .0, + ); + let extra_header_size = 8; + (extra_header, extra_header_size) + } else { + let extra_header = slice(vec![]); + let extra_header_size = 0; + (extra_header, extra_header_size) + }; tuple(( le_u32(MAGIC_HEADER_BCMEDIA_IFRAME), string(vid_string), le_u32(payload.data.len() as u32), - le_u32(0), // unknown. NVR channel count? Known values 1-00/08 2-00 3-00 4-00 + le_u32(extra_header_size), // unknown. NVR channel count? Known values 1-00/08 2-00 3-00 4-00 le_u32(payload.microseconds), le_u32(0), // unknown. Known values 1-00/23/5A 2-00 3-00 4-00 - le_u32(payload.time), - le_u32(0), // unknown. Known values 1-00/06/29 2-00/01 3-00/C3 4-00 + extra_header, )) }