From 2fa4e16d47d08140aa4765a4c5137014fd516aca Mon Sep 17 00:00:00 2001 From: w30042960 Date: Wed, 8 Nov 2023 11:17:27 +0800 Subject: [PATCH] modify code Signed-off-by: w30042960 --- services/audioclient/micclient/src/dmic_client.cpp | 4 ++-- services/audioclient/spkclient/src/dspeaker_client.cpp | 4 ++-- services/audiohdiproxy/src/daudio_hdi_handler.cpp | 6 +++++- services/audiomanager/managersink/src/daudio_sink_dev.cpp | 6 +----- .../managersource/include/daudio_source_manager.h | 2 +- .../audiomanager/managersource/src/daudio_source_dev.cpp | 6 +----- .../managersource/src/daudio_source_manager.cpp | 4 ++++ services/audiomanager/managersource/src/dmic_dev.cpp | 2 +- services/audiomanager/managersource/src/dspeaker_dev.cpp | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/services/audioclient/micclient/src/dmic_client.cpp b/services/audioclient/micclient/src/dmic_client.cpp index 330fb618..abeaefbf 100644 --- a/services/audioclient/micclient/src/dmic_client.cpp +++ b/services/audioclient/micclient/src/dmic_client.cpp @@ -271,7 +271,7 @@ void DMicClient::AudioFwkCaptureData() } int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastCaptureStartTime_)) { - DHLOGE("This time capture spend: %lld, The interval of capture this time and the last time: %lld", + DHLOGE("This time capture spend: %lld us, The interval of capture this time and the last time: %lld us", endTime - startTime, startTime - lastCaptureStartTime_); } lastCaptureStartTime_ = startTime; @@ -292,7 +292,7 @@ void DMicClient::AudioFwkCaptureData() } int64_t endTransTime = GetNowTimeUs(); if (IsOutDurationRange(startTransTime, endTransTime, lastTransStartTime_)) { - DHLOGE("This time send data spend: %lld, The interval of send data this time and the last time: %lld", + DHLOGE("This time send data spend: %lld us, The interval of send data this time and the last time: %lld us", endTransTime - startTransTime, startTransTime - lastTransStartTime_); } lastTransStartTime_ = startTransTime; diff --git a/services/audioclient/spkclient/src/dspeaker_client.cpp b/services/audioclient/spkclient/src/dspeaker_client.cpp index 6a51c61a..120452ef 100644 --- a/services/audioclient/spkclient/src/dspeaker_client.cpp +++ b/services/audioclient/spkclient/src/dspeaker_client.cpp @@ -311,7 +311,7 @@ void DSpeakerClient::PlayThreadRunning() } int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastPlayStartTime_)) { - DHLOGE("This time play spend: %lld, The interval of play this time and the last time: %lld", + DHLOGE("This time play spend: %lld us, The interval of play this time and the last time: %lld us", endTime - startTime, startTime - lastPlayStartTime_); } lastPlayStartTime_ = startTime; @@ -362,7 +362,7 @@ int32_t DSpeakerClient::OnDecodeTransDataDone(const std::shared_ptr & DHLOGI("Push new spk data, buf len: %d.", dataQueue_.size()); int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastReceiveStartTime_)) { - DHLOGE("This time receivce data spend: %lld, The interval of receivce data this time and the last time: %lld", + DHLOGE("This time receivce data spend: %lld us, Receivce data this time and the last time: %lld us", endTime - startTime, startTime - lastReceiveStartTime_); } lastReceiveStartTime_ = startTime; diff --git a/services/audiohdiproxy/src/daudio_hdi_handler.cpp b/services/audiohdiproxy/src/daudio_hdi_handler.cpp index 5f3023c4..3c6a4f45 100644 --- a/services/audiohdiproxy/src/daudio_hdi_handler.cpp +++ b/services/audiohdiproxy/src/daudio_hdi_handler.cpp @@ -79,6 +79,11 @@ int32_t DAudioHdiHandler::InitHdiHandler() int32_t DAudioHdiHandler::UninitHdiHandler() { DHLOGI("Unload hdf driver start."); + if (remote_ == nullptr) { + DHLOGE("Remote is nullptr."); + return ERR_DH_AUDIO_NULLPTR; + } + remote_->RemoveDeathRecipient(audioHdiRecipient_); if (audioSrvHdf_ == nullptr) { DHLOGI("Audio hdi proxy not init. Do not need to uninit."); return DH_SUCCESS; @@ -88,7 +93,6 @@ int32_t DAudioHdiHandler::UninitHdiHandler() DHLOGE("Unload hdf driver failed, ret: %d", ret); return ret; } - remote_->RemoveDeathRecipient(audioHdiRecipient_); DHLOGI("Uninit hdi handler success."); return DH_SUCCESS; } diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index bb9081b9..75ca02a9 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -54,11 +54,7 @@ int32_t DAudioSinkDev::AwakeAudioDev() void DAudioSinkDev::SleepAudioDev() { - if (handler_ == nullptr) { - DHLOGI("Event handler is already stoped."); - return; - } - while (!handler_->IsIdle()) {}; + handler_ = nullptr; DHLOGD("Sleep audio dev over."); } diff --git a/services/audiomanager/managersource/include/daudio_source_manager.h b/services/audiomanager/managersource/include/daudio_source_manager.h index 0f6809fa..5d9d2a5b 100644 --- a/services/audiomanager/managersource/include/daudio_source_manager.h +++ b/services/audiomanager/managersource/include/daudio_source_manager.h @@ -70,7 +70,7 @@ private: static constexpr const char* LISTEN_THREAD = "sourceListenTh"; static constexpr int32_t WATCHDOG_INTERVAL_TIME = 20000; static constexpr int32_t WATCHDOG_DELAY_TIME = 5000; - static constexpr size_t SLEEP_TIME = 5000; + static constexpr size_t SLEEP_TIME = 1000000; std::string localDevId_; std::mutex devMapMtx_; diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index 6550a5ef..34cc2073 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -100,11 +100,7 @@ int32_t DAudioSourceDev::AwakeAudioDev() void DAudioSourceDev::SleepAudioDev() { - if (handler_ == nullptr) { - DHLOGI("Event handler is already stoped."); - return; - } - while (!handler_->IsIdle()) {}; + handler_ = nullptr; DHLOGD("Sleep audio dev over."); } diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index bea0b5f0..f1b46f00 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -367,6 +367,10 @@ void DAudioSourceManager::ListenAudioDev() std::lock_guard lock(devMapMtx_); if (!audioDevMap_.empty()) { for (auto &iter : audioDevMap_) { + if (iter.second.dev == nullptr) { + DHLOGE("Listen audioDev error, dev is nullptr."); + continue; + } iter.second.dev->RestoreThreadStatus(); } } diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp index 39fcf443..6d546ab6 100644 --- a/services/audiomanager/managersource/src/dmic_dev.cpp +++ b/services/audiomanager/managersource/src/dmic_dev.cpp @@ -332,7 +332,7 @@ int32_t DMicDev::ReadStreamData(const std::string &devId, const int32_t dhId, st #endif int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastReadStartTime_)) { - DHLOGE("This time read data spend: %lld, The interval of read data this time and the last time: %lld", + DHLOGE("This time read data spend: %lld us, The interval of read data this time and the last time: %lld us", endTime - startTime, startTime - lastReadStartTime_); } lastReadStartTime_ = startTime; diff --git a/services/audiomanager/managersource/src/dspeaker_dev.cpp b/services/audiomanager/managersource/src/dspeaker_dev.cpp index 41a0b98f..e45fd8db 100644 --- a/services/audiomanager/managersource/src/dspeaker_dev.cpp +++ b/services/audiomanager/managersource/src/dspeaker_dev.cpp @@ -330,7 +330,7 @@ int32_t DSpeakerDev::WriteStreamData(const std::string &devId, const int32_t dhI } int64_t endTime = GetNowTimeUs(); if (IsOutDurationRange(startTime, endTime, lastwriteStartTime_)) { - DHLOGE("This time write data spend: %lld, The interval of write data this time and the last time: %lld", + DHLOGE("This time write data spend: %lld us, The interval of write data this time and the last time: %lld us", endTime - startTime, startTime - lastwriteStartTime_); } lastwriteStartTime_ = startTime; -- Gitee