From 33b3574cea704fb976341280352134f53ceb53ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=9B=BD=E5=BA=86?= Date: Wed, 8 May 2024 09:29:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 韦国庆 --- .../audiomanager/managersource/src/daudio_source_manager.cpp | 4 ++++ services/audiomanager/managersource/src/dmic_dev.cpp | 2 +- services/audiomanager/managersource/src/dspeaker_dev.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index 91f87529..5612cdfa 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -218,6 +218,10 @@ int32_t DAudioSourceManager::DoEnableDAudio(const std::string &args) sourceDev = audioDevMap_[devId].dev; } DHLOGI("Call source dev to enable daudio."); + if (sourceDev == nullptr) { + DHLOGE("Source dev is nullptr."); + return ERR_DH_AUDIO_FAILED; + } int32_t result = sourceDev->EnableDAudio(dhId, attrs); return OnEnableDAudio(devId, dhId, result); } diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp index b7466826..54cf54c8 100644 --- a/services/audiomanager/managersource/src/dmic_dev.cpp +++ b/services/audiomanager/managersource/src/dmic_dev.cpp @@ -390,7 +390,7 @@ void DMicDev::EnqueueThread() { writeIndex_ = 0; writeNum_ = 0; - int64_t timeIntervalns = paramHDF_.period * AUDIO_NS_PER_SECOND / AUDIO_MS_PER_SECOND; + int64_t timeIntervalns = static_cast(paramHDF_.period * AUDIO_NS_PER_SECOND / AUDIO_MS_PER_SECOND); DHLOGD("Enqueue thread start, lengthPerWrite length: %{public}d, interval: %{public}d.", lengthPerTrans_, paramHDF_.period); FillJitterQueue(); diff --git a/services/audiomanager/managersource/src/dspeaker_dev.cpp b/services/audiomanager/managersource/src/dspeaker_dev.cpp index 232faebd..7e6b65ad 100644 --- a/services/audiomanager/managersource/src/dspeaker_dev.cpp +++ b/services/audiomanager/managersource/src/dspeaker_dev.cpp @@ -371,7 +371,7 @@ void DSpeakerDev::EnqueueThread() readIndex_ = 0; readNum_ = 0; frameIndex_ = 0; - int64_t timeIntervalns = paramHDF_.period * AUDIO_NS_PER_SECOND / AUDIO_MS_PER_SECOND; + int64_t timeIntervalns = static_cast(paramHDF_.period * AUDIO_NS_PER_SECOND / AUDIO_MS_PER_SECOND); DHLOGI("Enqueue thread start, lengthPerRead length: %{public}d, interval: %{pubic}d.", lengthPerTrans_, paramHDF_.period); while (ashmem_ != nullptr && isEnqueueRunning_.load()) { -- Gitee