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

score equals 0 if codec unsupported

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2022-07-05 16:31:48 +08:00
parent 76e1ca91df
commit c4b4ef9576
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hbb_common/protos/message.proto
View File

@ -434,10 +434,8 @@ enum ImageQuality {
message VideoCodecState { message VideoCodecState {
int32 ScoreVpx = 1; int32 ScoreVpx = 1;
bool H264 = 2; int32 ScoreH264 = 2;
int32 ScoreH264 = 3; int32 ScoreH265 = 3;
bool H265 = 4;
int32 ScoreH265 = 5;
} }
message OptionMessage { message OptionMessage {

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

@ -135,10 +135,12 @@ impl Encoder {
let current_encoder_name = HwEncoder::current_name(); let current_encoder_name = HwEncoder::current_name();
if states.len() > 0 { if states.len() > 0 {
let (best, _) = HwEncoder::best(false, true); let (best, _) = HwEncoder::best(false, true);
let enabled_h264 = let enabled_h264 = best.h264.is_some()
best.h264.is_some() && states.len() > 0 && states.iter().all(|(_, s)| s.H264); && states.len() > 0
let enabled_h265 = && states.iter().all(|(_, s)| s.ScoreH264 > 0);
best.h265.is_some() && states.len() > 0 && states.iter().all(|(_, s)| s.H265); let enabled_h265 = best.h265.is_some()
&& states.len() > 0
&& states.iter().all(|(_, s)| s.ScoreH265 > 0);
// score encoder // score encoder
let mut score_vpx = SCORE_VPX; let mut score_vpx = SCORE_VPX;
@ -238,9 +240,7 @@ impl Decoder {
{ {
let mut state = MY_DECODER_STATE.lock().unwrap(); let mut state = MY_DECODER_STATE.lock().unwrap();
state.ScoreVpx = SCORE_VPX; state.ScoreVpx = SCORE_VPX;
state.H264 = decoder.hw.h264.is_some();
state.ScoreH264 = decoder.hw.h264.as_ref().map_or(0, |d| d.info.score); state.ScoreH264 = decoder.hw.h264.as_ref().map_or(0, |d| d.info.score);
state.H265 = decoder.hw.h265.is_some();
state.ScoreH265 = decoder.hw.h265.as_ref().map_or(0, |d| d.info.score); state.ScoreH265 = decoder.hw.h265.as_ref().map_or(0, |d| d.info.score);
} }