From e58f2186ec86d454b64da324b46bad38d1b7ece5 Mon Sep 17 00:00:00 2001
From: 21pages <pages21@163.com>
Date: Tue, 13 Dec 2022 09:47:23 +0800
Subject: [PATCH] don't new hwcodec decoders if option disabled

Signed-off-by: 21pages <pages21@163.com>
---
 libs/scrap/src/common/codec.rs      | 22 +++++++++++++++-------
 libs/scrap/src/common/hwcodec.rs    |  3 ++-
 libs/scrap/src/common/mediacodec.rs |  1 +
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/libs/scrap/src/common/codec.rs b/libs/scrap/src/common/codec.rs
index d729342d6..9535e9f3a 100644
--- a/libs/scrap/src/common/codec.rs
+++ b/libs/scrap/src/common/codec.rs
@@ -218,7 +218,7 @@ impl Encoder {
     #[inline]
     pub fn current_hw_encoder_name() -> Option<String> {
         #[cfg(feature = "hwcodec")]
-        if check_hwcodec_config() {
+        if enable_hwcodec_option() {
             return HwEncoder::current_name().lock().unwrap().clone();
         } else {
             return None;
@@ -229,7 +229,7 @@ impl Encoder {
 
     pub fn supported_encoding() -> (bool, bool) {
         #[cfg(feature = "hwcodec")]
-        if check_hwcodec_config() {
+        if enable_hwcodec_option() {
             let best = HwEncoder::best();
             (
                 best.h264.as_ref().map_or(false, |c| c.score > 0),
@@ -246,7 +246,7 @@ impl Encoder {
 impl Decoder {
     pub fn video_codec_state(_id: &str) -> VideoCodecState {
         #[cfg(feature = "hwcodec")]
-        if check_hwcodec_config() {
+        if enable_hwcodec_option() {
             let best = HwDecoder::best();
             return VideoCodecState {
                 score_vpx: SCORE_VPX,
@@ -257,7 +257,7 @@ impl Decoder {
             };
         }
         #[cfg(feature = "mediacodec")]
-        if check_hwcodec_config() {
+        if enable_hwcodec_option() {
             let score_h264 = if H264_DECODER_SUPPORT.load(std::sync::atomic::Ordering::SeqCst) {
                 92
             } else {
@@ -287,11 +287,19 @@ impl Decoder {
         Decoder {
             vpx,
             #[cfg(feature = "hwcodec")]
-            hw: HwDecoder::new_decoders(),
+            hw: if enable_hwcodec_option() {
+                HwDecoder::new_decoders()
+            } else {
+                HwDecoders::default()
+            },
             #[cfg(feature = "hwcodec")]
             i420: vec![],
             #[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"))]
-fn check_hwcodec_config() -> bool {
+fn enable_hwcodec_option() -> bool {
     if let Some(v) = Config2::get().options.get("enable-hwcodec") {
         return v != "N";
     }
diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs
index 166f7516c..c77da3f8f 100644
--- a/libs/scrap/src/common/hwcodec.rs
+++ b/libs/scrap/src/common/hwcodec.rs
@@ -94,7 +94,7 @@ impl EncoderApi for HwEncoder {
             frames.push(EncodedVideoFrame {
                 data: Bytes::from(frame.data),
                 pts: frame.pts as _,
-                key:frame.key == 1,
+                key: frame.key == 1,
                 ..Default::default()
             });
         }
@@ -175,6 +175,7 @@ pub struct HwDecoder {
     pub info: CodecInfo,
 }
 
+#[derive(Default)]
 pub struct HwDecoders {
     pub h264: Option<HwDecoder>,
     pub h265: Option<HwDecoder>,
diff --git a/libs/scrap/src/common/mediacodec.rs b/libs/scrap/src/common/mediacodec.rs
index fa821246c..406baecb5 100644
--- a/libs/scrap/src/common/mediacodec.rs
+++ b/libs/scrap/src/common/mediacodec.rs
@@ -37,6 +37,7 @@ impl Deref for MediaCodecDecoder {
     }
 }
 
+#[derive(Default)]
 pub struct MediaCodecDecoders {
     pub h264: Option<MediaCodecDecoder>,
     pub h265: Option<MediaCodecDecoder>,