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

update hwcodec, qsv support changing bitrate (#7911)

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2024-05-06 10:59:25 +08:00 committed by GitHub
parent 29b13d19d6
commit 991694aca5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -3038,8 +3038,8 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]] [[package]]
name = "hwcodec" name = "hwcodec"
version = "0.4.8" version = "0.4.9"
source = "git+https://github.com/21pages/hwcodec#7cb16c64f4657385dd2adefcac7cff89088f4e6d" source = "git+https://github.com/21pages/hwcodec#7a52282267cb6aadbcd74c132bd4ecd43ab6f505"
dependencies = [ dependencies = [
"bindgen 0.59.2", "bindgen 0.59.2",
"cc", "cc",

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

@ -183,7 +183,7 @@ impl EncoderApi for HwRamEncoder {
} }
fn support_abr(&self) -> bool { fn support_abr(&self) -> bool {
!self.name.contains("qsv") ["qsv", "vaapi"].iter().all(|&x| !self.name.contains(x))
} }
} }

6
libs/scrap/src/common/vram.rs
View File

@ -16,7 +16,7 @@ use hbb_common::{
ResultType, ResultType,
}; };
use hwcodec::{ use hwcodec::{
common::{DataFormat, Driver, MAX_GOP}, common::{AdapterVendor::*, DataFormat, Driver, MAX_GOP},
vram::{ vram::{
decode::{self, DecodeFrame, Decoder}, decode::{self, DecodeFrame, Decoder},
encode::{self, EncodeFrame, Encoder}, encode::{self, EncodeFrame, Encoder},
@ -49,6 +49,7 @@ pub struct VRamEncoder {
bitrate: u32, bitrate: u32,
last_frame_len: usize, last_frame_len: usize,
same_bad_len_counter: usize, same_bad_len_counter: usize,
config: VRamEncoderConfig,
} }
impl EncoderApi for VRamEncoder { impl EncoderApi for VRamEncoder {
@ -84,6 +85,7 @@ impl EncoderApi for VRamEncoder {
bitrate, bitrate,
last_frame_len: 0, last_frame_len: 0,
same_bad_len_counter: 0, same_bad_len_counter: 0,
config,
}), }),
Err(_) => { Err(_) => {
hbb_common::config::HwCodecConfig::clear_vram(); hbb_common::config::HwCodecConfig::clear_vram();
@ -179,7 +181,7 @@ impl EncoderApi for VRamEncoder {
} }
fn support_abr(&self) -> bool { fn support_abr(&self) -> bool {
self.ctx.f.driver != Driver::MFX self.config.device.vendor_id != ADAPTER_VENDOR_INTEL as u32
} }
} }