From 1f98cf517bcc4310ac9b5f37249a65eb2e1f6cd4 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Fri, 31 Jul 2020 13:54:46 +0700 Subject: [PATCH] Ok bug fixes to my continuation model and rustfmt again --- build.rs | 6 +----- src/bc/de.rs | 6 +++--- src/bc/model.rs | 14 +++++++------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/build.rs b/build.rs index c689f49..d265dfe 100644 --- a/build.rs +++ b/build.rs @@ -21,11 +21,7 @@ fn git_ver() -> Option { let mut git_cmd = Command::new("git"); git_cmd.args(&["describe", "--tags"]); - if let Some(true) = git_cmd - .status() - .ok() - .map(|exit| exit.success()) - { + if let Some(true) = git_cmd.status().ok().map(|exit| exit.success()) { println!("cargo:rerun-if-changed=.git/HEAD"); git_cmd .output() diff --git a/src/bc/de.rs b/src/bc/de.rs index 8a03f8e..81b8767 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -174,7 +174,7 @@ fn bc_modern_msg<'a, 'b, 'c>( // message). context.in_bin_mode.insert(header.msg_id); - let binary_data = BinaryData { + let mut binary_data = BinaryData { data: payload, continuation_of: None, }; @@ -191,13 +191,13 @@ fn bc_modern_msg<'a, 'b, 'c>( && context.remaining_binary_bytes >= body_size { if body_size == CHUNK_SIZE { - binaryData.continuation_of = Some(context.last_binary_kind); + binary_data.continuation_of = context.last_binary_kind; context.remaining_binary_bytes -= body_size; } else { // Reset but suggest that this might be an unknown magic code trace!( "Possibly new magic code: {:x?}", - binary_data.body()[..std::cmp::min(body_size, 32)] + &binary_data.body()[..std::cmp::min(body_size, 32)] ); context.remaining_binary_bytes = 0; context.last_binary_kind = None; diff --git a/src/bc/model.rs b/src/bc/model.rs index 727f638..230159f 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -26,7 +26,7 @@ pub enum BcBody { ModernMsg(ModernMsg), } -#[derive(Debug, PartialEq, Eq, Hash)] +#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone)] pub enum BinaryDataKind { VideoDataIframe, VideoDataPframe, @@ -42,7 +42,7 @@ pub enum BinaryDataKind { #[derive(Debug, PartialEq, Eq)] pub struct BinaryData { pub data: Vec, - continuation_of: Option, + pub continuation_of: Option, } impl BinaryData { @@ -110,19 +110,19 @@ impl BinaryData { const MAGIC_IFRAME: &[u8] = &[0x30, 0x30, 0x64, 0x63]; const MAGIC_PFRAME: &[u8] = &[0x30, 0x31, 0x64, 0x63]; - if let Some(continuation_of) = self.continuation_of { - match continuation_of { + if let Some(continuation_of) = &self.continuation_of { + return match continuation_of { BinaryDataKind::VideoDataIframe | BinaryDataKind::VideoDataPframe - | BinaryDataKind::VideoCont => BinaryData::VideoCont, + | BinaryDataKind::VideoCont => BinaryDataKind::VideoCont, BinaryDataKind::AudioDataAac | BinaryDataKind::AudioDataAdpcm - | BinaryDataKind::AudioCont => BinaryData::AudioCont, + | BinaryDataKind::AudioCont => BinaryDataKind::AudioCont, BinaryDataKind::InfoData | BinaryDataKind::InfoDataCont => { BinaryDataKind::InfoDataCont } BinaryDataKind::Unknown => BinaryDataKind::Unknown, - } + }; } let magic = &self.data[..4];