diff --git a/src/bc/de.rs b/src/bc/de.rs index 78c9ae7..44d14cb 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -174,37 +174,12 @@ fn bc_modern_msg<'a, 'b, 'c>( // message). context.in_bin_mode.insert(header.msg_id); - let magic = &payload.as_slice()[..4]; - trace!("Magic is: {:x?}", &magic); - binary = match magic { - MAGIC_VIDEO_INFO => { - trace!("Video info magic type"); - Some(BinaryData::InfoData(payload)) - }, - MAGIC_AAC => { - trace!("AAC magic type"); - Some(BinaryData::AudioData(payload)) - }, - MAGIC_ADPCM => { - trace!("ADPCM magic type"); - Some(BinaryData::AudioData(payload)) - }, - MAGIC_IFRAME => { - trace!("IFrame magic type"); - let frame = VideoFrame::IFrame(VideoIFrame::from_binary(&payload)); - Some(BinaryData::VideoData(frame)) - }, - MAGIC_PFRAME => { - trace!("PFrame magic type"); - let frame = VideoFrame::PFrame(VideoPFrame::from_binary(&payload)); - Some(BinaryData::VideoData(frame)) - } - _ => { - trace!("Unknown magic type"); // When large video is chunked it goes here - Some(BinaryData::Unknown(payload)) - } + let binary_data = BinaryData{ + data: payload }; + context.binary_kind.insert(binary_data.kind()); + binary = Some(binary_data); buf = buf_after; } else { // Seriously, Nom, what even is this diff --git a/src/bc/model.rs b/src/bc/model.rs index 8c19929..a240bed 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -1,6 +1,7 @@ use super::xml::BcXml; use std::collections::HashSet; use std::convert::TryInto; +use log::trace; pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; @@ -23,178 +24,126 @@ pub enum BcBody { ModernMsg(ModernMsg), } -pub const MAGIC_VIDEO_INFO: &[u8] = &[0x31, 0x30, 0x30, 0x31]; -pub const MAGIC_AAC: &[u8] = &[0x30, 0x35, 0x77, 0x62]; -pub const MAGIC_ADPCM: &[u8] = &[0x30, 0x31, 0x77, 0x62]; -pub const MAGIC_IFRAME: &[u8] = &[0x30, 0x30, 0x64, 0x63]; -pub const MAGIC_PFRAME: &[u8] = &[0x30, 0x31, 0x64, 0x63]; - -#[derive(Debug, PartialEq, Eq)] -pub struct VideoIFrame { - pub raw: Vec -} - -impl VideoIFrame { - pub fn from_binary(binary: &[u8]) -> VideoIFrame { - VideoIFrame { - raw: binary.to_vec(), - } - } - - pub fn len(&self) -> usize { - self.raw.len() - } - - pub fn as_slice(&self) -> &[u8] { - self.raw.as_slice() - } - - pub fn magic(&self) -> &[u8] { - &self.raw[0..4] - } - - pub fn video_type(&self) -> &[u8] { - &self.raw[4..8] - } - - pub fn data_size(&self) -> usize { - u32::from_le_bytes(self.raw[8..12].try_into().expect("slice with incorrect length")).try_into().expect("u32 won't fit into usize") - } - - pub fn unknowna(&self) -> &[u8] { - &self.raw[12..16] - } - - pub fn timestamp(&self) -> &[u8] { - &self.raw[16..20] - } - - pub fn unknownb(&self) -> &[u8] { - &self.raw[20..24] - } - - pub fn clocktime(&self) -> &[u8] { - &self.raw[24..28] - } - - pub fn unknownc(&self) -> &[u8] { - &self.raw[28..32] - } - - pub fn video_data(&self) -> &[u8] { - &self.raw[32..] - } +#[derive(Debug, PartialEq, Eq, Hash)] +pub enum BinaryDataKind { + VideoDataIframe, + VideoDataPframe, + AudioDataAac, + AudioDataAdpcm, + InfoData, + Unknown, } #[derive(Debug, PartialEq, Eq)] -pub struct VideoPFrame { - pub raw: Vec -} - -impl VideoPFrame { - pub fn from_binary(binary: &[u8]) -> VideoPFrame { - VideoPFrame { - raw: binary.to_vec(), - } - } - - pub fn len(&self) -> usize { - self.raw.len() - } - - pub fn as_slice(&self) -> &[u8] { - self.raw.as_slice() - } - - pub fn magic(&self) -> &[u8] { - &self.raw[0..4] - } - - pub fn video_type(&self) -> &[u8] { - &self.raw[4..8] - } - - pub fn data_size(&self) -> usize { - u32::from_le_bytes(self.raw[8..12].try_into().expect("slice with incorrect length")).try_into().expect("u32 won't fit into usize") - } - - pub fn unknowna(&self) -> &[u8] { - &self.raw[12..16] - } - - pub fn timestamp(&self) -> &[u8] { - &self.raw[16..20] - } - - pub fn unknownb(&self) -> &[u8] { - &self.raw[20..24] - } - - pub fn video_data(&self) -> &[u8] { - &self.raw[24..] - } -} - -#[derive(Debug, PartialEq, Eq)] -pub enum VideoFrame { - IFrame(VideoIFrame), - PFrame(VideoPFrame), -} - -impl VideoFrame { - pub fn len(&self) -> usize { - match self { - VideoFrame::IFrame(binary) => binary.len(), - VideoFrame::PFrame(binary) => binary.len(), - } - } - - pub fn as_slice(&self) -> &[u8] { - match self { - VideoFrame::IFrame(binary) => binary.as_slice(), - VideoFrame::PFrame(binary) => binary.as_slice(), - } - } -} - -#[derive(Debug, PartialEq, Eq)] -pub enum BinaryData { - VideoData(VideoFrame), - AudioData(Vec), - InfoData(Vec), - Unknown(Vec), -} - -// Used during serlisation to create the binary data -impl std::convert::AsRef<[u8]> for BinaryData { - fn as_ref(&self) -> &[u8] { - match self { - BinaryData::VideoData(binary) => binary.as_slice(), - BinaryData::AudioData(binary) => binary.as_slice(), - BinaryData::InfoData(binary) => binary.as_slice(), - BinaryData::Unknown(binary) => binary.as_slice(), - } - } +pub struct BinaryData { + pub data: Vec, } impl BinaryData { - pub fn len(&self) -> usize { - match self { - BinaryData::VideoData(binary) => binary.len(), - BinaryData::AudioData(binary) => binary.len(), - BinaryData::InfoData(binary) => binary.len(), - BinaryData::Unknown(binary) => binary.len(), + pub fn body(&self) -> &[u8] { + let lower_limit = self.header_size(); + const CHUNK_SIZE: usize = 40000; + let upper_limit = match self.data_size() % CHUNK_SIZE { + 0 => CHUNK_SIZE, // Modulo quirk that 39999 -> 39999, 40000 -> 0, 40001 -> 1 + n => n, + }; + &self.data[lower_limit..upper_limit] + } + + pub fn header_size(&self) -> usize { + match self.kind() { + BinaryDataKind::VideoDataIframe => 32, + BinaryDataKind::VideoDataPframe => 24, + BinaryDataKind::AudioDataAac => 8, + BinaryDataKind::AudioDataAdpcm => 16, + BinaryDataKind::InfoData => 32, + BinaryDataKind::Unknown => 0, } } - pub fn as_slice(&self) -> &[u8] { - match self { - BinaryData::VideoData(binary) => binary.as_slice(), - BinaryData::AudioData(binary) => binary.as_slice(), - BinaryData::InfoData(binary) => binary.as_slice(), - BinaryData::Unknown(binary) => binary.as_slice(), + pub fn data_size(&self) -> usize { + match self.kind() { + BinaryDataKind::VideoDataIframe => BinaryData::bytes_to_size(&self.data[8..12]), + BinaryDataKind::VideoDataPframe => BinaryData::bytes_to_size(&self.data[8..12]), + BinaryDataKind::AudioDataAac => BinaryData::bytes_to_size(&self.data[4..6]), + BinaryDataKind::AudioDataAdpcm => BinaryData::bytes_to_size(&self.data[4..6]), + BinaryDataKind::InfoData => BinaryData::bytes_to_size(&self.data[4..8]), + BinaryDataKind::Unknown => self.data.len(), } } + + fn bytes_to_size(bytes: &[u8]) -> usize { + match bytes.len() { + // 8 Won't fit into usize on a 32-bit machine + 4 => { + u32::from_le_bytes(bytes.try_into() + .expect("slice with incorrect length")) + .try_into().expect("u32 won't fit into usize") + }, + 2 => { + u16::from_le_bytes(bytes.try_into() + .expect("slice with incorrect length")) + .try_into().expect("u16 won't fit into usize") + } + 1 => { + u8::from_le_bytes(bytes.try_into() + .expect("slice with incorrect length")) + .try_into().expect("u8 won't fit into usize") + } + _ => unreachable!() + } + } + + pub fn kind(&self) -> BinaryDataKind { + const MAGIC_VIDEO_INFO: &[u8] = &[0x31, 0x30, 0x30, 0x31]; + const MAGIC_AAC: &[u8] = &[0x30, 0x35, 0x77, 0x62]; + const MAGIC_ADPCM: &[u8] = &[0x30, 0x31, 0x77, 0x62]; + const MAGIC_IFRAME: &[u8] = &[0x30, 0x30, 0x64, 0x63]; + const MAGIC_PFRAME: &[u8] = &[0x30, 0x31, 0x64, 0x63]; + + let magic = &self.data[..4]; + trace!("Magic is: {:x?}", &magic); + match magic { + MAGIC_VIDEO_INFO => { + trace!("Video info magic type"); + BinaryDataKind::InfoData + }, + MAGIC_AAC => { + trace!("AAC magic type"); + BinaryDataKind::AudioDataAac + }, + MAGIC_ADPCM => { + trace!("ADPCM magic type"); + BinaryDataKind::AudioDataAdpcm + }, + MAGIC_IFRAME => { + trace!("IFrame magic type"); + BinaryDataKind::VideoDataIframe + }, + MAGIC_PFRAME => { + trace!("PFrame magic type"); + BinaryDataKind::VideoDataPframe + } + _ => { + trace!("Unknown magic type"); // When large data is chunked it goes here + BinaryDataKind::Unknown + } + } + } + + pub fn len(&self) -> usize { + self.data.len() + } + + pub fn as_slice(&self) -> &[u8] { + self.data.as_slice() + } +} + +impl std::convert::AsRef<[u8]> for BinaryData { + fn as_ref(&self) -> &[u8] { + self.as_slice() + } } #[derive(Debug, Default, PartialEq, Eq)] @@ -240,6 +189,7 @@ pub(super) struct BcSendInfo { #[derive(Debug)] pub struct BcContext { pub(super) in_bin_mode: HashSet, + pub(super) binary_kind: HashSet, } impl Bc { @@ -260,6 +210,7 @@ impl BcContext { pub fn new() -> BcContext { BcContext { in_bin_mode: HashSet::new(), + binary_kind: HashSet::new(), } } } diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 1f2943e..df2bf2b 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -17,7 +17,6 @@ pub struct BcCamera { connection: Option, logged_in: bool, rx_timeout: Duration, - byte_debt: usize, } use crate::Never; @@ -72,7 +71,6 @@ impl BcCamera { connection: None, logged_in: false, rx_timeout: Duration::from_secs(1), - byte_debt: 0, }) } @@ -281,69 +279,20 @@ impl BcCamera { }) = msg.body { trace!("Got {} bytes of video data", binary.len()); - if self.byte_debt <= 0 { - match binary { - BinaryData::VideoData(binary) => { - match binary { - VideoFrame::IFrame(frame) => { - let expected_bytes = frame.data_size(); - let actual_size = frame.video_data().len(); - if expected_bytes > actual_size { - self.byte_debt = expected_bytes - actual_size; - } - trace!("Expected {} bytes in video package", expected_bytes); - trace!("Actual {} bytes in video package", actual_size); - trace!("Remaining bytes {}", (expected_bytes - actual_size)); - data_out.write_all(frame.as_slice())?; - }, - VideoFrame::PFrame(frame) => { - let expected_bytes = frame.data_size(); - let actual_size = frame.video_data().len(); - if expected_bytes > actual_size { - self.byte_debt = expected_bytes - actual_size; - } - trace!("Expected {} bytes in video package", expected_bytes); - trace!("Actual {} bytes in video package", actual_size); - trace!("Remaining bytes {}", (expected_bytes - actual_size)); - data_out.write_all(frame.as_slice())?; - } - }; - }, - BinaryData::AudioData(binary) => { - () - }, - BinaryData::InfoData(binary) => { - () - }, - BinaryData::Unknown(binary) => { - () - }, - }; - } else { - match binary { - BinaryData::VideoData(binary) => { - trace!("Video magic detected but expected video data for chunked frame {}", self.byte_debt); - self.byte_debt -= binary.len(); - data_out.write_all(binary.as_slice())?; - }, - BinaryData::AudioData(binary) => { - trace!("Audio magic detected but expected video data for chunked frame {}", self.byte_debt); - self.byte_debt -= binary.len(); - data_out.write_all(binary.as_slice())?; - }, - BinaryData::InfoData(binary) => { - trace!("Info magic detected but expected video data for chunked frame {}", self.byte_debt); - self.byte_debt -= binary.len(); - data_out.write_all(binary.as_slice())?; - }, - BinaryData::Unknown(binary) => { - trace!("Fulfilling expected video data for chunked frame {}", self.byte_debt); - self.byte_debt -= binary.len(); - data_out.write_all(binary.as_slice())?; - }, - }; - trace!("Remaning data expected for chunked frame {}", self.byte_debt); - } + match binary.kind() { + BinaryDataKind::VideoDataIframe | BinaryDataKind::VideoDataPframe => { + data_out.write_all(binary.body())?; + }, + BinaryDataKind::AudioDataAac | BinaryDataKind::AudioDataAdpcm => { + (); + }, + BinaryDataKind::InfoData => { + (); + }, + BinaryDataKind::Unknown => { + data_out.write_all(binary.body())?; + }, + }; } else { warn!("Ignoring weird video message");