From 4eca485839fd94bcc0940a27fac68adeea9ddd0c Mon Sep 17 00:00:00 2001 From: Maninblack Date: Sat, 12 Apr 2025 10:52:18 +0800 Subject: [PATCH 1/2] audio_enhance_chain UT fix Signed-off-by: Maninblack --- .../audioeffect/src/audio_enhance_chain.cpp | 1 + .../src/audio_enhance_chain_unit_test.cpp | 214 ++++-------------- 2 files changed, 50 insertions(+), 165 deletions(-) diff --git a/frameworks/native/audioeffect/src/audio_enhance_chain.cpp b/frameworks/native/audioeffect/src/audio_enhance_chain.cpp index 244fba759d..f79b5eef3d 100644 --- a/frameworks/native/audioeffect/src/audio_enhance_chain.cpp +++ b/frameworks/native/audioeffect/src/audio_enhance_chain.cpp @@ -453,6 +453,7 @@ int32_t AudioEnhanceChain::ApplyEnhanceChain(std::unique_ptr &enh audioBufOut_.raw = static_cast(algoCache_.output.data()); for (AudioEffectHandle handle : standByEnhanceHandles_) { + CHECK_AND_CONTINUE_LOG(handle != nullptr, "handle is null ptr"); int32_t ret = (*handle)->process(handle, &audioBufIn_, &audioBufOut_); CHECK_AND_CONTINUE_LOG(ret == 0, "[%{public}s] either one of libs process fail", sceneType_.c_str()); } diff --git a/frameworks/native/audioeffect/test/unittest/enhance_unit_test/src/audio_enhance_chain_unit_test.cpp b/frameworks/native/audioeffect/test/unittest/enhance_unit_test/src/audio_enhance_chain_unit_test.cpp index 6bc9087998..d354762882 100644 --- a/frameworks/native/audioeffect/test/unittest/enhance_unit_test/src/audio_enhance_chain_unit_test.cpp +++ b/frameworks/native/audioeffect/test/unittest/enhance_unit_test/src/audio_enhance_chain_unit_test.cpp @@ -32,19 +32,35 @@ using namespace testing; namespace OHOS { namespace AudioStandard { -void AudioEnhanceChainUnitTest::SetUpTestCase(void) {} +namespace { + const uint32_t DEFAULT_FRAME_LENGTH = 0; + const uint32_t DEFAULT_SAMPLE_RATE = 48000; + const uint32_t DEFAULT_DATA_FORMAT = 2; + const uint32_t DEFAULT_MIC_NUM = 2; + const uint32_t DEFAULT_EC_NUM = 4; + const uint32_t DEFAULT_MIC_REF_NUM = 5; + const uint32_t DEFAULT_OUT_NUM = 6; + const uint32_t DEFAULT_HANDLES_NUM = 3; + const uint32_t DEFAULT_BUFFER_SIZE = 2048; + const uint32_t VALID_FORMAT = 2; + const uint32_t INVALID_FORMAT = 10; + + AudioEnhanceParamAdapter algoParam; + AudioEnhanceDeviceAttr deviceAttr; + std::string sceneType = "SCENE_VOIP_UP"; + bool defaultFlag = false; +} + +void AudioEnhanceChainUnitTest::SetUpTestCase(void) +{ + algoParam = {0, 1, 0, "", "", ""}; + deviceAttr = {DEFAULT_SAMPLE_RATE, DEFAULT_MIC_NUM, DEFAULT_DATA_FORMAT, 0, 0, 0, 0, 0, 0, 0, 0}; +} + void AudioEnhanceChainUnitTest::TearDownTestCase(void) {} void AudioEnhanceChainUnitTest::SetUp(void) {} void AudioEnhanceChainUnitTest::TearDown(void) {} -const uint32_t DEFAULT_FRAME_LENGTH = 0; -const uint32_t DEFAULT_SAMPLE_RATE = 48000; -const uint32_t DEFAULT_DATA_FORMAT = 2; -const uint32_t DEFAULT_MIC_NUM = 2; -const uint32_t DEFAULT_EC_NUM = 4; -const uint32_t DEFAULT_MIC_REF_NUM = 5; -const uint32_t DEFAULT_OUT_NUM = 6; - /** * @tc.name : Test AudioEnhanceChain API * @tc.type : FUNC @@ -54,16 +70,12 @@ const uint32_t DEFAULT_OUT_NUM = 6; HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_001, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string scene = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; - audioEnhanceChain = std::make_shared(scene, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); - audioEnhanceChain->standByEnhanceHandles_ = std::vector(3); - audioEnhanceChain->enhanceLibHandles_ = std::vector(3); + audioEnhanceChain->standByEnhanceHandles_ = std::vector(DEFAULT_HANDLES_NUM); + audioEnhanceChain->enhanceLibHandles_ = std::vector(DEFAULT_HANDLES_NUM); audioEnhanceChain->ReleaseEnhanceChain(); } @@ -76,10 +88,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_001, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_002, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -102,15 +110,11 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_002, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_003, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); - audioEnhanceChain->standByEnhanceHandles_ = std::vector(3); + audioEnhanceChain->standByEnhanceHandles_ = std::vector(DEFAULT_HANDLES_NUM); audioEnhanceChain->enhanceLibHandles_ = std::vector(1); audioEnhanceChain->ReleaseEnhanceChain(); EXPECT_EQ(audioEnhanceChain->standByEnhanceHandles_.size(), 0); @@ -126,11 +130,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_003, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_004, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; deviceAttr.micChannels = 1; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -146,10 +146,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_004, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_005, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -171,10 +167,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_005, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_007, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -195,19 +187,12 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_007, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_008, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); - audioEnhanceChain->deviceAttr_.micChannels = 5; - audioEnhanceChain->deviceAttr_.micRate = 10; - audioEnhanceChain->deviceAttr_.micFormat = 1; std::unique_ptr enhanceBuffer = std::make_unique(); - enhanceBuffer->micBufferIn.resize(100); + enhanceBuffer->micBufferIn.resize(DEFAULT_BUFFER_SIZE); int32_t length = 0; int32_t result = audioEnhanceChain->ApplyEnhanceChain(enhanceBuffer, length); @@ -223,21 +208,14 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_008, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_009, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); - audioEnhanceChain->deviceAttr_.micChannels = 5; - audioEnhanceChain->deviceAttr_.micRate = 10; - audioEnhanceChain->deviceAttr_.micFormat = 1; audioEnhanceChain->needEcFlag_ = true; std::unique_ptr enhanceBuffer = std::make_unique(); - enhanceBuffer->micBufferIn.resize(100); - enhanceBuffer->ecBuffer.resize(100); + enhanceBuffer->micBufferIn.resize(DEFAULT_BUFFER_SIZE); + enhanceBuffer->ecBuffer.resize(DEFAULT_BUFFER_SIZE); int32_t length = 0; int32_t result = audioEnhanceChain->ApplyEnhanceChain(enhanceBuffer, length); @@ -253,21 +231,14 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_009, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_010, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); - audioEnhanceChain->deviceAttr_.micChannels = 5; - audioEnhanceChain->deviceAttr_.micRate = 10; - audioEnhanceChain->deviceAttr_.micFormat = 1; audioEnhanceChain->needMicRefFlag_ = true; std::unique_ptr enhanceBuffer = std::make_unique(); - enhanceBuffer->micBufferIn.resize(100); - enhanceBuffer->micRefBuffer.resize(100); + enhanceBuffer->micBufferIn.resize(DEFAULT_BUFFER_SIZE); + enhanceBuffer->micRefBuffer.resize(DEFAULT_BUFFER_SIZE); int32_t length = 0; int32_t result = audioEnhanceChain->ApplyEnhanceChain(enhanceBuffer, length); @@ -283,22 +254,15 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_010, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_011, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); - audioEnhanceChain->deviceAttr_.micChannels = 5; - audioEnhanceChain->deviceAttr_.micRate = 10; - audioEnhanceChain->deviceAttr_.micFormat = 1; audioEnhanceChain->algoAttr_.batchLen = 0; audioEnhanceChain->algoCache_.input.resize(0); - audioEnhanceChain->standByEnhanceHandles_ = std::vector(3); + audioEnhanceChain->standByEnhanceHandles_ = std::vector(DEFAULT_HANDLES_NUM); std::unique_ptr enhanceBuffer = std::make_unique(); - enhanceBuffer->micBufferIn.resize(128); + enhanceBuffer->micBufferIn.resize(DEFAULT_BUFFER_SIZE); int32_t length = 0; int32_t result = audioEnhanceChain->ApplyEnhanceChain(enhanceBuffer, length); EXPECT_EQ(ERROR, result); @@ -313,10 +277,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_011, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_012, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -336,16 +296,12 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_012, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_013, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::unique_ptr enhanceBuffer = std::make_unique(); - enhanceBuffer->micBufferIn.resize(128, 0); + enhanceBuffer->micBufferIn.resize(DEFAULT_BUFFER_SIZE, 0); int32_t result = audioEnhanceChain->GetOneFrameInputData(enhanceBuffer); EXPECT_EQ(SUCCESS, result); @@ -360,16 +316,12 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_013, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_014, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::unique_ptr enhanceBuffer = std::make_unique(); - enhanceBuffer->ecBuffer.resize(128, 0); + enhanceBuffer->ecBuffer.resize(DEFAULT_BUFFER_SIZE, 0); audioEnhanceChain->needEcFlag_ = true; audioEnhanceChain->needMicRefFlag_ = false; @@ -386,16 +338,12 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_014, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_015, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::unique_ptr enhanceBuffer = std::make_unique(); - enhanceBuffer->micRefBuffer.resize(128, 0); + enhanceBuffer->micRefBuffer.resize(DEFAULT_BUFFER_SIZE, 0); audioEnhanceChain->needEcFlag_ = false; audioEnhanceChain->needMicRefFlag_ = true; @@ -412,23 +360,19 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_015, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_016, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->algoCache_.input.resize(0); - uint8_t src[128] = {0}; - uint8_t dst[128] = {0}; + uint8_t src[DEFAULT_BUFFER_SIZE] = {0}; + uint8_t dst[DEFAULT_BUFFER_SIZE] = {0}; uint32_t channel = 2; uint32_t offset = 0; int32_t result = audioEnhanceChain->DeinterleaverData(src, channel, dst, offset); - EXPECT_NE(SUCCESS, result); + EXPECT_EQ(SUCCESS, result); } /** @@ -440,16 +384,12 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_016, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_017, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); uint8_t *src = nullptr; - uint8_t dst[10] = {0}; + uint8_t dst[DEFAULT_BUFFER_SIZE] = {0}; uint32_t channel = 2; uint32_t offset = 0; @@ -466,15 +406,11 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_017, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_018, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); - uint8_t src[10] = {0}; + uint8_t src[DEFAULT_BUFFER_SIZE] = {0}; uint8_t *dst = nullptr; uint32_t channel = 2; uint32_t offset = 0; @@ -492,22 +428,18 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_018, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_019, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->algoCache_.input.resize(0); - uint8_t src[10] = {0}; - uint8_t dst[10] = {0}; + uint8_t src[DEFAULT_BUFFER_SIZE] = {0}; + uint8_t dst[DEFAULT_BUFFER_SIZE] = {0}; uint32_t channel = 2; uint32_t offset = 0; int32_t result = audioEnhanceChain->DeinterleaverData(src, channel, dst, offset); - EXPECT_EQ(ERROR, result); + EXPECT_EQ(SUCCESS, result); } /** @@ -519,10 +451,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_019, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_020, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -543,10 +471,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_020, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_021, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -567,10 +491,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_021, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_025, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -591,10 +511,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_025, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_026, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -615,10 +531,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_026, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_029, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -639,10 +551,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_029, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_040, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -679,10 +587,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_040, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_041, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -719,10 +623,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_041, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_043, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -743,10 +643,6 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_043, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, GetAlgoBufferSize_001, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -765,10 +661,6 @@ HWTEST(AudioEnhanceChainUnitTest, GetAlgoBufferSize_001, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, GetAlgoBufferSizeEc_001, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -787,10 +679,6 @@ HWTEST(AudioEnhanceChainUnitTest, GetAlgoBufferSizeEc_001, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, GetAlgoBufferSizeMicRef_001, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -830,11 +718,7 @@ HWTEST(AudioEnhanceChainUnitTest, IsDefaultChain_001, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, ConvertFormat_001, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; - uint32_t format = 2; + uint32_t format = VALID_FORMAT; audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); @@ -842,7 +726,7 @@ HWTEST(AudioEnhanceChainUnitTest, ConvertFormat_001, TestSize.Level1) AudioSampleFormat ret = audioEnhanceChain->ConvertFormat(format); EXPECT_EQ(ret, SAMPLE_S16LE); - format = 10; + format = INVALID_FORMAT; ret = audioEnhanceChain->ConvertFormat(format); EXPECT_EQ(ret, INVALID_WIDTH); } -- Gitee From 19b51d88e4e1de6f9c75655795d9022f457abae7 Mon Sep 17 00:00:00 2001 From: Maninblack Date: Sat, 12 Apr 2025 11:57:28 +0800 Subject: [PATCH 2/2] codecheck fix Signed-off-by: Maninblack --- .../src/audio_enhance_chain_unit_test.cpp | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/frameworks/native/audioeffect/test/unittest/enhance_unit_test/src/audio_enhance_chain_unit_test.cpp b/frameworks/native/audioeffect/test/unittest/enhance_unit_test/src/audio_enhance_chain_unit_test.cpp index d354762882..4108427fcb 100644 --- a/frameworks/native/audioeffect/test/unittest/enhance_unit_test/src/audio_enhance_chain_unit_test.cpp +++ b/frameworks/native/audioeffect/test/unittest/enhance_unit_test/src/audio_enhance_chain_unit_test.cpp @@ -47,8 +47,8 @@ namespace { AudioEnhanceParamAdapter algoParam; AudioEnhanceDeviceAttr deviceAttr; - std::string sceneType = "SCENE_VOIP_UP"; - bool defaultFlag = false; + std::string g_sceneType = "SCENE_VOIP_UP"; + bool g_defaultFlag = false; } void AudioEnhanceChainUnitTest::SetUpTestCase(void) @@ -71,7 +71,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_001, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->standByEnhanceHandles_ = std::vector(DEFAULT_HANDLES_NUM); @@ -89,7 +89,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_002, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->standByEnhanceHandles_ = std::vector(1); @@ -111,7 +111,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_003, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->standByEnhanceHandles_ = std::vector(DEFAULT_HANDLES_NUM); @@ -132,7 +132,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_004, TestSize.Level1) std::shared_ptr audioEnhanceChain = nullptr; deviceAttr.micChannels = 1; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); EXPECT_EQ(audioEnhanceChain->deviceAttr_.micChannels, DEFAULT_MIC_NUM); } @@ -147,7 +147,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_005, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->enhanceNames_.push_back("record"); @@ -168,7 +168,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_007, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::unique_ptr enhanceBuffer = nullptr; @@ -188,7 +188,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_008, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::unique_ptr enhanceBuffer = std::make_unique(); @@ -209,7 +209,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_009, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->needEcFlag_ = true; @@ -232,7 +232,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_010, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->needMicRefFlag_ = true; @@ -255,7 +255,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_011, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->algoAttr_.batchLen = 0; audioEnhanceChain->algoCache_.input.resize(0); @@ -278,7 +278,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_012, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::unique_ptr enhanceBuffer = std::make_unique(); @@ -297,7 +297,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_013, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::unique_ptr enhanceBuffer = std::make_unique(); @@ -317,7 +317,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_014, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::unique_ptr enhanceBuffer = std::make_unique(); @@ -339,7 +339,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_015, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::unique_ptr enhanceBuffer = std::make_unique(); @@ -361,7 +361,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_016, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->algoCache_.input.resize(0); @@ -385,7 +385,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_017, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); uint8_t *src = nullptr; @@ -407,7 +407,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_018, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); uint8_t src[DEFAULT_BUFFER_SIZE] = {0}; @@ -429,7 +429,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_019, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->algoCache_.input.resize(0); @@ -452,7 +452,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_020, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::string inputDevice = ""; @@ -472,7 +472,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_021, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); std::string inputDevice = "testDevice"; @@ -492,7 +492,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_025, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->algoParam_.foldState = 1; @@ -512,7 +512,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_026, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->algoParam_.foldState = 0; @@ -532,7 +532,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_029, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); bool mute = false; @@ -552,7 +552,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_040, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->needEcFlag_ = false; @@ -588,7 +588,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_041, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->needEcFlag_ = true; @@ -624,7 +624,7 @@ HWTEST(AudioEnhanceChainUnitTest, AudioEnhanceChain_043, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); AudioEffectHandle handle = nullptr; @@ -644,7 +644,7 @@ HWTEST(AudioEnhanceChainUnitTest, GetAlgoBufferSize_001, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->algoSupportedConfig_.sampleRate = 0; @@ -662,7 +662,7 @@ HWTEST(AudioEnhanceChainUnitTest, GetAlgoBufferSizeEc_001, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->algoSupportedConfig_.sampleRate = 0; @@ -680,7 +680,7 @@ HWTEST(AudioEnhanceChainUnitTest, GetAlgoBufferSizeMicRef_001, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); audioEnhanceChain->algoSupportedConfig_.sampleRate = 0; @@ -697,12 +697,8 @@ HWTEST(AudioEnhanceChainUnitTest, GetAlgoBufferSizeMicRef_001, TestSize.Level1) HWTEST(AudioEnhanceChainUnitTest, IsDefaultChain_001, TestSize.Level1) { std::shared_ptr audioEnhanceChain = nullptr; - std::string sceneType = "SCENE_VOIP_UP"; - AudioEnhanceParamAdapter algoParam; - AudioEnhanceDeviceAttr deviceAttr; - bool defaultFlag = false; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); bool ret = audioEnhanceChain->IsDefaultChain(); @@ -720,7 +716,7 @@ HWTEST(AudioEnhanceChainUnitTest, ConvertFormat_001, TestSize.Level1) std::shared_ptr audioEnhanceChain = nullptr; uint32_t format = VALID_FORMAT; - audioEnhanceChain = std::make_shared(sceneType, algoParam, deviceAttr, defaultFlag); + audioEnhanceChain = std::make_shared(g_sceneType, algoParam, deviceAttr, g_defaultFlag); EXPECT_NE(audioEnhanceChain, nullptr); AudioSampleFormat ret = audioEnhanceChain->ConvertFormat(format); -- Gitee