From e0f7e424a24f2ee564163b4d5a5de9fb42bb1346 Mon Sep 17 00:00:00 2001 From: hwwuhaobo Date: Fri, 2 Jun 2023 18:01:44 +0800 Subject: [PATCH] modify dmic dev data queue len && dspeaker dev frameIndex Signed-off-by: hwwuhaobo --- services/audiomanager/managersource/include/dmic_dev.h | 6 +++--- services/audiomanager/managersource/src/dspeaker_dev.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/audiomanager/managersource/include/dmic_dev.h b/services/audiomanager/managersource/include/dmic_dev.h index 4c2e049b..45772bd0 100644 --- a/services/audiomanager/managersource/include/dmic_dev.h +++ b/services/audiomanager/managersource/include/dmic_dev.h @@ -79,8 +79,8 @@ private: static constexpr uint8_t CHANNEL_WAIT_SECONDS = 5; static constexpr size_t DATA_QUEUE_MAX_SIZE = 10; static constexpr size_t DATA_QUEUE_HALF_SIZE = DATA_QUEUE_MAX_SIZE >> 1U; - static constexpr size_t LOW_LATENCY_DATA_QUEUE_MAX_SIZE = 40; - static constexpr size_t LOW_LATENCY_DATA_QUEUE_HALF_SIZE = LOW_LATENCY_DATA_QUEUE_MAX_SIZE >> 1U; + static constexpr size_t LOW_LATENCY_DATA_QUEUE_MAX_SIZE = 30; + static constexpr size_t LOW_LATENCY_DATA_QUEUE_HALF_SIZE = 10; static constexpr uint32_t MMAP_WAIT_FRAME_US = 5000; static constexpr const char* ENQUEUE_THREAD = "micEnqueueTh"; @@ -121,4 +121,4 @@ private: }; } // DistributedHardware } // OHOS -#endif // OHOS_DAUDIO_DMIC_DEV_H \ No newline at end of file +#endif // OHOS_DAUDIO_DMIC_DEV_H diff --git a/services/audiomanager/managersource/src/dspeaker_dev.cpp b/services/audiomanager/managersource/src/dspeaker_dev.cpp index b963cd0b..bb7fb955 100644 --- a/services/audiomanager/managersource/src/dspeaker_dev.cpp +++ b/services/audiomanager/managersource/src/dspeaker_dev.cpp @@ -361,6 +361,7 @@ void DSpeakerDev::EnqueueThread() { readIndex_ = 0; readNum_ = 0; + frameIndex_ = 0; DHLOGI("Enqueue thread start, lengthPerRead length: %d.", lengthPerTrans_); while (ashmem_ != nullptr && isEnqueueRunning_.load()) { int64_t timeOffset = UpdateTimeOffset(frameIndex_, LOW_LATENCY_INTERVAL_NS, @@ -450,4 +451,4 @@ int32_t DSpeakerDev::OnDecodeTransDataDone(const std::shared_ptr &aud return DH_SUCCESS; } } // DistributedHardware -} // OHOS \ No newline at end of file +} // OHOS -- Gitee