From 0d16e66b3fcb4f336a825f51b3c641dcda808bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=9B=BD=E5=BA=86?= Date: Thu, 18 Apr 2024 15:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9F=B3=E9=A2=91=E8=BF=9C?= =?UTF-8?q?=E7=AB=AF=E4=B8=8D=E6=92=AD=E6=94=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 韦国庆 --- common/src/daudio_util.cpp | 3 -- .../managersink/src/daudio_sink_dev.cpp | 14 ++------ .../managersink/src/daudio_sink_manager.cpp | 3 -- .../managersource/src/daudio_source_dev.cpp | 36 ++++--------------- .../src/daudio_source_manager.cpp | 7 +--- 5 files changed, 9 insertions(+), 54 deletions(-) diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index 6811279e..169fb685 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -228,9 +228,6 @@ int32_t GetAudioParamStr(const std::string ¶ms, const std::string &key, std: } size_t splitPosEnd = params.find(';', pos); if (splitPosEnd != params.npos) { - if (pos + step + 1 > splitPosEnd) { - return ERR_DH_AUDIO_FAILED; - } value = params.substr(pos + step + 1, splitPosEnd - pos - step - 1); } else { value = params.substr(pos + step + 1); diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index 47d0312b..5e308d3c 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -128,12 +128,7 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) DHLOGE("Not found the keys."); return ERR_DH_AUDIO_FAILED; } - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_DH_ID); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return ERR_DH_AUDIO_FAILED; - } - int32_t dhId = ConvertString2Int(std::string(temp->valuestring)); + int32_t dhId = ConvertString2Int(std::string(cJSON_GetObjectItem(jParam, KEY_DH_ID)->valuestring)); CHECK_AND_FREE_RETURN_RET_LOG(dhId == -1, ERR_DH_AUDIO_NULLPTR, jParam, "%{public}s", "Parse dhId error."); std::shared_ptr speakerClient = nullptr; @@ -713,13 +708,8 @@ void DAudioSinkDev::SinkEventHandler::NotifyOpenMic(const AppExecFwk::InnerEvent return; } int32_t ret = sinkDevObj->TaskOpenDMic(eventParam); - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_DH_ID); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return; - } sinkDevObj->NotifySourceDev(NOTIFY_OPEN_MIC_RESULT, - std::string(temp->valuestring), ret); + std::string(cJSON_GetObjectItem(jParam, KEY_DH_ID)->valuestring), ret); DHLOGI("Open mic device task end, notify source ret %{public}d.", ret); CHECK_AND_FREE_RETURN_LOG(ret != DH_SUCCESS, jParam, "%{public}s", "Open mic failed."); cJSON_Delete(jParam); diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index d39ea9a3..375cdffa 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -142,9 +142,6 @@ int32_t DAudioSinkManager::HandleDAudioNotify(const std::string &devId, const st // now ctrl channel is also goto here, please sure here not crash. cJSON *jParam = cJSON_Parse(eventContent.c_str()); - if (jParam == nullptr) { - return ERR_DH_AUDIO_NULLPTR; - } if (CJsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE })) { DHLOGD("Receive audio notify from source, random task code: %{public}s", cJSON_GetObjectItemCaseSensitive(jParam, KEY_RANDOM_TASK_CODE)->valuestring); diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index 422f867d..e6abf306 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -387,12 +387,8 @@ int32_t DAudioSourceDev::HandleNotifyRPC(const AudioEvent &event) cJSON_Delete(jParam); return ERR_DH_AUDIO_FAILED; } - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_RESULT); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return ERR_DH_AUDIO_FAILED; - } - rpcResult_ = temp->valueint; + + rpcResult_ = cJSON_GetObjectItem(jParam, KEY_RESULT)->valueint; DHLOGD("Notify RPC event: %{public}d, result: %{public}d.", event.type, rpcResult_); std::map::iterator iter = eventNotifyMap_.find(event.type); if (iter == eventNotifyMap_.end()) { @@ -658,18 +654,8 @@ void DAudioSourceDev::OnEnableTaskResult(int32_t resultCode, const std::string & cJSON_Delete(jParam); return; } - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_DEV_ID); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return; - } - cJSON *temporary = cJSON_GetObjectItem(jParam, KEY_DH_ID); - if (temporary == NULL || !cJSON_IsString(temporary)) { - cJSON_Delete(jParam); - return; - } - mgrCallback_->OnEnableAudioResult(std::string(temp->valuestring), - std::string(temporary->valuestring), resultCode); + mgrCallback_->OnEnableAudioResult(std::string(cJSON_GetObjectItem(jParam, KEY_DEV_ID)->valuestring), + std::string(cJSON_GetObjectItem(jParam, KEY_DH_ID)->valuestring), resultCode); cJSON_Delete(jParam); } @@ -736,18 +722,8 @@ void DAudioSourceDev::OnDisableTaskResult(int32_t resultCode, const std::string cJSON_Delete(jParam); return; } - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_DEV_ID); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return; - } - cJSON *temporary = cJSON_GetObjectItem(jParam, KEY_DH_ID); - if (temporary == NULL || !cJSON_IsString(temporary)) { - cJSON_Delete(jParam); - return; - } - mgrCallback_->OnDisableAudioResult(std::string(temp->valuestring), - std::string(temporary->valuestring), resultCode); + mgrCallback_->OnDisableAudioResult(std::string(cJSON_GetObjectItem(jParam, KEY_DEV_ID)->valuestring), + std::string(cJSON_GetObjectItem(jParam, KEY_DH_ID)->valuestring), resultCode); cJSON_Delete(jParam); } diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index 29719cbd..e6ca12f3 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -292,13 +292,8 @@ 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()); if (CJsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE })) { - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_RANDOM_TASK_CODE); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return ERR_DH_AUDIO_FAILED; - } DHLOGD("Receive audio notify from sink, random task code: %{public}s", - temp->valuestring); + cJSON_GetObjectItemCaseSensitive(jParam, KEY_RANDOM_TASK_CODE)->valuestring); } std::shared_ptr sourceDev = nullptr; -- Gitee