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

hwcodec: remove bad MY_DECODER_STATE

Browse Source 
When reset, the new of the decoder will be after it's drop

Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2022-07-19 18:14:34 +08:00
parent 7aa431d349
commit 23deae0e52
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ use hbb_common::{
#[cfg(feature = "hwcodec")] #[cfg(feature = "hwcodec")]
lazy_static::lazy_static! { lazy_static::lazy_static! {
static ref PEER_DECODER_STATES: Arc<Mutex<HashMap<i32, VideoCodecState>>> = Default::default(); static ref PEER_DECODER_STATES: Arc<Mutex<HashMap<i32, VideoCodecState>>> = Default::default();
static ref MY_DECODER_STATE: Arc<Mutex<VideoCodecState>> = Default::default();
} }
const SCORE_VPX: i32 = 90; const SCORE_VPX: i32 = 90;
@ -238,25 +237,18 @@ impl Encoder {
} }
} }
#[cfg(feature = "hwcodec")]
impl Drop for Decoder {
fn drop(&mut self) {
*MY_DECODER_STATE.lock().unwrap() = VideoCodecState {
score_vpx: SCORE_VPX,
..Default::default()
};
}
}
impl Decoder { impl Decoder {
pub fn video_codec_state(_id: &str) -> VideoCodecState { pub fn video_codec_state(_id: &str) -> VideoCodecState {
// video_codec_state is mainted by creation and destruction of Decoder.
// It has been ensured to use after Decoder's creation.
#[cfg(feature = "hwcodec")] #[cfg(feature = "hwcodec")]
if check_hwcodec_config() { if check_hwcodec_config() {
let mut state = MY_DECODER_STATE.lock().unwrap(); let best = HwDecoder::best();
state.perfer = Self::codec_preference(_id).into(); VideoCodecState {
state.clone() score_vpx: SCORE_VPX,
score_h264: best.h264.map_or(0, |c| c.score),
score_h265: best.h265.map_or(0, |c| c.score),
perfer: Self::codec_preference(_id).into(),
..Default::default()
}
} else { } else {
return VideoCodecState { return VideoCodecState {
score_vpx: SCORE_VPX, score_vpx: SCORE_VPX,
@ -272,23 +264,13 @@ impl Decoder {
pub fn new(config: DecoderCfg) -> Decoder { pub fn new(config: DecoderCfg) -> Decoder {
let vpx = VpxDecoder::new(config.vpx).unwrap(); let vpx = VpxDecoder::new(config.vpx).unwrap();
let decoder = Decoder { Decoder {
vpx, vpx,
#[cfg(feature = "hwcodec")] #[cfg(feature = "hwcodec")]
hw: HwDecoder::new_decoders(), hw: HwDecoder::new_decoders(),
#[cfg(feature = "hwcodec")] #[cfg(feature = "hwcodec")]
i420: vec![], i420: vec![],
};
#[cfg(feature = "hwcodec")]
{
let mut state = MY_DECODER_STATE.lock().unwrap();
state.score_vpx = SCORE_VPX;
state.score_h264 = decoder.hw.h264.as_ref().map_or(0, |d| d.info.score);
state.score_h265 = decoder.hw.h265.as_ref().map_or(0, |d| d.info.score);
} }
decoder
} }
pub fn handle_video_frame( pub fn handle_video_frame(

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

@ -178,7 +178,7 @@ pub struct HwDecoders {
} }
impl HwDecoder { impl HwDecoder {
fn best() -> CodecInfos { pub fn best() -> CodecInfos {
get_config(CFG_KEY_DECODER).unwrap_or(CodecInfos { get_config(CFG_KEY_DECODER).unwrap_or(CodecInfos {
h264: None, h264: None,
h265: None, h265: None,