hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove android unused VP8/VP9 Frame

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-05-09 11:23:38 +08:00
parent e482dc3e2b
commit 99d3c47094
2 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/scrap/src/common/android.rs
View File

@ -50,8 +50,6 @@ impl crate::TraitCapturer for Capturer {
pub enum Frame<'a> { pub enum Frame<'a> {
RAW(&'a [u8]), RAW(&'a [u8]),
VP8(&'a [u8]),
VP9(&'a [u8]),
Empty, Empty,
} }

35
src/server/video_service.rs
View File

@ -680,16 +680,6 @@ fn run(sp: GenericService) -> ResultType<()> {
let time = now - start; let time = now - start;
let ms = (time.as_secs() * 1000 + time.subsec_millis() as u64) as i64; let ms = (time.as_secs() * 1000 + time.subsec_millis() as u64) as i64;
match frame { 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) => { scrap::Frame::RAW(data) => {
if data.len() != 0 { if data.len() != 0 {
let send_conn_ids = let send_conn_ids =
@ -876,31 +866,6 @@ fn handle_one_frame(
Ok(send_conn_ids) 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<HashSet<i32>> {
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] #[inline]
fn get_original_resolution(display_name: &str, w: usize, h: usize) -> MessageField<Resolution> { fn get_original_resolution(display_name: &str, w: usize, h: usize) -> MessageField<Resolution> {
#[cfg(all(windows, feature = "virtual_display_driver"))] #[cfg(all(windows, feature = "virtual_display_driver"))]