diff --git a/services/audiomanager/managersource/include/daudio_source_dev.h b/services/audiomanager/managersource/include/daudio_source_dev.h index 1be525e16a2c7ab737a9491879e2d399d3804a9d..5db9200e745b2c47457de4df0400527e43428a12 100644 --- a/services/audiomanager/managersource/include/daudio_source_dev.h +++ b/services/audiomanager/managersource/include/daudio_source_dev.h @@ -75,7 +75,7 @@ private: int32_t NotifySinkDevOpenMic(cJSON *jParam); int32_t OpenDMicInner(); - void CleanupJson(cJSON *jParamCopy, cJSON *jParam, char *content); + void CleanupJson(cJSON *jParamCopy, char *content); void OnDisableTaskResult(int32_t resultCode, const std::string &result, const std::string &funcName); void OnEnableTaskResult(int32_t resultCode, const std::string &result, const std::string &funcName); diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index 915668b42b3551489729d38953132a2a9a472696..c3a16f4dd2bc3e371405470b7030abcea35b3aa2 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -1330,10 +1330,9 @@ void DAudioSourceDev::OnTaskResult(int32_t resultCode, const std::string &result funcName.c_str()); } -void DAudioSourceDev::CleanupJson(cJSON *jParamCopy, cJSON *jParam, char *content) +void DAudioSourceDev::CleanupJson(cJSON *jParamCopy, char *content) { cJSON_Delete(jParamCopy); - cJSON_Delete(jParam); cJSON_free(content); } @@ -1357,19 +1356,16 @@ int32_t DAudioSourceDev::NotifySinkDev(const AudioEventType type, const cJSON *p const uint32_t randomTaskCode = rd(); constexpr uint32_t eventOffset = 4; cJSON_AddStringToObject(jParam, KEY_RANDOM_TASK_CODE, std::to_string(randomTaskCode).c_str()); - DHLOGD("Notify sink dev, new engine, random task code:%s", std::to_string(randomTaskCode).c_str()); if (speaker_ == nullptr || mic_ == nullptr) { cJSON_Delete(jParamCopy); - cJSON_Delete(jParam); DHLOGE("speaker or mic dev is null."); return ERR_DH_AUDIO_NULLPTR; } if (type == OPEN_CTRL || type == CLOSE_CTRL) { cJSON_Delete(jParamCopy); - cJSON_Delete(jParam); DHLOGE("In new engine mode, ctrl is not allowed."); return ERR_DH_AUDIO_NULLPTR; } @@ -1380,10 +1376,10 @@ int32_t DAudioSourceDev::NotifySinkDev(const AudioEventType type, const cJSON *p if (type == CLOSE_SPEAKER || type == CLOSE_MIC) { // Close spk || Close mic do not need to wait RPC - CleanupJson(jParamCopy, jParam, content); + CleanupJson(jParamCopy, content); return DH_SUCCESS; } - CleanupJson(jParamCopy, jParam, content); + CleanupJson(jParamCopy, content); return WaitForRPC(static_cast(static_cast(type) + eventOffset)); } diff --git a/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp b/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp index bad59dca3191b0528341cda488407b56f5a80f53..570d01d486e518af8251ae352a0aea5ab8e31a9c 100644 --- a/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp +++ b/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp @@ -56,10 +56,12 @@ HWTEST_F(DAudioSinkManagerTest, CreateAudioDevice_001, TestSize.Level1) daudioSinkManager.LoadAVReceiverEngineProvider(); EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); daudioSinkManager.channelState_ = ChannelState::MIC_CONTROL_OPENED; - daudioSinkManager.LoadAVReceiverEngineProvider(); + daudioSinkManager.LoadAVSenderEngineProvider(); EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); auto dev = std::make_shared(devId); daudioSinkManager.audioDevMap_.emplace(devId, dev); + daudioSinkManager.channelState_ = ChannelState::MIC_CONTROL_OPENED; + daudioSinkManager.LoadAVSenderEngineProvider(); EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); daudioSinkManager.channelState_ = ChannelState::MIC_CONTROL_OPENED; daudioSinkManager.sendProviderPtr_ = nullptr; diff --git a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp index 8328aa1bbbe1fe007413d82880da3a1f5cd0fdef..24423e0d2d1653fc2035668e21a1d73aa17dc483 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp @@ -752,7 +752,7 @@ HWTEST_F(DAudioSourceDevTest, TaskOpenDSpeaker_001, TestSize.Level1) std::string tempLongStr(DAUDIO_MAX_JSON_LEN + 1, 'a'); EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDSpeaker(tempLongStr)); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskOpenDSpeaker(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenDSpeaker(ARGS)); cJSON *jParamSpk = cJSON_CreateObject(); cJSON_AddStringToObject(jParamSpk, KEY_DH_ID, DH_ID_SPK.c_str()); @@ -787,10 +787,10 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDSpeaker_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDSpeaker(tempLongStr)); sourceDev_->speaker_->isOpened_ = true; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskCloseDSpeaker(ARGS)); sourceDev_->speaker_->isOpened_ = false; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskCloseDSpeaker(ARGS)); cJSON *jParamSpk = cJSON_CreateObject(); cJSON_AddStringToObject(jParamSpk, KEY_DH_ID, DH_ID_SPK.c_str()); @@ -858,10 +858,10 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDMic_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDMic(tempLongStr)); sourceDev_->mic_->isOpened_ = true; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDMic(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskCloseDMic(ARGS)); sourceDev_->mic_->isOpened_ = false; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDMic(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskCloseDMic(ARGS)); cJSON *jParamMic = cJSON_CreateObject(); cJSON_AddStringToObject(jParamMic, KEY_DH_ID, DH_ID_MIC.c_str()); @@ -1141,15 +1141,14 @@ HWTEST_F(DAudioSourceDevTest, NotifyHDF_003, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, NotifySinkDev_001, TestSize.Level1) { cJSON *jAudioParam = cJSON_CreateObject(); - sourceDev_->isRpcOpen_.store(false); EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); - sourceDev_->isRpcOpen_.store(true); EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); EXPECT_EQ(DH_SUCCESS, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); + cJSON_Delete(jAudioParam); } /** 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 6bc3da9c4be1f4818236e2681eea315f97e9ad44..ab9600b16920bed2b8133b53d9da0d0fb38698aa 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 @@ -182,12 +182,12 @@ HWTEST_F(DAudioSourceMgrTest, DisableDAudio_001, TestSize.Level1) */ HWTEST_F(DAudioSourceMgrTest, HandleDAudioNotify_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_SA_DEVICE_NOT_EXIST, + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceMgr.HandleDAudioNotify(DEV_ID, DH_ID_SPK, OPEN_SPEAKER, "openspk")); std::string reqId = GetRandomID(); EXPECT_EQ(DH_SUCCESS, sourceMgr.EnableDAudio(DEV_ID, DH_ID_SPK, "", ATTRS, reqId)); - EXPECT_EQ(DH_SUCCESS, sourceMgr.HandleDAudioNotify(DEV_ID, DH_ID_SPK, OPEN_SPEAKER, "openspk")); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceMgr.HandleDAudioNotify(DEV_ID, DH_ID_SPK, OPEN_SPEAKER, "openspk")); 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, ""));