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

don't new hwcodec decoders if option disabled

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2022-12-13 09:47:23 +08:00
parent cd511010a8
commit e58f2186ec
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,7 +218,7 @@ impl Encoder {
#[inline] #[inline]
pub fn current_hw_encoder_name() -> Option<String> { pub fn current_hw_encoder_name() -> Option<String> {
#[cfg(feature = "hwcodec")] #[cfg(feature = "hwcodec")]
if check_hwcodec_config() { if enable_hwcodec_option() {
return HwEncoder::current_name().lock().unwrap().clone(); return HwEncoder::current_name().lock().unwrap().clone();
} else { } else {
return None; return None;
@ -229,7 +229,7 @@ impl Encoder {
pub fn supported_encoding() -> (bool, bool) { pub fn supported_encoding() -> (bool, bool) {
#[cfg(feature = "hwcodec")] #[cfg(feature = "hwcodec")]
if check_hwcodec_config() { if enable_hwcodec_option() {
let best = HwEncoder::best(); let best = HwEncoder::best();
( (
best.h264.as_ref().map_or(false, |c| c.score > 0), best.h264.as_ref().map_or(false, |c| c.score > 0),
@ -246,7 +246,7 @@ impl Encoder {
impl Decoder { impl Decoder {
pub fn video_codec_state(_id: &str) -> VideoCodecState { pub fn video_codec_state(_id: &str) -> VideoCodecState {
#[cfg(feature = "hwcodec")] #[cfg(feature = "hwcodec")]
if check_hwcodec_config() { if enable_hwcodec_option() {
let best = HwDecoder::best(); let best = HwDecoder::best();
return VideoCodecState { return VideoCodecState {
score_vpx: SCORE_VPX, score_vpx: SCORE_VPX,
@ -257,7 +257,7 @@ impl Decoder {
}; };
} }
#[cfg(feature = "mediacodec")] #[cfg(feature = "mediacodec")]
if check_hwcodec_config() { if enable_hwcodec_option() {
let score_h264 = if H264_DECODER_SUPPORT.load(std::sync::atomic::Ordering::SeqCst) { let score_h264 = if H264_DECODER_SUPPORT.load(std::sync::atomic::Ordering::SeqCst) {
92 92
} else { } else {
@ -287,11 +287,19 @@ impl Decoder {
Decoder { Decoder {
vpx, vpx,
#[cfg(feature = "hwcodec")] #[cfg(feature = "hwcodec")]
hw: HwDecoder::new_decoders(), hw: if enable_hwcodec_option() {
HwDecoder::new_decoders()
} else {
HwDecoders::default()
},
#[cfg(feature = "hwcodec")] #[cfg(feature = "hwcodec")]
i420: vec![], i420: vec![],
#[cfg(feature = "mediacodec")] #[cfg(feature = "mediacodec")]
media_codec: MediaCodecDecoder::new_decoders(), media_codec: if enable_hwcodec_option() {
MediaCodecDecoder::new_decoders()
} else {
MediaCodecDecoders::default()
},
} }
} }
@ -415,7 +423,7 @@ impl Decoder {
} }
#[cfg(any(feature = "hwcodec", feature = "mediacodec"))] #[cfg(any(feature = "hwcodec", feature = "mediacodec"))]
fn check_hwcodec_config() -> bool { fn enable_hwcodec_option() -> bool {
if let Some(v) = Config2::get().options.get("enable-hwcodec") { if let Some(v) = Config2::get().options.get("enable-hwcodec") {
return v != "N"; return v != "N";
} }

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

@ -94,7 +94,7 @@ impl EncoderApi for HwEncoder {
frames.push(EncodedVideoFrame { frames.push(EncodedVideoFrame {
data: Bytes::from(frame.data), data: Bytes::from(frame.data),
pts: frame.pts as _, pts: frame.pts as _,
key:frame.key == 1, key: frame.key == 1,
..Default::default() ..Default::default()
}); });
} }
@ -175,6 +175,7 @@ pub struct HwDecoder {
pub info: CodecInfo, pub info: CodecInfo,
} }
#[derive(Default)]
pub struct HwDecoders { pub struct HwDecoders {
pub h264: Option<HwDecoder>, pub h264: Option<HwDecoder>,
pub h265: Option<HwDecoder>, pub h265: Option<HwDecoder>,

1
libs/scrap/src/common/mediacodec.rs
View File

@ -37,6 +37,7 @@ impl Deref for MediaCodecDecoder {
} }
} }
#[derive(Default)]
pub struct MediaCodecDecoders { pub struct MediaCodecDecoders {
pub h264: Option<MediaCodecDecoder>, pub h264: Option<MediaCodecDecoder>,
pub h265: Option<MediaCodecDecoder>, pub h265: Option<MediaCodecDecoder>,