From 4b32d69d0eb92b0c1dbbcbd0aeb1a4ef2684a86e Mon Sep 17 00:00:00 2001 From: s30056362 Date: Mon, 15 Apr 2024 21:30:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=9F=B3=E6=95=88?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=AE=BE=E7=BD=AE=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: s30056362 --- services/audio_service/server/src/pa_adapter_manager.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/audio_service/server/src/pa_adapter_manager.cpp b/services/audio_service/server/src/pa_adapter_manager.cpp index cbe194ab84..d52fa19512 100644 --- a/services/audio_service/server/src/pa_adapter_manager.cpp +++ b/services/audio_service/server/src/pa_adapter_manager.cpp @@ -336,8 +336,11 @@ pa_stream *PaAdapterManager::InitPaStream(AudioProcessConfig processConfig, uint AUDIO_ERR_LOG("ConnectStreamToPA Failed"); return nullptr; } - if (SetStreamAudioEnhanceMode(paStream, enhanceMode_) != SUCCESS) { - AUDIO_ERR_LOG("set audio enhance mode failed."); + if (processConfig.audioMode == AUDIO_MODE_RECORD) { + int32_t ret = SetStreamAudioEnhanceMode(paStream, enhanceMode_); + if (ret != SUCCESS) { + AUDIO_ERR_LOG("capturer set audio enhance mode failed."); + } } return paStream; } -- Gitee From 2751dda495729f142d28738538cc297a39692daa Mon Sep 17 00:00:00 2001 From: s30056362 Date: Tue, 16 Apr 2024 09:08:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=9F=B3=E6=95=88?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=AE=BE=E7=BD=AE=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: s30056362 --- .../audio_service/server/include/pa_adapter_manager.h | 1 + .../audio_service/server/src/pa_adapter_manager.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/services/audio_service/server/include/pa_adapter_manager.h b/services/audio_service/server/include/pa_adapter_manager.h index 6254a9558e..04fb1e393a 100644 --- a/services/audio_service/server/include/pa_adapter_manager.h +++ b/services/audio_service/server/include/pa_adapter_manager.h @@ -83,6 +83,7 @@ private: int32_t HandleMainLoopStart(); pa_stream *InitPaStream(AudioProcessConfig processConfig, uint32_t sessionId, bool isRecording); bool IsEffectNone(StreamUsage streamUsage); + bool IsEnhanceNone(SourceType sourceType); int32_t SetPaProplist(pa_proplist *propList, pa_channel_map &map, AudioProcessConfig &processConfig, const std::string &streamName, uint32_t sessionId); std::shared_ptr CreateRendererStream(AudioProcessConfig processConfig, pa_stream *paStream); diff --git a/services/audio_service/server/src/pa_adapter_manager.cpp b/services/audio_service/server/src/pa_adapter_manager.cpp index d52fa19512..777f3f3d87 100644 --- a/services/audio_service/server/src/pa_adapter_manager.cpp +++ b/services/audio_service/server/src/pa_adapter_manager.cpp @@ -337,6 +337,7 @@ pa_stream *PaAdapterManager::InitPaStream(AudioProcessConfig processConfig, uint return nullptr; } if (processConfig.audioMode == AUDIO_MODE_RECORD) { + enhanceMode_ = IsEnhanceNone ? EFFECT_NONE : EFFECT_DEFAULT; int32_t ret = SetStreamAudioEnhanceMode(paStream, enhanceMode_); if (ret != SUCCESS) { AUDIO_ERR_LOG("capturer set audio enhance mode failed."); @@ -345,6 +346,15 @@ pa_stream *PaAdapterManager::InitPaStream(AudioProcessConfig processConfig, uint return paStream; } +bool PaAdapterManager::IsEnhanceNone(SourceType sourceType) +{ + if (sourceType == SOURCE_TYPE_MIC || sourceType == SOURCE_TYPE_VOICE_COMMUNICATION || + sourceType == SOURCE_TYPE_VOICE_MESSAGE) { + return false; + } + return true; +} + bool PaAdapterManager::IsEffectNone(StreamUsage streamUsage) { if (streamUsage == STREAM_USAGE_SYSTEM || streamUsage == STREAM_USAGE_DTMF || -- Gitee From c1419f42355d12f20f518638e480b9df5c98377f Mon Sep 17 00:00:00 2001 From: s30056362 Date: Tue, 16 Apr 2024 09:50:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9F=B3=E6=95=88?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: s30056362 --- .../server/include/pa_adapter_manager.h | 1 - .../server/src/pa_adapter_manager.cpp | 20 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/services/audio_service/server/include/pa_adapter_manager.h b/services/audio_service/server/include/pa_adapter_manager.h index 04fb1e393a..6254a9558e 100644 --- a/services/audio_service/server/include/pa_adapter_manager.h +++ b/services/audio_service/server/include/pa_adapter_manager.h @@ -83,7 +83,6 @@ private: int32_t HandleMainLoopStart(); pa_stream *InitPaStream(AudioProcessConfig processConfig, uint32_t sessionId, bool isRecording); bool IsEffectNone(StreamUsage streamUsage); - bool IsEnhanceNone(SourceType sourceType); int32_t SetPaProplist(pa_proplist *propList, pa_channel_map &map, AudioProcessConfig &processConfig, const std::string &streamName, uint32_t sessionId); std::shared_ptr CreateRendererStream(AudioProcessConfig processConfig, pa_stream *paStream); diff --git a/services/audio_service/server/src/pa_adapter_manager.cpp b/services/audio_service/server/src/pa_adapter_manager.cpp index 777f3f3d87..7a7eb6dd19 100644 --- a/services/audio_service/server/src/pa_adapter_manager.cpp +++ b/services/audio_service/server/src/pa_adapter_manager.cpp @@ -292,6 +292,15 @@ int32_t PaAdapterManager::GetDeviceNameForConnect(AudioProcessConfig processConf return SUCCESS; } +static bool IsEnhanceNone(SourceType sourceType) +{ + if (sourceType == SOURCE_TYPE_MIC || sourceType == SOURCE_TYPE_VOICE_COMMUNICATION || + sourceType == SOURCE_TYPE_VOICE_MESSAGE) { + return false; + } + return true; +} + pa_stream *PaAdapterManager::InitPaStream(AudioProcessConfig processConfig, uint32_t sessionId, bool isRecording) { AUDIO_DEBUG_LOG("Enter InitPaStream"); @@ -337,7 +346,7 @@ pa_stream *PaAdapterManager::InitPaStream(AudioProcessConfig processConfig, uint return nullptr; } if (processConfig.audioMode == AUDIO_MODE_RECORD) { - enhanceMode_ = IsEnhanceNone ? EFFECT_NONE : EFFECT_DEFAULT; + enhanceMode_ = IsEnhanceNone(processConfig.capturerInfo.sourceType) ? EFFECT_NONE : EFFECT_DEFAULT; int32_t ret = SetStreamAudioEnhanceMode(paStream, enhanceMode_); if (ret != SUCCESS) { AUDIO_ERR_LOG("capturer set audio enhance mode failed."); @@ -346,15 +355,6 @@ pa_stream *PaAdapterManager::InitPaStream(AudioProcessConfig processConfig, uint return paStream; } -bool PaAdapterManager::IsEnhanceNone(SourceType sourceType) -{ - if (sourceType == SOURCE_TYPE_MIC || sourceType == SOURCE_TYPE_VOICE_COMMUNICATION || - sourceType == SOURCE_TYPE_VOICE_MESSAGE) { - return false; - } - return true; -} - bool PaAdapterManager::IsEffectNone(StreamUsage streamUsage) { if (streamUsage == STREAM_USAGE_SYSTEM || streamUsage == STREAM_USAGE_DTMF || -- Gitee From 2c7bb76196fe617136c7aa28b1133fa51139de8c Mon Sep 17 00:00:00 2001 From: s30056362 Date: Tue, 16 Apr 2024 11:38:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9sourceType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: s30056362 --- services/audio_service/server/src/pa_adapter_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_service/server/src/pa_adapter_manager.cpp b/services/audio_service/server/src/pa_adapter_manager.cpp index 7a7eb6dd19..9c2bc3c7af 100644 --- a/services/audio_service/server/src/pa_adapter_manager.cpp +++ b/services/audio_service/server/src/pa_adapter_manager.cpp @@ -295,7 +295,7 @@ int32_t PaAdapterManager::GetDeviceNameForConnect(AudioProcessConfig processConf static bool IsEnhanceNone(SourceType sourceType) { if (sourceType == SOURCE_TYPE_MIC || sourceType == SOURCE_TYPE_VOICE_COMMUNICATION || - sourceType == SOURCE_TYPE_VOICE_MESSAGE) { + sourceType == SOURCE_TYPE_VOICE_CALL) { return false; } return true; -- Gitee From f3e7cb49734095af6c0844f6009a5e64c270b7e8 Mon Sep 17 00:00:00 2001 From: s30056362 Date: Tue, 16 Apr 2024 12:25:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9IsEnhanceMode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: s30056362 --- .../server/src/pa_adapter_manager.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/services/audio_service/server/src/pa_adapter_manager.cpp b/services/audio_service/server/src/pa_adapter_manager.cpp index 9c2bc3c7af..26025f3719 100644 --- a/services/audio_service/server/src/pa_adapter_manager.cpp +++ b/services/audio_service/server/src/pa_adapter_manager.cpp @@ -69,6 +69,15 @@ static int32_t CheckReturnIfinvalid(bool expr, const int32_t retVal) return CHECK_UTIL_SUCCESS; } +static bool IsEnhanceMode(SourceType sourceType) +{ + if (sourceType == SOURCE_TYPE_MIC || sourceType == SOURCE_TYPE_VOICE_COMMUNICATION || + sourceType == SOURCE_TYPE_VOICE_CALL) { + return true; + } + return false; +} + PaAdapterManager::PaAdapterManager(ManagerType type) { AUDIO_DEBUG_LOG("Constructor PaAdapterManager"); @@ -292,15 +301,6 @@ int32_t PaAdapterManager::GetDeviceNameForConnect(AudioProcessConfig processConf return SUCCESS; } -static bool IsEnhanceNone(SourceType sourceType) -{ - if (sourceType == SOURCE_TYPE_MIC || sourceType == SOURCE_TYPE_VOICE_COMMUNICATION || - sourceType == SOURCE_TYPE_VOICE_CALL) { - return false; - } - return true; -} - pa_stream *PaAdapterManager::InitPaStream(AudioProcessConfig processConfig, uint32_t sessionId, bool isRecording) { AUDIO_DEBUG_LOG("Enter InitPaStream"); @@ -346,7 +346,7 @@ pa_stream *PaAdapterManager::InitPaStream(AudioProcessConfig processConfig, uint return nullptr; } if (processConfig.audioMode == AUDIO_MODE_RECORD) { - enhanceMode_ = IsEnhanceNone(processConfig.capturerInfo.sourceType) ? EFFECT_NONE : EFFECT_DEFAULT; + enhanceMode_ = IsEnhanceMode(processConfig.capturerInfo.sourceType) ? EFFECT_DEFAULT : EFFECT_NONE; int32_t ret = SetStreamAudioEnhanceMode(paStream, enhanceMode_); if (ret != SUCCESS) { AUDIO_ERR_LOG("capturer set audio enhance mode failed."); -- Gitee