From 018c70a0541a2ebff2dd427016c2f408399db516 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Tue, 11 Aug 2020 16:29:55 +0700 Subject: [PATCH] Remove continue packet type --- src/bc_protocol.rs | 3 --- src/bc_protocol/media_packet.rs | 9 +++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 52ab222..24b4320 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -293,9 +293,6 @@ impl BcCamera { MediaDataKind::Invalid => { (); } - MediaDataKind::Continue => { - (); - } }; } } diff --git a/src/bc_protocol/media_packet.rs b/src/bc_protocol/media_packet.rs index 2cfb328..8d06e59 100644 --- a/src/bc_protocol/media_packet.rs +++ b/src/bc_protocol/media_packet.rs @@ -11,7 +11,6 @@ use std::time::Duration; const INVALID_MEDIA_PACKETS: &[MediaDataKind] = &[ MediaDataKind::Invalid, - MediaDataKind::Continue, MediaDataKind::Unknown, ]; @@ -40,7 +39,6 @@ pub enum MediaDataKind { AudioDataAdpcm, InfoData, Invalid, - Continue, Unknown, } @@ -70,7 +68,7 @@ impl MediaData { MediaDataKind::AudioDataAac => 8, MediaDataKind::AudioDataAdpcm => 16, MediaDataKind::InfoData => 32, - MediaDataKind::Unknown | MediaDataKind::Invalid | MediaDataKind::Continue => 0, + MediaDataKind::Unknown | MediaDataKind::Invalid => 0, } } @@ -91,7 +89,7 @@ impl MediaData { MediaDataKind::AudioDataAac => MediaData::bytes_to_size(&data[4..6]), MediaDataKind::AudioDataAdpcm => MediaData::bytes_to_size(&data[4..6]), MediaDataKind::InfoData => 0, // The bytes in MediaData::bytes_to_size(&data[4..8]) seem to be the size of the header - MediaDataKind::Unknown | MediaDataKind::Invalid | MediaDataKind::Continue => data.len(), + MediaDataKind::Unknown | MediaDataKind::Invalid => data.len(), } } @@ -150,7 +148,6 @@ impl MediaData { MAGIC_ADPCM => MediaDataKind::AudioDataAdpcm, MAGIC_IFRAME => MediaDataKind::VideoDataIframe, MAGIC_PFRAME => MediaDataKind::VideoDataPframe, - _ if data.len() == CHUNK_SIZE => MediaDataKind::Continue, _ => { trace!("Unknown magic kind: {:x?}", &magic); MediaDataKind::Unknown @@ -255,7 +252,7 @@ impl MediaData { // Not sure how to check this yet. Theres only one per stream at the start though true } - MediaDataKind::Unknown | MediaDataKind::Continue => true, + MediaDataKind::Unknown => true, MediaDataKind::Invalid => false, } }