From 2954ef2a3de52b011c34c4b8a184c7fba87e0b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Tue, 22 Jul 2025 17:19:13 +0800 Subject: [PATCH 01/11] =?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/audiomanager/managersink/src/daudio_sink_manager.cpp | 2 -- .../audiomanager/managersource/src/daudio_source_manager.cpp | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) 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); -- Gitee From d2dad267e5e1432d23b2b5f3f11786884246d674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 23 Jul 2025 11:46:55 +0800 Subject: [PATCH 02/11] =?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 | 10 ++++++++-- 2 files changed, 8 insertions(+), 5 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..d238a8e0 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -360,8 +360,14 @@ bool CJsonParamCheck(const cJSON *jsonObj, const std::initializer_list INT32_MAX) { + DHLOGE("CalculateSampleNum: Overflow occurred, sampleRate=%u, timems=%u", sampleRate,timems); + return INT32_MAX; + } + return (int32_t)result; } int64_t GetCurNano() -- Gitee From b9dc39699932ec888ea05fa0fc6b67931f20d11b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 23 Jul 2025 14:40:04 +0800 Subject: [PATCH 03/11] =?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/src/daudio_util.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index d238a8e0..325959af 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -364,7 +364,7 @@ int32_t CalculateSampleNum(uint32_t sampleRate, uint32_t timems) uint64_t product = (uint64_t)sampleRate * timems; uint64_t result = product / AUDIO_MS_PER_SECOND; if(result > INT32_MAX) { - DHLOGE("CalculateSampleNum: Overflow occurred, sampleRate=%u, timems=%u", sampleRate,timems); + DHLOGE("CalculateSampleNum: Overflow occurred, sampleRate=%u, timems=%u", sampleRate, timems); return INT32_MAX; } return (int32_t)result; -- Gitee From a6ce577c5250748581f024610f0fb0d7b4b81f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 23 Jul 2025 15:04:57 +0800 Subject: [PATCH 04/11] =?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/src/daudio_util.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index 325959af..43d377b6 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -359,15 +359,15 @@ bool CJsonParamCheck(const cJSON *jsonObj, const std::initializer_list(sampleRate) * timems; uint64_t result = product / AUDIO_MS_PER_SECOND; if(result > INT32_MAX) { - DHLOGE("CalculateSampleNum: Overflow occurred, sampleRate=%u, timems=%u", sampleRate, timems); + LOGE("CalculateSampleNum Overflow occurred, sampleRate=%u, timems=%u", Rate, timems); return INT32_MAX; } - return (int32_t)result; + return static_cast(result); } int64_t GetCurNano() -- Gitee From 3af811c70266b88049b1edfc74d5da70a20f082b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 23 Jul 2025 17:04:47 +0800 Subject: [PATCH 05/11] =?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/src/daudio_util.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index 43d377b6..db735c7f 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -359,15 +359,15 @@ bool CJsonParamCheck(const cJSON *jsonObj, const std::initializer_list(sampleRate) * timems; + uint64_t product = sampleRate * timems; uint64_t result = product / AUDIO_MS_PER_SECOND; - if(result > INT32_MAX) { - LOGE("CalculateSampleNum Overflow occurred, sampleRate=%u, timems=%u", Rate, timems); + if (result > INT32_MAX) { + LOGE("CalculateSampleNum Overflow occurred, sampleRate=%u, timems=%u", sampleRate, timems); return INT32_MAX; } - return static_cast(result); + return static_cast(result); } int64_t GetCurNano() -- Gitee From c4cb4bc7a5565a6dfddde9c8be411657966cdd4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Wed, 23 Jul 2025 17:33:12 +0800 Subject: [PATCH 06/11] =?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/src/daudio_util.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index db735c7f..1415bd7c 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -361,10 +361,10 @@ bool CJsonParamCheck(const cJSON *jsonObj, const std::initializer_listsampleRate * timems; + uint64_t product = static_cast(sampleRate) * timems; uint64_t result = product / AUDIO_MS_PER_SECOND; if (result > INT32_MAX) { - LOGE("CalculateSampleNum Overflow occurred, sampleRate=%u, timems=%u", sampleRate, timems); + DHLOGE("CalculateSampleNum Overflow occurred, sampleRate=%u, timems=%u", sampleRate, timems); return INT32_MAX; } return static_cast(result); -- Gitee From 4af1e769cdf33c614ce953e20ce85a1cc1030086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Fri, 25 Jul 2025 17:09:55 +0800 Subject: [PATCH 07/11] =?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: 冯俊桦 --- .../test/unittest/sourcedevice/src/dmic_dev_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)); -- Gitee From b081afc5e58af1b7f556b3bf8d2e253601d7cb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Fri, 25 Jul 2025 17:23:03 +0800 Subject: [PATCH 08/11] =?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/src/daudio_util.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index 1415bd7c..82f1d50c 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -363,10 +363,7 @@ int32_t CalculateSampleNum(uint32_t sampleRate, uint32_t timems) { uint64_t product = static_cast(sampleRate) * timems; uint64_t result = product / AUDIO_MS_PER_SECOND; - if (result > INT32_MAX) { - DHLOGE("CalculateSampleNum Overflow occurred, sampleRate=%u, timems=%u", sampleRate, timems); - return INT32_MAX; - } + CHECK_AND_RETURN_RET_LOG(result > INT32_MAX, INT32_MAX, "CalculateSampleNum Overflow occurred"); return static_cast(result); } -- Gitee From 92a2f3667ff0945aed5553d2b09210618080bc46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Mon, 28 Jul 2025 14:58:05 +0800 Subject: [PATCH 09/11] =?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: 冯俊桦 --- .../unittest/sourcemanager/src/daudio_source_mgr_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9c06197b5b06652629f69273b5353e4f83f9eec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Mon, 28 Jul 2025 18:58:33 +0800 Subject: [PATCH 10/11] =?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 eb4f07028f92805195af55432ee9c2ebc27b5801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=BF=8A=E6=A1=A6?= Date: Mon, 28 Jul 2025 19:37:33 +0800 Subject: [PATCH 11/11] =?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