Merge branch 'master' of github.com-rustdesk:rustdesk/rustdesk

This commit is contained in:
rustdesk 2021-12-24 19:13:38 +08:00
commit 589177fc94
2 changed files with 2 additions and 6 deletions

View File

@ -582,7 +582,7 @@ pub struct VideoHandler {
impl VideoHandler { impl VideoHandler {
pub fn new() -> Self { pub fn new() -> Self {
VideoHandler { VideoHandler {
decoder: Decoder::new(VideoCodecId::VP9, 1).unwrap(), decoder: Decoder::new(VideoCodecId::VP9, 0).unwrap(),
rgb: Default::default(), rgb: Default::default(),
} }
} }

View File

@ -188,11 +188,7 @@ fn run(sp: GenericService) -> ResultType<()> {
speed, speed,
}; };
let mut vpx; let mut vpx;
let mut n = ((width * height) as f64 / (1920 * 1080) as f64).round() as u32; match Encoder::new(&cfg, 0) {
if n < 1 {
n = 1;
}
match Encoder::new(&cfg, n) {
Ok(x) => vpx = x, Ok(x) => vpx = x,
Err(err) => bail!("Failed to create encoder: {}", err), Err(err) => bail!("Failed to create encoder: {}", err),
} }