From 903ae5aa6db65198e5a7d53628b63cee052ad1d7 Mon Sep 17 00:00:00 2001 From: zhuzhihui7 Date: Mon, 10 Mar 2025 19:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3=E9=A2=91?= =?UTF-8?q?=E4=BA=92=E8=81=94=E9=9B=B7=E8=BE=BE=E6=89=93=E7=82=B9=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E5=92=8C=E9=94=99=E8=AF=AF=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhuzhihui7 --- .../test/unittest/src/daudio_radar_test.cpp | 165 ++++++++++++++++++ .../src/daudio_source_handler.cpp | 1 + .../managersink/src/daudio_sink_dev.cpp | 16 +- .../managersource/src/daudio_source_dev.cpp | 21 +-- .../src/daudio_source_service.cpp | 1 - 5 files changed, 185 insertions(+), 19 deletions(-) diff --git a/common/dfx_utils/test/unittest/src/daudio_radar_test.cpp b/common/dfx_utils/test/unittest/src/daudio_radar_test.cpp index 1e14261b..879d4ec8 100644 --- a/common/dfx_utils/test/unittest/src/daudio_radar_test.cpp +++ b/common/dfx_utils/test/unittest/src/daudio_radar_test.cpp @@ -83,6 +83,33 @@ HWTEST_F(DaudioRadarTest, ReportDaudioInit_002, TestSize.Level1) DHLOGI("DaudioRadarTest ReportDaudioInit_002 end"); } +/** + * @tc.name: ReportDaudioInitProgress_001 + * @tc.desc: check ReportDaudioInitProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportDaudioInitProgress_001, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportDaudioInitProgress_001 begin"); + bool ret = DaudioRadar::GetInstance().ReportDaudioInitProgress(FUNC, AudioInit::SERVICE_INIT, DH_SUCCESS); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportDaudioInitProgress_001 end"); +} + +/** + * @tc.name: ReportDaudioInitProgress_002 + * @tc.desc: check ReportDaudioInitProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportDaudioInitProgress_002, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportDaudioInitProgress_002 begin"); + bool ret = DaudioRadar::GetInstance().ReportDaudioInitProgress(FUNC, AudioInit::SERVICE_INIT, + ERR_DH_AUDIO_FAILED); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportDaudioInitProgress_002 end"); +} + /** * @tc.name: ReportSpeakerOpen_001 * @tc.desc: check ReportSpeakerOpen @@ -111,6 +138,33 @@ HWTEST_F(DaudioRadarTest, ReportSpeakerOpen_002, TestSize.Level1) DHLOGI("DaudioRadarTest ReportSpeakerOpen_002 end"); } +/** + * @tc.name: ReportSpeakerOpenProgress_001 + * @tc.desc: check ReportSpeakerOpenProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportSpeakerOpenProgress_001, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportSpeakerOpenProgress_001 begin"); + bool ret = DaudioRadar::GetInstance().ReportSpeakerOpenProgress(FUNC, SpeakerOpen::CREATE_STREAM, DH_SUCCESS); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportSpeakerOpenProgress_001 end"); +} + +/** + * @tc.name: ReportSpeakerOpenProgress_002 + * @tc.desc: check ReportSpeakerOpenProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportSpeakerOpenProgress_002, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportSpeakerOpenProgress_002 begin"); + bool ret = DaudioRadar::GetInstance().ReportSpeakerOpenProgress(FUNC, SpeakerOpen::CREATE_STREAM, + ERR_DH_AUDIO_FAILED); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportSpeakerOpenProgress_002 end"); +} + /** * @tc.name: ReportSpeakerClose_001 * @tc.desc: check ReportSpeakerClose @@ -139,6 +193,33 @@ HWTEST_F(DaudioRadarTest, ReportSpeakerClose_002, TestSize.Level1) DHLOGI("DaudioRadarTest ReportSpeakerClose_002 end"); } +/** + * @tc.name: ReportSpeakerCloseProgress_001 + * @tc.desc: check ReportSpeakerCloseProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportSpeakerCloseProgress_001, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportSpeakerCloseProgress_001 begin"); + bool ret = DaudioRadar::GetInstance().ReportSpeakerCloseProgress(FUNC, SpeakerClose::DESTROY_STREAM, DH_SUCCESS); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportSpeakerCloseProgress_001 end"); +} + +/** + * @tc.name: ReportSpeakerCloseProgress_002 + * @tc.desc: check ReportSpeakerCloseProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportSpeakerCloseProgress_002, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportSpeakerCloseProgress_002 begin"); + bool ret = DaudioRadar::GetInstance().ReportSpeakerCloseProgress(FUNC, SpeakerClose::DESTROY_STREAM, + ERR_DH_AUDIO_FAILED); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportSpeakerCloseProgress_002 end"); +} + /** * @tc.name: ReportMicOpen_001 * @tc.desc: check ReportMicOpen @@ -167,6 +248,34 @@ HWTEST_F(DaudioRadarTest, ReportMicOpen_002, TestSize.Level1) DHLOGI("DaudioRadarTest ReportMicOpen_002 end"); } +/** + * @tc.name: ReportMicOpenProgress_001 + * @tc.desc: check ReportMicOpenProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportMicOpenProgress_001, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportMicOpenProgress_001 begin"); + bool ret = DaudioRadar::GetInstance().ReportMicOpenProgress(FUNC, MicOpen::CREATE_STREAM, + DH_SUCCESS); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportMicOpenProgress_001 end"); +} + +/** + * @tc.name: ReportMicOpenProgress_002 + * @tc.desc: check ReportMicOpenProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportMicOpenProgress_002, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportMicOpenProgress_002 begin"); + bool ret = DaudioRadar::GetInstance().ReportMicOpenProgress(FUNC, MicOpen::CREATE_STREAM, + ERR_DH_AUDIO_FAILED); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportMicOpenProgress_002 end"); +} + /** * @tc.name: ReportMicClose_001 * @tc.desc: check ReportMicClose @@ -195,6 +304,34 @@ HWTEST_F(DaudioRadarTest, ReportMicClose_002, TestSize.Level1) DHLOGI("DaudioRadarTest ReportMicClose_002 end"); } +/** + * @tc.name: ReportMicCloseProgress_001 + * @tc.desc: check ReportMicCloseProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportMicCloseProgress_001, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportMicCloseProgress_001 begin"); + bool ret = DaudioRadar::GetInstance().ReportMicCloseProgress(FUNC, MicClose::DESTROY_STREAM, + DH_SUCCESS); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportMicCloseProgress_001 end"); +} + +/** + * @tc.name: ReportMicCloseProgress_002 + * @tc.desc: check ReportMicCloseProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportMicCloseProgress_002, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportMicCloseProgress_002 begin"); + bool ret = DaudioRadar::GetInstance().ReportMicCloseProgress(FUNC, MicClose::DESTROY_STREAM, + ERR_DH_AUDIO_FAILED); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportMicCloseProgress_002 end"); +} + /** * @tc.name: ReportDaudioUnInit_001 * @tc.desc: check ReportDaudioUnInit @@ -222,5 +359,33 @@ HWTEST_F(DaudioRadarTest, ReportDaudioUnInit_002, TestSize.Level1) EXPECT_EQ(ret, true); DHLOGI("DaudioRadarTest ReportDaudioUnInit_002 end"); } + +/** + * @tc.name: ReportDaudioUnInitProgress_001 + * @tc.desc: check ReportDaudioUnInitProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportDaudioUnInitProgress_001, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportDaudioUnInitProgress_001 begin"); + bool ret = DaudioRadar::GetInstance().ReportDaudioUnInitProgress(FUNC, AudioUnInit::UNREGISTER, + DH_SUCCESS); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportDaudioUnInitProgress_001 end"); +} + +/** + * @tc.name: ReportDaudioUnInitProgress_002 + * @tc.desc: check ReportDaudioUnInitProgress + * @tc.type: FUNC + */ +HWTEST_F(DaudioRadarTest, ReportDaudioUnInitProgress_002, TestSize.Level1) +{ + DHLOGI("DaudioRadarTest ReportDaudioUnInitProgress_002 begin"); + bool ret = DaudioRadar::GetInstance().ReportDaudioUnInitProgress(FUNC, AudioUnInit::UNREGISTER, + ERR_DH_AUDIO_FAILED); + EXPECT_EQ(ret, true); + DHLOGI("DaudioRadarTest ReportDaudioUnInitProgress_002 end"); +} } } \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp index 9798d8ed..159284aa 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp @@ -202,6 +202,7 @@ void DAudioSourceHandler::FinishStartSA(const std::string ¶m, const sptrInitSource(param, dAudioIpcCallback_); sourceProxyConVar_.notify_one(); DAudioHisysevent::GetInstance().SysEventWriteBehavior(DAUDIO_INIT, "daudio source sa load success."); diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index 51c237bc..0562f506 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -161,7 +161,7 @@ int32_t DAudioSinkDev::TaskCloseDSpeaker(const std::string &args) { DHLOGI("Close speaker device."); int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } @@ -191,7 +191,7 @@ int32_t DAudioSinkDev::ParseDhidFromEvent(std::string args) if (!CJsonParamCheck(jParam, { KEY_DH_ID })) { DHLOGE("Not found the keys of dhId."); cJSON_Delete(jParam); - return -1; + return ERR_DH_AUDIO_FAILED; } cJSON *dhIdItem = cJSON_GetObjectItem(jParam, KEY_DH_ID); if (dhIdItem == NULL || !cJSON_IsString(dhIdItem)) { @@ -231,7 +231,7 @@ int32_t DAudioSinkDev::ParseResultFromEvent(std::string args) int32_t DAudioSinkDev::TaskStartRender(const std::string &args) { int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } @@ -302,7 +302,7 @@ int32_t DAudioSinkDev::TaskCloseDMic(const std::string &args) { DHLOGI("Close mic device."); int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } @@ -331,7 +331,7 @@ int32_t DAudioSinkDev::TaskSetParameter(const std::string &args) DHLOGD("Set audio param."); AudioEvent event(AudioEventType::EVENT_UNKNOWN, args); int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } @@ -415,7 +415,7 @@ int32_t DAudioSinkDev::TaskPlayStatusChange(const std::string &args) { DHLOGD("Play status change, content: %{public}s.", args.c_str()); int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } @@ -435,7 +435,7 @@ int32_t DAudioSinkDev::SendAudioEventToRemote(const AudioEvent &event) // because: type: VOLUME_CHANGE / AUDIO_FOCUS_CHANGE / AUDIO_RENDER_STATE_CHANGE // so speakerClient int32_t dhId = ParseDhidFromEvent(event.content); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } @@ -473,7 +473,7 @@ int32_t DAudioSinkDev::ConvertString2Int(std::string val) { if (!CheckIsNum(val)) { DHLOGE("String is not number. str:%{public}s.", val.c_str()); - return -1; + return ERR_DH_AUDIO_FAILED; } return std::atoi(val.c_str()); } diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index 28296b44..1100a753 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -361,7 +361,7 @@ int32_t DAudioSourceDev::HandleAudioStart(const AudioEvent &event) { DHLOGI("Audio start, content: %{public}s.", event.content.c_str()); int32_t dhId = ParseDhidFromEvent(event.content); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_SA_PARAM_INVALID; } @@ -384,7 +384,7 @@ int32_t DAudioSourceDev::HandleAudioStop(const AudioEvent &event) { DHLOGI("Audio mmap stop, content: %{public}s.", event.content.c_str()); int32_t dhId = ParseDhidFromEvent(event.content); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_SA_PARAM_INVALID; } @@ -444,7 +444,7 @@ int32_t DAudioSourceDev::HandleDSpeakerClosed(const AudioEvent &event) { DHLOGI("Speaker device closed, event.content = %{public}s.", event.content.c_str()); int32_t dhId = ParseDhidFromEvent(event.content); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } @@ -456,7 +456,7 @@ int32_t DAudioSourceDev::HandleDSpeakerClosed(const AudioEvent &event) std::shared_ptr DAudioSourceDev::FindIoDevImpl(std::string args) { int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return nullptr; } @@ -925,7 +925,7 @@ int32_t DAudioSourceDev::TaskOpenDSpeaker(const std::string &args) return ERR_DH_AUDIO_SA_PARAM_INVALID; } int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { return ERR_DH_AUDIO_FAILED; } auto speaker = FindIoDevImpl(args); @@ -1044,7 +1044,7 @@ int32_t DAudioSourceDev::TaskCloseDSpeaker(const std::string &args) { DHLOGI("Task close speaker, args: %{public}s.", args.c_str()); int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } @@ -1110,7 +1110,8 @@ int32_t DAudioSourceDev::TaskOpenDMic(const std::string &args) return ERR_DH_AUDIO_SA_PARAM_INVALID; } int32_t dhId = ParseDhidFromEvent(args); - CHECK_AND_RETURN_RET_LOG(dhId < 0, ERR_DH_AUDIO_FAILED, "%{public}s", "Failed to parse dhardware id."); + CHECK_AND_RETURN_RET_LOG(dhId == ERR_DH_AUDIO_FAILED, ERR_DH_AUDIO_FAILED, + "%{public}s", "Failed to parse dhardware id."); auto mic = FindIoDevImpl(args); if (mic == nullptr) { DHLOGE("Mic device not init"); @@ -1176,7 +1177,7 @@ int32_t DAudioSourceDev::TaskCloseDMic(const std::string &args) return ERR_DH_AUDIO_SA_PARAM_INVALID; } int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } @@ -1207,7 +1208,7 @@ int32_t DAudioSourceDev::TaskDMicClosed(const std::string &args) return ERR_DH_AUDIO_SA_PARAM_INVALID; } int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } @@ -1249,7 +1250,7 @@ int32_t DAudioSourceDev::TaskChangeFocus(const std::string &args) { DHLOGD("Task change focus, args: %{public}s.", args.c_str()); int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { + if (dhId == ERR_DH_AUDIO_FAILED) { DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } diff --git a/services/audiomanager/servicesource/src/daudio_source_service.cpp b/services/audiomanager/servicesource/src/daudio_source_service.cpp index fa63db1b..5f5bde03 100644 --- a/services/audiomanager/servicesource/src/daudio_source_service.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_service.cpp @@ -71,7 +71,6 @@ int32_t DAudioSourceService::InitSource(const std::string ¶ms, const sptr