diff --git a/libs/scrap/src/common/android.rs b/libs/scrap/src/common/android.rs index 36d6a8a9b..5daa872c6 100644 --- a/libs/scrap/src/common/android.rs +++ b/libs/scrap/src/common/android.rs @@ -50,8 +50,6 @@ impl crate::TraitCapturer for Capturer { pub enum Frame<'a> { RAW(&'a [u8]), - VP8(&'a [u8]), - VP9(&'a [u8]), Empty, } diff --git a/src/server/video_service.rs b/src/server/video_service.rs index 6c42311ac..f1053c5c9 100644 --- a/src/server/video_service.rs +++ b/src/server/video_service.rs @@ -680,16 +680,6 @@ fn run(sp: GenericService) -> ResultType<()> { let time = now - start; let ms = (time.as_secs() * 1000 + time.subsec_millis() as u64) as i64; match frame { - scrap::Frame::VP8(data) => { - let send_conn_ids = - handle_one_frame_encoded(VpxVideoCodecId::VP8, &sp, data, ms)?; - frame_controller.set_send(now, send_conn_ids); - } - scrap::Frame::VP9(data) => { - let send_conn_ids = - handle_one_frame_encoded(VpxVideoCodecId::VP9, &sp, data, ms)?; - frame_controller.set_send(now, send_conn_ids); - } scrap::Frame::RAW(data) => { if data.len() != 0 { let send_conn_ids = @@ -876,31 +866,6 @@ fn handle_one_frame( Ok(send_conn_ids) } -#[inline] -#[cfg(any(target_os = "android", target_os = "ios"))] -pub fn handle_one_frame_encoded( - codec: VpxVideoCodecId, - sp: &GenericService, - frame: &[u8], - ms: i64, -) -> ResultType> { - sp.snapshot(|sps| { - // so that new sub and old sub share the same encoder after switch - if sps.has_subscribes() { - bail!("SWITCH"); - } - Ok(()) - })?; - let vpx_frame = EncodedVideoFrame { - data: frame.to_vec().into(), - key: true, - pts: ms, - ..Default::default() - }; - let send_conn_ids = sp.send_video_frame(scrap::VpxEncoder::create_msg(codec, vec![vpx_frame])); - Ok(send_conn_ids) -} - #[inline] fn get_original_resolution(display_name: &str, w: usize, h: usize) -> MessageField { #[cfg(all(windows, feature = "virtual_display_driver"))]