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

make hwcodec's bitrate the same as vpx

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2022-06-29 09:46:42 +08:00
parent b45dc606f1
commit 75fc49b301
4 changed files with 10 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ pub struct HwEncoderConfig {
pub codec_name: String,
pub width: usize,
pub height: usize,
pub bitrate_ratio: i32,
pub bitrate: i32,
}
#[derive(Debug, Clone)]

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

@@ -49,19 +49,17 @@ impl EncoderApi for HwEncoder {
{
match cfg {
EncoderCfg::HW(config) => {
let (bitrate, timebase, gop, quality, rc) =
HwEncoder::convert_quality(&config.codec_name, config.bitrate_ratio);
let ctx = EncodeContext {
name: config.codec_name.clone(),
width: config.width as _,
height: config.height as _,
pixfmt: DEFAULT_PIXFMT,
align: HW_STRIDE_ALIGN as _,
bitrate,
timebase,
gop,
quality,
rc,
bitrate: config.bitrate * 1000,
timebase: DEFAULT_TIME_BASE,
gop: DEFAULT_GOP,
quality: DEFAULT_HW_QUALITY,
rc: DEFAULT_RC,
};
let format = match Encoder::format_from_name(config.codec_name.clone()) {
Ok(format) => format,
@@ -142,7 +140,8 @@ impl EncoderApi for HwEncoder {
}
fn set_bitrate(&mut self, bitrate: u32) -> ResultType<()> {
todo!()
self.encoder.set_bitrate((bitrate * 1000) as _).ok();
Ok(())
}
}
@@ -218,28 +217,6 @@ impl HwEncoder {
Err(_) => Ok(Vec::<EncodeFrame>::new()),
}
}
fn convert_quality(
name: &str,
bitrate_ratio: i32,
) -> (i32, [i32; 2], i32, Quality, RateContorl) {
// TODO
let mut bitrate = if name.contains("qsv") {
1_000_000
} else {
2_000_000
};
if bitrate_ratio > 0 && bitrate_ratio <= 200 {
bitrate = bitrate * bitrate_ratio / 100;
};
(
bitrate,
DEFAULT_TIME_BASE,
DEFAULT_GOP,
DEFAULT_HW_QUALITY,
DEFAULT_RC,
)
}
}
pub struct HwDecoder {