diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index e4147c0378c64e24514a1a0fbe07a7631c8f6d50..cea5be9993d29e377e6830c3a13d07b4385c56f7 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -159,11 +159,8 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) ret = speakerClient->SetUp(audioParam); if (ret != DH_SUCCESS) { DHLOGE("Setup speaker failed, ret: %d.", ret); - NotifySourceDev(NOTIFY_OPEN_SPEAKER_RESULT, spkDhId_, ret); return ret; } - NotifySourceDev(NOTIFY_OPEN_SPEAKER_RESULT, std::to_string(dhId), ret); - DHLOGI("Open speaker device task end, notify source ret %d.", ret); isSpkInUse_.store(true); return ret; } @@ -288,8 +285,6 @@ int32_t DAudioSinkDev::TaskOpenDMic(const std::string &args) return ERR_DH_AUDIO_FAILED; } PullUpPage(); - NotifySourceDev(NOTIFY_OPEN_MIC_RESULT, jParam[KEY_DH_ID], ret); - DHLOGI("Open mic device task end, notify source ret %d.", ret); isMicInUse_.store(true); return ret; } @@ -644,7 +639,15 @@ void DAudioSinkDev::SinkEventHandler::NotifyOpenSpeaker(const AppExecFwk::InnerE DHLOGE("Sink dev is invalid."); return; } - if (sinkDevObj->TaskOpenDSpeaker(eventParam) != DH_SUCCESS) { + json jParam = json::parse(eventParam, nullptr, false); + if (!JsonParamCheck(jParam, { KEY_DH_ID, KEY_AUDIO_PARAM })) { + DHLOGE("Json param check failed."); + return; + } + int32_t ret = sinkDevObj->TaskOpenDSpeaker(eventParam); + sinkDevObj->NotifySourceDev(NOTIFY_OPEN_SPEAKER_RESULT, jParam[KEY_DH_ID], ret); + DHLOGI("Open speaker device task end, notify source ret %d.", ret); + if (ret != DH_SUCCESS) { DHLOGE("Open speaker failed."); return; } @@ -721,7 +724,15 @@ void DAudioSinkDev::SinkEventHandler::NotifyOpenMic(const AppExecFwk::InnerEvent DHLOGE("Sink dev is invalid."); return; } - if (sinkDevObj->TaskOpenDMic(eventParam) != DH_SUCCESS) { + json jParam = json::parse(eventParam, nullptr, false); + if (!JsonParamCheck(jParam, { KEY_DH_ID, KEY_AUDIO_PARAM })) { + DHLOGE("Json param check failed."); + return; + } + int32_t ret = sinkDevObj->TaskOpenDMic(eventParam); + sinkDevObj->NotifySourceDev(NOTIFY_OPEN_MIC_RESULT, jParam[KEY_DH_ID], ret); + DHLOGI("Open mic device task end, notify source ret %d.", ret); + if (ret != DH_SUCCESS) { DHLOGE("Open mic failed."); return; } diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index a4ee3833067ff5cea184c884e1b19eb3b795d686..d4d6d81724b46b069bae33c4d08ecb8549020c10 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -157,7 +157,9 @@ int32_t DAudioSinkManager::HandleDAudioNotify(const std::string &devId, const st std::lock_guard lock(devMapMutex_); isDevExisted = audioDevMap_.find(devId) != audioDevMap_.end(); } - if (!isDevExisted && CreateAudioDevice(devId) != DH_SUCCESS) { + if (!isDevExisted) { + DHLOGE("Device is not exist, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), + GetAnonyString(dhId).c_str()); return ERR_DH_AUDIO_FAILED; } NotifyEvent(devId, eventType, eventContent); diff --git a/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp b/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp index 3e020c0041de74a4c4bee8d2d5cef2e8898373b9..51881a2618874af38a61966a48b56477beff955c 100644 --- a/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp +++ b/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp @@ -140,7 +140,6 @@ int32_t AVTransSenderAdapter::PushData(std::shared_ptr &audioData) DHLOGE("Push data to av transport sender failed"); return ret; } - DHLOGD("Push data to av sender success. data size: %d.", audioData->Size()); return DH_SUCCESS; }