From 921cc4781b6e4f5d9c0e5eb75f65a78fe0039054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B1=9F=E8=AF=9A?= Date: Wed, 10 Sep 2025 16:34:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Signed-off-by:=20=E6=9D=A8=E6=B1=9F?= =?UTF-8?q?=E8=AF=9A=20=20yjctest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../audio_policy/server/domain/pipe/src/audio_iohandle_map.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_policy/server/domain/pipe/src/audio_iohandle_map.cpp b/services/audio_policy/server/domain/pipe/src/audio_iohandle_map.cpp index e997e7cf3f..fcd5d7361d 100644 --- a/services/audio_policy/server/domain/pipe/src/audio_iohandle_map.cpp +++ b/services/audio_policy/server/domain/pipe/src/audio_iohandle_map.cpp @@ -310,7 +310,7 @@ void AudioIOHandleMap::DoUnmutePort(int32_t muteDuration, const std::string &por } int32_t AudioIOHandleMap::ReloadPortAndUpdateIOHandle(std::shared_ptr &pipeInfo, - const AudioModuleInfo &moduleInfo, bool softLinkFlag) + const AudioModuleInfo &moduleInfo, bool softLinkFlag) { std::string oldModuleName = pipeInfo->moduleInfo_.name; AudioIOHandle ioHandle; -- Gitee From 1fd24f2a4f684a69931b453635687733e7e7fee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B1=9F=E8=AF=9A?= Date: Wed, 10 Sep 2025 08:40:12 +0000 Subject: [PATCH 2/2] update services/audio_policy/server/domain/pipe/src/audio_iohandle_map.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨江诚 --- .../domain/pipe/src/audio_iohandle_map.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/services/audio_policy/server/domain/pipe/src/audio_iohandle_map.cpp b/services/audio_policy/server/domain/pipe/src/audio_iohandle_map.cpp index fcd5d7361d..55b40b60ce 100644 --- a/services/audio_policy/server/domain/pipe/src/audio_iohandle_map.cpp +++ b/services/audio_policy/server/domain/pipe/src/audio_iohandle_map.cpp @@ -310,7 +310,7 @@ void AudioIOHandleMap::DoUnmutePort(int32_t muteDuration, const std::string &por } int32_t AudioIOHandleMap::ReloadPortAndUpdateIOHandle(std::shared_ptr &pipeInfo, - const AudioModuleInfo &moduleInfo, bool softLinkFlag) + const AudioModuleInfo &moduleInfo, bool softLinkFlag) { std::string oldModuleName = pipeInfo->moduleInfo_.name; AudioIOHandle ioHandle; @@ -318,19 +318,13 @@ int32_t AudioIOHandleMap::ReloadPortAndUpdateIOHandle(std::shared_ptrpaIndex_); - int32_t result = AudioPolicyManagerFactory::GetAudioPolicyManager().CloseAudioPort(ioHandle, - pipeInfo->paIndex_); - CHECK_AND_RETURN_RET_LOG(result == SUCCESS, result, "CloseAudioPort failed %{public}d", result); - uint32_t paIndex = 0; - ioHandle = AudioPolicyManagerFactory::GetAudioPolicyManager().OpenAudioPort(moduleInfo, paIndex); + ioHandle = AudioPolicyManagerFactory::GetAudioPolicyManager().ReloadAudioPort(moduleInfo, paIndex); CHECK_AND_RETURN_RET_LOG(ioHandle != HDI_INVALID_ID, ERR_INVALID_HANDLE, - "OpenAudioPort failed ioHandle[%{public}u]", ioHandle); + "ReloadAudioPort failed ioHandle[%{public}u]", ioHandle); CHECK_AND_RETURN_RET_LOG(paIndex != OPEN_PORT_FAILURE, ERR_OPERATION_FAILED, - "OpenAudioPort failed paId[%{public}u]", paIndex); - AUDIO_INFO_LOG("[open-module] %{public}s, id:%{public}d, paIndex: %{public}u", + "ReloadAudioPort failed paId[%{public}u]", paIndex); + AUDIO_INFO_LOG("[reload-module] %{public}s, id:%{public}d, paIndex: %{public}u", moduleInfo.name.c_str(), ioHandle, paIndex); pipeInfo->id_ = ioHandle; -- Gitee