diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 37b4465..85760c1 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -17,7 +17,7 @@ lazy_static = "1.4" local-ip-address = "0.4.4" log = { version = "0.4" } md5 = "0.7" -nom = "6.1.2" +nom = { version = "6.1.2", features = ["alloc"] } rand = "0.8.4" regex = "1.5.4" socket2 = "0.3" diff --git a/crates/core/src/bcmedia/de.rs b/crates/core/src/bcmedia/de.rs index d58f00d..2d4627c 100644 --- a/crates/core/src/bcmedia/de.rs +++ b/crates/core/src/bcmedia/de.rs @@ -2,11 +2,12 @@ use super::model::BcMediaIframe; use super::model::*; use crate::RX_TIMEOUT; use err_derive::Error; -use nom::IResult; -use nom::{combinator::*, named, number::streaming::*, take, take_str}; +use nom::{combinator::*, error::context, number::streaming::*, take}; use std::io::Read; use time::OffsetDateTime; +type IResult> = Result<(I, O), nom::Err>; + // PAD_SIZE: Media packets use 8 byte padding const PAD_SIZE: u32 = 8; @@ -20,13 +21,13 @@ pub enum Error { #[error(display = "I/O error")] IoError(#[error(source)] std::io::Error), } -type NomErrorType<'a> = nom::error::Error<&'a [u8]>; +type NomErrorType<'a> = nom::error::VerboseError<&'a [u8]>; impl<'a> From>> for Error { fn from(k: nom::Err>) -> Self { let reason = match k { - nom::Err::Error(e) => format!("Nom Error: {:?}", e), - nom::Err::Failure(e) => format!("Nom Error: {:?}", e), + nom::Err::Error(e) => format!("Nom Error: {:x?}", e), + nom::Err::Failure(e) => format!("Nom Error: {:x?}", e), _ => "Unknown Nom error".to_string(), }; Error::NomError(reason) @@ -37,7 +38,7 @@ fn read_from_reader(mut parser: P, mut rdr: R) -> Result where R: Read, E: for<'a> From>> + From, - P: FnMut(&[u8]) -> nom::IResult<&[u8], O>, + P: FnMut(&[u8]) -> IResult<&[u8], O>, { let mut input: Vec = Vec::new(); loop { @@ -91,17 +92,20 @@ impl BcMedia { } fn bcmedia(buf: &[u8]) -> IResult<&[u8], BcMedia> { - let (buf, magic) = verify(le_u32, |x| { - matches!( - *x, - MAGIC_HEADER_BCMEDIA_INFO_V1 - | MAGIC_HEADER_BCMEDIA_INFO_V2 - | MAGIC_HEADER_BCMEDIA_IFRAME..=MAGIC_HEADER_BCMEDIA_IFRAME_LAST - | MAGIC_HEADER_BCMEDIA_PFRAME..=MAGIC_HEADER_BCMEDIA_PFRAME_LAST - | MAGIC_HEADER_BCMEDIA_AAC - | MAGIC_HEADER_BCMEDIA_ADPCM - ) - })(buf)?; + let (buf, magic) = context( + "Failed to match any known bcmedia", + verify(le_u32, |x| { + matches!( + *x, + MAGIC_HEADER_BCMEDIA_INFO_V1 + | MAGIC_HEADER_BCMEDIA_INFO_V2 + | MAGIC_HEADER_BCMEDIA_IFRAME..=MAGIC_HEADER_BCMEDIA_IFRAME_LAST + | MAGIC_HEADER_BCMEDIA_PFRAME..=MAGIC_HEADER_BCMEDIA_PFRAME_LAST + | MAGIC_HEADER_BCMEDIA_AAC + | MAGIC_HEADER_BCMEDIA_ADPCM + ) + }), + )(buf)?; match magic { MAGIC_HEADER_BCMEDIA_INFO_V1 => { @@ -133,7 +137,10 @@ fn bcmedia(buf: &[u8]) -> IResult<&[u8], BcMedia> { } fn bcmedia_info_v1(buf: &[u8]) -> IResult<&[u8], BcMediaInfoV1> { - let (buf, _header_size) = verify(le_u32, |x| *x == 32)(buf)?; + let (buf, _header_size) = context( + "Header size mismatch in BCMedia InfoV1", + verify(le_u32, |x| *x == 32), + )(buf)?; let (buf, video_width) = le_u32(buf)?; let (buf, video_height) = le_u32(buf)?; let (buf, _unknown) = le_u8(buf)?; @@ -176,7 +183,10 @@ fn bcmedia_info_v1(buf: &[u8]) -> IResult<&[u8], BcMediaInfoV1> { } fn bcmedia_info_v2(buf: &[u8]) -> IResult<&[u8], BcMediaInfoV2> { - let (buf, _header_size) = verify(le_u32, |x| *x == 32)(buf)?; + let (buf, _header_size) = context( + "Failed to match headersize in BCMedia Info V2", + verify(le_u32, |x| *x == 32), + )(buf)?; let (buf, video_width) = le_u32(buf)?; let (buf, video_height) = le_u32(buf)?; let (buf, _unknown) = le_u8(buf)?; @@ -218,21 +228,42 @@ fn bcmedia_info_v2(buf: &[u8]) -> IResult<&[u8], BcMediaInfoV2> { )) } +fn take4(buf: &[u8]) -> IResult<&[u8], &str> { + map_res(nom::bytes::streaming::take(4usize), |r| { + std::str::from_utf8(r) + })(buf) +} + fn bcmedia_iframe(buf: &[u8]) -> IResult<&[u8], BcMediaIframe> { - named!(take4str( &[u8] ) -> &str, take_str!( 4 ) ); - let (buf, video_type_str) = verify(take4str, |x| matches!(x, "H264" | "H265"))(buf)?; + let (buf, video_type_str) = context( + "Video Type is unrecognised in IFrame", + 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_remained) = if additional_header_size > 4 { + let remainder = additional_header_size - 4; + 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, n => PAD_SIZE - n, }; let (buf, _padding) = take!(buf, pad_size)?; + assert_eq!(payload_size as usize, data_slice.len()); let video_type = match video_type_str { "H264" => VideoType::H264, @@ -253,18 +284,22 @@ fn bcmedia_iframe(buf: &[u8]) -> IResult<&[u8], BcMediaIframe> { } fn bcmedia_pframe(buf: &[u8]) -> IResult<&[u8], BcMediaPframe> { - named!(take4str( &[u8] ) -> &str, take_str!( 4 ) ); - let (buf, video_type_str) = verify(take4str, |x| matches!(x, "H264" | "H265"))(buf)?; + let (buf, video_type_str) = context( + "Video Type is unrecognised in PFrame", + 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, _additional_header) = take!(buf, additional_header_size)?; let (buf, data_slice) = take!(buf, payload_size)?; let pad_size = match payload_size % PAD_SIZE { 0 => 0, n => PAD_SIZE - n, }; let (buf, _padding) = take!(buf, pad_size)?; + assert_eq!(payload_size as usize, data_slice.len()); let video_type = match video_type_str { "H264" => VideoType::H264, @@ -307,7 +342,10 @@ fn bcmedia_adpcm(buf: &[u8]) -> IResult<&[u8], BcMediaAdpcm> { 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, _magic) = context( + "ADPCM data magic value is invalid", + verify(le_u16, |x| *x == MAGIC_HEADER_BCMEDIA_ADPCM_DATA), + )(buf)?; // On some camera this value is just 2 // On other cameras is half the block size without the header let (buf, _half_block_size) = le_u16(buf)?; @@ -387,6 +425,66 @@ mod tests { } } + #[test] + // This method will test the decoding of argus2 cameras output + // + // This packet has an extended iframe + fn test_argus2_iframe_extended() { + init(); + + 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(); + + 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] // Tests the decoding of an info v1 fn test_info_v1() { @@ -433,7 +531,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/samples/argus2_pframe_0.raw b/crates/core/src/bcmedia/samples/argus2_pframe_0.raw new file mode 100644 index 0000000..8e98774 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_0.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_1.raw b/crates/core/src/bcmedia/samples/argus2_pframe_1.raw new file mode 100644 index 0000000..30de92b Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_1.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_10.raw b/crates/core/src/bcmedia/samples/argus2_pframe_10.raw new file mode 100644 index 0000000..b3dc1f8 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_10.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_11.raw b/crates/core/src/bcmedia/samples/argus2_pframe_11.raw new file mode 100644 index 0000000..e87030c Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_11.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_12.raw b/crates/core/src/bcmedia/samples/argus2_pframe_12.raw new file mode 100644 index 0000000..f7c5b5f Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_12.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_13.raw b/crates/core/src/bcmedia/samples/argus2_pframe_13.raw new file mode 100644 index 0000000..a60b2bf Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_13.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_14.raw b/crates/core/src/bcmedia/samples/argus2_pframe_14.raw new file mode 100644 index 0000000..da2a10c Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_14.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_15.raw b/crates/core/src/bcmedia/samples/argus2_pframe_15.raw new file mode 100644 index 0000000..146aea6 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_15.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_16.raw b/crates/core/src/bcmedia/samples/argus2_pframe_16.raw new file mode 100644 index 0000000..22c0386 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_16.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_17.raw b/crates/core/src/bcmedia/samples/argus2_pframe_17.raw new file mode 100644 index 0000000..a457966 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_17.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_2.raw b/crates/core/src/bcmedia/samples/argus2_pframe_2.raw new file mode 100644 index 0000000..4bd3a89 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_2.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_3.raw b/crates/core/src/bcmedia/samples/argus2_pframe_3.raw new file mode 100644 index 0000000..07425c7 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_3.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_4.raw b/crates/core/src/bcmedia/samples/argus2_pframe_4.raw new file mode 100644 index 0000000..65f4bc3 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_4.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_5.raw b/crates/core/src/bcmedia/samples/argus2_pframe_5.raw new file mode 100644 index 0000000..31aa9d2 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_5.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_6.raw b/crates/core/src/bcmedia/samples/argus2_pframe_6.raw new file mode 100644 index 0000000..3610884 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_6.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_7.raw b/crates/core/src/bcmedia/samples/argus2_pframe_7.raw new file mode 100644 index 0000000..22f6001 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_7.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_8.raw b/crates/core/src/bcmedia/samples/argus2_pframe_8.raw new file mode 100644 index 0000000..66dac18 Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_8.raw differ diff --git a/crates/core/src/bcmedia/samples/argus2_pframe_9.raw b/crates/core/src/bcmedia/samples/argus2_pframe_9.raw new file mode 100644 index 0000000..60a6b5c Binary files /dev/null and b/crates/core/src/bcmedia/samples/argus2_pframe_9.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, )) }