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

spelling: prefer

Browse Source 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref 2023-01-09 02:58:02 -05:00
parent 4993635652
commit 33c3489a9e
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,7 +445,7 @@ enum ImageQuality {
} }
message VideoCodecState { message VideoCodecState {
enum PerferCodec { enum PreferCodec {
Auto = 0; Auto = 0;
VPX = 1; VPX = 1;
H264 = 2; H264 = 2;
@ -455,7 +455,7 @@ message VideoCodecState {
int32 score_vpx = 1; int32 score_vpx = 1;
int32 score_h264 = 2; int32 score_h264 = 2;
int32 score_h265 = 3; int32 score_h265 = 3;
PerferCodec perfer = 4; PreferCodec prefer = 4;
} }
message OptionMessage { message OptionMessage {

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

@ -23,7 +23,7 @@ use hbb_common::{
use hbb_common::{ use hbb_common::{
config::{Config2, PeerConfig}, config::{Config2, PeerConfig},
lazy_static, lazy_static,
message_proto::video_codec_state::PerferCodec, message_proto::video_codec_state::PreferCodec,
}; };
#[cfg(feature = "hwcodec")] #[cfg(feature = "hwcodec")]
@ -149,29 +149,29 @@ impl Encoder {
&& states.iter().all(|(_, s)| s.score_h265 > 0); && states.iter().all(|(_, s)| s.score_h265 > 0);
// Preference first // Preference first
let mut preference = PerferCodec::Auto; let mut preference = PreferCodec::Auto;
let preferences: Vec<_> = states let preferences: Vec<_> = states
.iter() .iter()
.filter(|(_, s)| { .filter(|(_, s)| {
s.perfer == PerferCodec::VPX.into() s.prefer == PreferCodec::VPX.into()
|| s.perfer == PerferCodec::H264.into() && enabled_h264 || s.prefer == PreferCodec::H264.into() && enabled_h264
|| s.perfer == PerferCodec::H265.into() && enabled_h265 || s.prefer == PreferCodec::H265.into() && enabled_h265
}) })
.map(|(_, s)| s.perfer) .map(|(_, s)| s.prefer)
.collect(); .collect();
if preferences.len() > 0 && preferences.iter().all(|&p| p == preferences[0]) { if preferences.len() > 0 && preferences.iter().all(|&p| p == preferences[0]) {
preference = preferences[0].enum_value_or(PerferCodec::Auto); preference = preferences[0].enum_value_or(PreferCodec::Auto);
} }
match preference { match preference {
PerferCodec::VPX => *name.lock().unwrap() = None, PreferCodec::VPX => *name.lock().unwrap() = None,
PerferCodec::H264 => { PreferCodec::H264 => {
*name.lock().unwrap() = best.h264.map_or(None, |c| Some(c.name)) *name.lock().unwrap() = best.h264.map_or(None, |c| Some(c.name))
} }
PerferCodec::H265 => { PreferCodec::H265 => {
*name.lock().unwrap() = best.h265.map_or(None, |c| Some(c.name)) *name.lock().unwrap() = best.h265.map_or(None, |c| Some(c.name))
} }
PerferCodec::Auto => { PreferCodec::Auto => {
// score encoder // score encoder
let mut score_vpx = SCORE_VPX; let mut score_vpx = SCORE_VPX;
let mut score_h264 = best.h264.as_ref().map_or(0, |c| c.score); let mut score_h264 = best.h264.as_ref().map_or(0, |c| c.score);
@ -252,7 +252,7 @@ impl Decoder {
score_vpx: SCORE_VPX, score_vpx: SCORE_VPX,
score_h264: best.h264.map_or(0, |c| c.score), score_h264: best.h264.map_or(0, |c| c.score),
score_h265: best.h265.map_or(0, |c| c.score), score_h265: best.h265.map_or(0, |c| c.score),
perfer: Self::codec_preference(_id).into(), prefer: Self::codec_preference(_id).into(),
..Default::default() ..Default::default()
}; };
} }
@ -272,7 +272,7 @@ impl Decoder {
score_vpx: SCORE_VPX, score_vpx: SCORE_VPX,
score_h264, score_h264,
score_h265, score_h265,
perfer: Self::codec_preference(_id).into(), prefer: Self::codec_preference(_id).into(),
..Default::default() ..Default::default()
}; };
} }
@ -405,19 +405,19 @@ impl Decoder {
} }
#[cfg(any(feature = "hwcodec", feature = "mediacodec"))] #[cfg(any(feature = "hwcodec", feature = "mediacodec"))]
fn codec_preference(id: &str) -> PerferCodec { fn codec_preference(id: &str) -> PreferCodec {
let codec = PeerConfig::load(id) let codec = PeerConfig::load(id)
.options .options
.get("codec-preference") .get("codec-preference")
.map_or("".to_owned(), |c| c.to_owned()); .map_or("".to_owned(), |c| c.to_owned());
if codec == "vp9" { if codec == "vp9" {
PerferCodec::VPX PreferCodec::VPX
} else if codec == "h264" { } else if codec == "h264" {
PerferCodec::H264 PreferCodec::H264
} else if codec == "h265" { } else if codec == "h265" {
PerferCodec::H265 PreferCodec::H265
} else { } else {
PerferCodec::Auto PreferCodec::Auto
} }
} }
} }