From 90674a82baf957b2cb85acd37fca90387dc1e128 Mon Sep 17 00:00:00 2001 From: c30051536 Date: Fri, 1 Sep 2023 17:59:57 +0800 Subject: [PATCH] Modify the SPK opening timeout Signed-off-by: c30051536 --- .../audio/v1_0/include/audio_adapter_interface_impl.h | 2 +- services/audioclient/micclient/src/dmic_client.cpp | 1 + services/audiomanager/managersource/include/daudio_source_dev.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h b/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h index 7a6018df..7f02f25f 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h @@ -127,7 +127,7 @@ private: void SetDumpFlag(bool isRender); private: - static constexpr uint8_t WAIT_SECONDS = 10; + static constexpr uint8_t WAIT_SECONDS = 20; static constexpr int32_t TYPE_CONDITION = 11; AudioAdapterDescriptor adpDescriptor_; AudioAdapterStatus status_ = STATUS_OFFLINE; diff --git a/services/audioclient/micclient/src/dmic_client.cpp b/services/audioclient/micclient/src/dmic_client.cpp index 13f7c692..5932838e 100644 --- a/services/audioclient/micclient/src/dmic_client.cpp +++ b/services/audioclient/micclient/src/dmic_client.cpp @@ -260,6 +260,7 @@ void DMicClient::GenerateAttr(const AudioParam ¶m) captureAttr_.silenceThreshold = AUDIO_BUFFER_SIZE; captureAttr_.channelCount = param.comParam.channelMask; captureAttr_.sampleRate = param.comParam.sampleRate; + captureAttr_.sourceType = 1; } int32_t DMicClient::AudioFwkClientSetUp() diff --git a/services/audiomanager/managersource/include/daudio_source_dev.h b/services/audiomanager/managersource/include/daudio_source_dev.h index b8a35fab..7e95e466 100644 --- a/services/audiomanager/managersource/include/daudio_source_dev.h +++ b/services/audiomanager/managersource/include/daudio_source_dev.h @@ -113,7 +113,7 @@ private: int32_t CloseMicNew(const std::string &args); private: - static constexpr uint8_t RPC_WAIT_SECONDS = 2; + static constexpr uint8_t RPC_WAIT_SECONDS = 10; static constexpr uint8_t TASK_QUEUE_CAPACITY = 20; static constexpr uint8_t EVENT_NOTIFY_OPEN_SPK = 0x01; static constexpr uint8_t EVENT_NOTIFY_CLOSE_SPK = 0x02; -- Gitee