From 7efbfc152fe1b858a4fcb5b1c31a2f785a3a1e05 Mon Sep 17 00:00:00 2001 From: byndyx Date: Wed, 26 Jun 2024 15:41:48 +0800 Subject: [PATCH] modify log Signed-off-by: byndyx --- services/audioclient/micclient/src/dmic_client.cpp | 3 --- services/audioclient/spkclient/src/dspeaker_client.cpp | 3 --- .../managersource/src/daudio_echo_cannel_manager.cpp | 6 +++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/services/audioclient/micclient/src/dmic_client.cpp b/services/audioclient/micclient/src/dmic_client.cpp index cefedb24..96b089c3 100644 --- a/services/audioclient/micclient/src/dmic_client.cpp +++ b/services/audioclient/micclient/src/dmic_client.cpp @@ -114,9 +114,6 @@ int32_t DMicClient::OnStateChange(const AudioEventType type) int32_t DMicClient::AudioFwkClientSetUp() { - if (audioParam_.captureOpts.sourceType == SOURCE_TYPE_VOICE_COMMUNICATION) { - audioParam_.captureOpts.capturerFlags = NORMAL_MODE; - } AudioStandard::AudioCapturerOptions capturerOptions = { { static_cast(audioParam_.comParam.sampleRate), diff --git a/services/audioclient/spkclient/src/dspeaker_client.cpp b/services/audioclient/spkclient/src/dspeaker_client.cpp index 117b769a..83bfe9cd 100644 --- a/services/audioclient/spkclient/src/dspeaker_client.cpp +++ b/services/audioclient/spkclient/src/dspeaker_client.cpp @@ -79,9 +79,6 @@ int32_t DSpeakerClient::CreateAudioRenderer(const AudioParam ¶m) param.comParam.sampleRate, param.comParam.bitFormat, param.comParam.channelMask, param.comParam.frameSize, param.renderOpts.contentType, param.renderOpts.renderFlags, param.renderOpts.streamUsage); audioParam_ = param; - if (audioParam_.renderOpts.streamUsage == STREAM_USAGE_VOICE_COMMUNICATION) { - audioParam_.renderOpts.renderFlags = NORMAL_MODE; - } AudioStandard::AudioRendererOptions rendererOptions = { { static_cast(audioParam_.comParam.sampleRate), diff --git a/services/audiomanager/managersource/src/daudio_echo_cannel_manager.cpp b/services/audiomanager/managersource/src/daudio_echo_cannel_manager.cpp index fb23e5be..a6ddd430 100644 --- a/services/audiomanager/managersource/src/daudio_echo_cannel_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_echo_cannel_manager.cpp @@ -212,10 +212,10 @@ void DAudioEchoCannelManager::OnReadData(size_t length) DHLOGE("Get buffer desc failed. On read data."); return; } - DHLOGD("Get echo ref data. size: %{puclic}zu.", bufDesc.bufLength); + DHLOGD("Get echo ref data. size: %{public}zu.", bufDesc.bufLength); std::shared_ptr audioData = std::make_shared(bufDesc.bufLength); if (audioData->Capacity() != bufDesc.bufLength) { - DHLOGE("Audio data length is not equal to buflength. datalength: %{puclic}zu, bufLength: %{puclic}zu", + DHLOGE("Audio data length is not equal to buflength. datalength: %{public}zu, bufLength: %{public}zu", audioData->Capacity(), bufDesc.bufLength); } if (memcpy_s(audioData->Data(), audioData->Capacity(), bufDesc.buffer, bufDesc.bufLength) != EOK) { @@ -230,7 +230,7 @@ void DAudioEchoCannelManager::OnReadData(size_t length) refDataQueue_.pop(); } refDataQueue_.push(audioData); - DHLOGI("Push new echo ref data, buf len: %{puclic}zu.", refDataQueue_.size()); + DHLOGI("Push new echo ref data, buf len: %{public}zu.", refDataQueue_.size()); refQueueCond_.notify_all(); } -- Gitee