From d329747f2fdfaf37730da9e90a19026f81208749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Tue, 29 Jul 2025 16:17:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91=E4=BB=93=E4=BB=A3=E7=A0=81=E6=A3=80=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- common/dfx_utils/src/daudio_hidumper.cpp | 3 --- common/src/daudio_util.cpp | 5 ++++- .../audiomanager/managersink/src/daudio_sink_manager.cpp | 2 -- .../audiomanager/managersource/src/daudio_source_manager.cpp | 1 + .../test/unittest/sourcedevice/src/dmic_dev_test.cpp | 2 +- .../unittest/sourcemanager/src/daudio_source_mgr_test.cpp | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/common/dfx_utils/src/daudio_hidumper.cpp b/common/dfx_utils/src/daudio_hidumper.cpp index 41f13d16..a7c1f4d7 100644 --- a/common/dfx_utils/src/daudio_hidumper.cpp +++ b/common/dfx_utils/src/daudio_hidumper.cpp @@ -60,9 +60,6 @@ bool DaudioHidumper::Dump(const std::vector &args, std::string &res result.clear(); int32_t argsSize = static_cast(args.size()); DHLOGI("Distributed audio hidumper dump args.size():%{public}d", argsSize); - for (int32_t i = 0; i < argsSize; i++) { - DHLOGD("Distributed audio hidumper dump args[%{public}d]: %{public}s.", i, args.at(i).c_str()); - } if (args.empty()) { ShowHelp(result); diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index 38414645..82f1d50c 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -361,7 +361,10 @@ bool CJsonParamCheck(const cJSON *jsonObj, const std::initializer_list(sampleRate) * timems; + uint64_t result = product / AUDIO_MS_PER_SECOND; + CHECK_AND_RETURN_RET_LOG(result > INT32_MAX, INT32_MAX, "CalculateSampleNum Overflow occurred"); + return static_cast(result); } int64_t GetCurNano() diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index f6b8d593..f47bd424 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -89,8 +89,6 @@ int32_t DAudioSinkManager::Init(const sptr &sinkCallback DHLOGE("Register av sender engine callback failed."); return ERR_DH_AUDIO_FAILED; } - CHECK_AND_RETURN_RET_LOG(sendProviderPtr_->RegisterProviderCallback(providerListener_) != DH_SUCCESS, - ERR_DH_AUDIO_FAILED, "%{public}s", "Register av sender engine callback failed."); DHLOGI("Load av sender engine success."); ctrlListenerCallback_ = std::make_shared(); ctrlListener_ = std::make_shared(ctrlListenerCallback_); diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index 69629309..607c9a0f 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -296,6 +296,7 @@ int32_t DAudioSourceManager::HandleDAudioNotify(const std::string &devId, const // now ctrl channel is also goto here, please sure here not crash. cJSON *jParam = cJSON_Parse(eventContent.c_str()); + CHECK_NULL_RETURN(jParam, ERR_DH_AUDIO_NULLPTR); if (CJsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE })) { DHLOGD("Receive audio notify from sink, random task code: %{public}s", cJSON_GetObjectItemCaseSensitive(jParam, KEY_RANDOM_TASK_CODE)->valuestring); diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index 399f9095..815fe58a 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -341,7 +341,7 @@ HWTEST_F(DMicDevTest, ReadStreamData_001, TestSize.Level1) mic_->FillJitterQueue(); mic_->paramHDF_.period = 0; mic_->FillJitterQueue(); - mic_->paramHDF_.period = 1; + mic_->paramHDF_.period = 10; mic_->FillJitterQueue(); std::shared_ptr readData1 = nullptr; EXPECT_EQ(DH_SUCCESS, mic_->ReadStreamData(streamId_, readData1)); diff --git a/services/audiomanager/test/unittest/sourcemanager/src/daudio_source_mgr_test.cpp b/services/audiomanager/test/unittest/sourcemanager/src/daudio_source_mgr_test.cpp index c6bd0e35..ac2dc5f8 100644 --- a/services/audiomanager/test/unittest/sourcemanager/src/daudio_source_mgr_test.cpp +++ b/services/audiomanager/test/unittest/sourcemanager/src/daudio_source_mgr_test.cpp @@ -188,12 +188,12 @@ HWTEST_F(DAudioSourceMgrTest, DisableDAudio_001, TestSize.Level1) HWTEST_F(DAudioSourceMgrTest, HandleDAudioNotify_001, TestSize.Level1) { EXPECT_EQ(ERR_DH_AUDIO_SA_DEVICE_NOT_EXIST, - sourceMgr.HandleDAudioNotify(DEV_ID, DH_ID_SPK, OPEN_SPEAKER, "openspk")); + sourceMgr.HandleDAudioNotify(DEV_ID, DH_ID_SPK, OPEN_SPEAKER, "{\"dhId\":\"1\"}")); std::string reqId = GetRandomID(); EXPECT_EQ(DH_SUCCESS, sourceMgr.EnableDAudio(DEV_ID, DH_ID_SPK, "", ATTRS, reqId)); EXPECT_EQ(ERR_DH_AUDIO_SA_DEVICE_NOT_EXIST, - sourceMgr.HandleDAudioNotify(DEV_ID, DH_ID_SPK, OPEN_SPEAKER, "openspk")); + sourceMgr.HandleDAudioNotify(DEV_ID, DH_ID_SPK, OPEN_SPEAKER, "{\"dhId\":\"1\"}")); EXPECT_EQ(DH_SUCCESS, sourceMgr.DisableDAudio(DEV_ID, DH_ID_SPK, reqId)); EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceMgr.HandleDAudioNotify(DEV_ID + "1", DH_ID_SPK, CLOSE_CTRL, "")); -- Gitee From 7d43227d4777b46304fe0a5bd1a14fb5463594c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Tue, 29 Jul 2025 19:59:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91=E4=BB=93=E4=BB=A3=E7=A0=81=E6=A3=80=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- services/audiotransport/test/unittest/receiverengine/BUILD.gn | 1 + services/audiotransport/test/unittest/senderengine/BUILD.gn | 1 + 2 files changed, 2 insertions(+) diff --git a/services/audiotransport/test/unittest/receiverengine/BUILD.gn b/services/audiotransport/test/unittest/receiverengine/BUILD.gn index 27cad41f..5e307a63 100644 --- a/services/audiotransport/test/unittest/receiverengine/BUILD.gn +++ b/services/audiotransport/test/unittest/receiverengine/BUILD.gn @@ -56,6 +56,7 @@ ohos_unittest("AVTransReceiverAdapterTest") { "dsoftbus:softbus_client", "googletest:gmock", "hilog:libhilog", + "ipc:ipc_core", ] } diff --git a/services/audiotransport/test/unittest/senderengine/BUILD.gn b/services/audiotransport/test/unittest/senderengine/BUILD.gn index 41e07ee1..f209eae3 100644 --- a/services/audiotransport/test/unittest/senderengine/BUILD.gn +++ b/services/audiotransport/test/unittest/senderengine/BUILD.gn @@ -56,6 +56,7 @@ ohos_unittest("AVTransSenderAdapterTest") { "dsoftbus:softbus_client", "googletest:gmock", "hilog:libhilog", + "ipc:ipc_core", ] } -- Gitee From abb09aac05ca6ab45a2d7703cc8254ec9f1e5138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 30 Jul 2025 10:44:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91=E4=BB=93=E4=BB=A3=E7=A0=81=E6=A3=80=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- services/audioclient/test/unittest/micclient/BUILD.gn | 1 + services/audioclient/test/unittest/spkclient/BUILD.gn | 1 + 2 files changed, 2 insertions(+) diff --git a/services/audioclient/test/unittest/micclient/BUILD.gn b/services/audioclient/test/unittest/micclient/BUILD.gn index 4b70f96d..7b3c4450 100644 --- a/services/audioclient/test/unittest/micclient/BUILD.gn +++ b/services/audioclient/test/unittest/micclient/BUILD.gn @@ -62,6 +62,7 @@ ohos_unittest("MicClientTest") { "dsoftbus:softbus_client", "googletest:gmock", "hilog:libhilog", + "ipc:ipc_core", ] } diff --git a/services/audioclient/test/unittest/spkclient/BUILD.gn b/services/audioclient/test/unittest/spkclient/BUILD.gn index 719bc065..13018384 100644 --- a/services/audioclient/test/unittest/spkclient/BUILD.gn +++ b/services/audioclient/test/unittest/spkclient/BUILD.gn @@ -66,6 +66,7 @@ ohos_unittest("SpeakerClientTest") { "dsoftbus:softbus_client", "googletest:gmock", "hilog:libhilog", + "ipc:ipc_core", ] } -- Gitee From df7413dba6e296ff612e531c7aa554f9d67e9218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 30 Jul 2025 11:03:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3?= =?UTF-8?q?=E9=A2=91=E4=BB=93=E4=BB=A3=E7=A0=81=E6=A3=80=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冯俊桦 --- .../audiotransport/test/unittest/audioctrltransport/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn b/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn index 9d1fb9c0..a35bf5ee 100644 --- a/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn +++ b/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn @@ -58,6 +58,7 @@ ohos_unittest("CtrlTransTest") { "dsoftbus:softbus_client", "googletest:gmock", "hilog:libhilog", + "ipc:ipc_core", ] } -- Gitee