From cfdce39e564097330ca311e446a75858028ecdae Mon Sep 17 00:00:00 2001 From: w30042960 Date: Wed, 28 Aug 2024 16:15:47 +0800 Subject: [PATCH] modify dcts Signed-off-by: w30042960 --- services/audiomanager/managersource/include/dmic_dev.h | 2 -- services/audiomanager/managersource/src/dmic_dev.cpp | 7 ------- .../test/unittest/sourcedevice/src/dmic_dev_test.cpp | 3 ++- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/services/audiomanager/managersource/include/dmic_dev.h b/services/audiomanager/managersource/include/dmic_dev.h index 17b6ca90..0bfd1a84 100644 --- a/services/audiomanager/managersource/include/dmic_dev.h +++ b/services/audiomanager/managersource/include/dmic_dev.h @@ -101,8 +101,6 @@ private: const std::string DUMP_DAUDIO_MIC_READ_FROM_BUF_NAME = "dump_source_mic_read_from_trans.pcm"; const std::string DUMP_DAUDIO_LOWLATENCY_MIC_FROM_BUF_NAME = "dump_source_mic_write_to_ashmem.pcm"; const int32_t ASHMEM_MAX_LEN = 2 * 4096; - static constexpr size_t NOTIFY_WAIT_FRAMES = 5; - static constexpr uint32_t NOTIFY_WAIT_TIME_US = 20000; std::weak_ptr audioEventCallback_; std::mutex dataQueueMtx_; diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp index fb4889b0..1dd07fd9 100644 --- a/services/audiomanager/managersource/src/dmic_dev.cpp +++ b/services/audiomanager/managersource/src/dmic_dev.cpp @@ -212,13 +212,6 @@ int32_t DMicDev::NotifyEvent(const int32_t streamId, const AudioEvent &event) switch (event.type) { case AudioEventType::AUDIO_START: curStatus_ = AudioStatus::STATUS_START; - while (isTransReady_.load()) { - std::lock_guard lock(dataQueueMtx_); - if (dataQueue_.size() >= NOTIFY_WAIT_FRAMES) { - break; - } - usleep(NOTIFY_WAIT_TIME_US); - } isExistedEmpty_.store(false); break; case AudioEventType::AUDIO_STOP: diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index 55c3abfd..5e333186 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -20,6 +20,7 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { constexpr int32_t DH_ID = 1; +constexpr size_t NOTIFY_WAIT_FRAMES = 5; constexpr int32_t DH_ID_MIC = 134217728; const std::string DEV_ID = "Test_Dev_Id"; const std::string CAP = "Test_Capability"; @@ -176,7 +177,7 @@ HWTEST_F(DMicDevTest, NotifyEvent_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, mic_->NotifyEvent(streamId_, event)); mic_->isTransReady_ = true; - for (int32_t i = 0; i < DMicDev::NOTIFY_WAIT_FRAMES; i++) { + for (int32_t i = 0; i < NOTIFY_WAIT_FRAMES; i++) { size_t size = 4096; auto audioData = std::make_shared(size); mic_->dataQueue_.push(audioData); -- Gitee