diff --git a/common/dfx_utils/src/daudio_hidumper.cpp b/common/dfx_utils/src/daudio_hidumper.cpp index 41f13d16fe2100e3b082dc6a9abfffb8f8adb558..a7c1f4d7573c737d01f0859c430cd5e1ad27243a 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 38414645eb44e89bbf3dab7213e6ab7f6c0a6578..82f1d50c4b9591e1d1723c7e7a31b83471177c19 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/audioclient/test/unittest/micclient/BUILD.gn b/services/audioclient/test/unittest/micclient/BUILD.gn index 4b70f96d6a874607a5083b6e9b5028f2ee36579b..7b3c4450aa0e7ab3b1cfd4947963fab039d43f3d 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 719bc065f961a23158c3da1652a77ccd4575ec6d..13018384b6d0e624de0204e3dac79f0fa9b4e104 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", ] } diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index f6b8d59377db4c6f01b01fd644d7ce67a84b2041..f47bd424931dc2fc02ed8f6bc6464e1b85ac018a 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 69629309ced314842b198171e772c44d44dd7efc..607c9a0f7167aabd3757b261c88fe763e988f464 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 399f9095f117f0d4d7dc1efb71ab519f5b43daa9..815fe58abbd66ad93458d0078199a41700fea240 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 c6bd0e3570d5287b1ce70f05966f038945429752..ac2dc5f8b1362b278b696a65747da2525034cf19 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, "")); diff --git a/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn b/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn index 9d1fb9c058e2cb26089ac24085eaec32c908a961..a35bf5eedd1c078fc5426c9085af9f19c9a26717 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", ] } diff --git a/services/audiotransport/test/unittest/receiverengine/BUILD.gn b/services/audiotransport/test/unittest/receiverengine/BUILD.gn index 27cad41fcf94bb542022eaaa14d4da6a06401fd7..5e307a632928e5355a90dbb886e6e3994e40a84c 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 41e07ee1b44b5833192a3f35c1e360ffae0fca91..f209eae359c0873b238481b8b0d07f55745b1828 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", ] }