weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

unify the protobuf message of vp9/h264/h265

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2022-07-05 16:16:08 +08:00
parent 6c9e601c59
commit 76e1ca91df
5 changed files with 44 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/scrap/src/common/vpxcodec.rs
View File

@@ -3,7 +3,9 @@
// https://github.com/rust-av/vpx-rs/blob/master/src/decoder.rs
use hbb_common::anyhow::{anyhow, Context};
use hbb_common::message_proto::{test_delay, Message, VP9s, VideoFrame, VP9};
use hbb_common::message_proto::{
test_delay, EncodedVideoFrame, EncodedVideoFrames, Message, VideoFrame,
};
use hbb_common::ResultType;
use crate::codec::EncoderApi;
@@ -289,10 +291,10 @@ impl VpxEncoder {
}
#[inline]
fn create_msg(vp9s: Vec<VP9>) -> Message {
fn create_msg(vp9s: Vec<EncodedVideoFrame>) -> Message {
let mut msg_out = Message::new();
let mut vf = VideoFrame::new();
vf.set_vp9s(VP9s {
vf.set_vp9s(EncodedVideoFrames {
frames: vp9s.into(),
..Default::default()
});
@@ -301,8 +303,8 @@ impl VpxEncoder {
}
#[inline]
fn create_frame(frame: &EncodeFrame) -> VP9 {
VP9 {
fn create_frame(frame: &EncodeFrame) -> EncodedVideoFrame {
EncodedVideoFrame {
data: frame.data.to_vec(),
key: frame.key,
pts: frame.pts,