From e2606775f5b69757bb3dc036b3d32bb40d63aaab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=9B=BD=E5=BA=86?= Date: Mon, 7 Jul 2025 14:12:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A9=B1=E5=8A=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=89=88=E6=9C=AC2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 韦国庆 --- .../native_cpp/audio_source/BUILD.gn | 2 +- .../audio_source/include/daudio_hdf_operate.h | 8 +++--- .../test/unittest/audiosourcetest/BUILD.gn | 2 +- .../include/daudio_hdi_handler.h | 10 +++---- .../include/daudio_manager_callback.h | 23 +++++++++------ .../src/daudio_manager_callback.cpp | 28 +++++++++++++++---- .../test/unittest/daudio_hdi_handler/BUILD.gn | 2 +- .../include/audio_test_utils.h | 14 +++++----- .../unittest/daudio_manager_callback/BUILD.gn | 2 +- .../src/daudio_manager_callback_test.cpp | 18 ++++++------ services/audiomanager/servicesource/BUILD.gn | 2 +- .../test/unittest/sourcedevice/BUILD.gn | 8 +++--- .../test/unittest/sourcemanager/BUILD.gn | 2 +- 13 files changed, 72 insertions(+), 49 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn b/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn index 66b75e0c..c925d559 100755 --- a/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/audio_source/BUILD.gn @@ -54,7 +54,7 @@ ohos_shared_library("distributed_audio_source_sdk") { "cJSON:cjson", "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", - "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "drivers_interface_distributed_audio:libdaudioext_proxy_2.1", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", "hdf_core:libpub_utils", diff --git a/interfaces/inner_kits/native_cpp/audio_source/include/daudio_hdf_operate.h b/interfaces/inner_kits/native_cpp/audio_source/include/daudio_hdf_operate.h index c3946fa2..16f0d65b 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/include/daudio_hdf_operate.h +++ b/interfaces/inner_kits/native_cpp/audio_source/include/daudio_hdf_operate.h @@ -25,7 +25,7 @@ #include "idevmgr_hdi.h" #include "iservmgr_hdi.h" #include "single_instance.h" -#include +#include namespace OHOS { namespace DistributedHardware { @@ -39,9 +39,9 @@ using OHOS::HDI::ServiceManager::V1_0::IServiceManager; using OHOS::HDI::ServiceManager::V1_0::IServStatListener; using OHOS::HDI::ServiceManager::V1_0::ServiceStatus; using OHOS::HDI::ServiceManager::V1_0::ServStatListenerStub; -using OHOS::HDI::DistributedAudio::Audioext::V2_0::IDAudioManager; -using OHOS::HDI::DistributedAudio::Audioext::V2_0::IDAudioHdfCallback; -using OHOS::HDI::DistributedAudio::Audioext::V2_0::DAudioEvent; +using OHOS::HDI::DistributedAudio::Audioext::V2_1::IDAudioManager; +using OHOS::HDI::DistributedAudio::Audioext::V2_1::IDAudioHdfCallback; +using OHOS::HDI::DistributedAudio::Audioext::V2_1::DAudioEvent; class FwkDAudioHdfCallback; class HdfDeathRecipient : public IRemoteObject::DeathRecipient { diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn index f32ade6d..54f04463 100755 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/BUILD.gn @@ -53,7 +53,7 @@ ohos_unittest("AudioSourceTest") { "cJSON:cjson", "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", - "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "drivers_interface_distributed_audio:libdaudioext_proxy_2.1", "googletest:gmock", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", diff --git a/services/audiohdiproxy/include/daudio_hdi_handler.h b/services/audiohdiproxy/include/daudio_hdi_handler.h index 8221af2d..116178e7 100644 --- a/services/audiohdiproxy/include/daudio_hdi_handler.h +++ b/services/audiohdiproxy/include/daudio_hdi_handler.h @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include "iremote_object.h" #include "audio_event.h" @@ -32,9 +32,9 @@ namespace OHOS { namespace DistributedHardware { -using OHOS::HDI::DistributedAudio::Audioext::V2_0::DAudioEvent; -using OHOS::HDI::DistributedAudio::Audioext::V2_0::IDAudioCallback; -using OHOS::HDI::DistributedAudio::Audioext::V2_0::IDAudioManager; +using OHOS::HDI::DistributedAudio::Audioext::V2_1::DAudioEvent; +using OHOS::HDI::DistributedAudio::Audioext::V2_1::IDAudioCallback; +using OHOS::HDI::DistributedAudio::Audioext::V2_1::IDAudioManager; class DAudioHdiHandler { DECLARE_SINGLE_INSTANCE_BASE(DAudioHdiHandler); diff --git a/services/audiohdiproxy/include/daudio_manager_callback.h b/services/audiohdiproxy/include/daudio_manager_callback.h index 1066124f..f5ddb91d 100644 --- a/services/audiohdiproxy/include/daudio_manager_callback.h +++ b/services/audiohdiproxy/include/daudio_manager_callback.h @@ -16,14 +16,14 @@ #ifndef OHOS_DAUDIO_MANAGER_CALLBACK_H #define OHOS_DAUDIO_MANAGER_CALLBACK_H -#include -#include +#include +#include #include "idaudio_hdi_callback.h" namespace OHOS { namespace DistributedHardware { -class DAudioManagerCallback : public OHOS::HDI::DistributedAudio::Audioext::V2_0::IDAudioCallback { +class DAudioManagerCallback : public OHOS::HDI::DistributedAudio::Audioext::V2_1::IDAudioCallback { public: explicit DAudioManagerCallback(const std::shared_ptr callback) : callback_(callback) {}; ~DAudioManagerCallback() override = default; @@ -33,24 +33,29 @@ public: int32_t DestroyStream(int32_t streamId) override; int32_t SetParameters(int32_t streamId, - const OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioParameter ¶m) override; + const OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioParameter ¶m) override; int32_t NotifyEvent(int32_t streamId, - const OHOS::HDI::DistributedAudio::Audioext::V2_0::DAudioEvent &event) override; + const OHOS::HDI::DistributedAudio::Audioext::V2_1::DAudioEvent &event) override; int32_t WriteStreamData(int32_t streamId, - const OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioData &data) override; + const OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioData &data) override; int32_t ReadStreamData(int32_t streamId, - OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioData &data) override; + OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioData &data) override; int32_t ReadMmapPosition(int32_t streamId, uint64_t &frames, - OHOS::HDI::DistributedAudio::Audioext::V2_0::CurrentTime &time) override; + OHOS::HDI::DistributedAudio::Audioext::V2_1::CurrentTime &time) override; int32_t RefreshAshmemInfo(int32_t streamId, int fd, int32_t ashmemLength, int32_t lengthPerTrans) override; + int32_t GetLatency(int32_t streamId, uint32_t& ms) override; + + int32_t GetRenderPosition(int32_t streamId, uint64_t &frames, + OHOS::HDI::DistributedAudio::Audioext::V2_1::CurrentTime &time) override; + private: - int32_t GetAudioParamHDF(const OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioParameter& param, + int32_t GetAudioParamHDF(const OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioParameter& param, AudioParamHDF& paramHDF); private: diff --git a/services/audiohdiproxy/src/daudio_manager_callback.cpp b/services/audiohdiproxy/src/daudio_manager_callback.cpp index a9feb995..ca8e8a03 100644 --- a/services/audiohdiproxy/src/daudio_manager_callback.cpp +++ b/services/audiohdiproxy/src/daudio_manager_callback.cpp @@ -28,7 +28,7 @@ #undef DH_LOG_TAG #define DH_LOG_TAG "DAudioManagerCallback" -using OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioParameter; +using OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioParameter; namespace OHOS { namespace DistributedHardware { @@ -123,7 +123,7 @@ int32_t DAudioManagerCallback::SetParameters(int32_t streamId, const AudioParame } int32_t DAudioManagerCallback::NotifyEvent(int32_t streamId, - const OHOS::HDI::DistributedAudio::Audioext::V2_0::DAudioEvent& event) + const OHOS::HDI::DistributedAudio::Audioext::V2_1::DAudioEvent& event) { DHLOGI("Notify event."); CHECK_NULL_RETURN(callback_, HDF_FAILURE); @@ -170,7 +170,7 @@ int32_t DAudioManagerCallback::NotifyEvent(int32_t streamId, } int32_t DAudioManagerCallback::WriteStreamData(int32_t streamId, - const OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioData &data) + const OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioData &data) { DHLOGD("Write Stream Data, audio data param frameSize is %{public}d.", data.param.frameSize); if (data.param.frameSize == 0 || data.param.frameSize > DEFAULT_AUDIO_DATA_SIZE) { @@ -194,7 +194,7 @@ int32_t DAudioManagerCallback::WriteStreamData(int32_t streamId, } int32_t DAudioManagerCallback::ReadStreamData(int32_t streamId, - OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioData &data) + OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioData &data) { DHLOGD("Read stream data."); std::shared_ptr audioData = nullptr; @@ -211,7 +211,7 @@ int32_t DAudioManagerCallback::ReadStreamData(int32_t streamId, } int32_t DAudioManagerCallback::ReadMmapPosition(int32_t streamId, - uint64_t &frames, OHOS::HDI::DistributedAudio::Audioext::V2_0::CurrentTime &time) + uint64_t &frames, OHOS::HDI::DistributedAudio::Audioext::V2_1::CurrentTime &time) { DHLOGD("Read mmap position"); CurrentTimeHDF timeHdf; @@ -238,5 +238,23 @@ int32_t DAudioManagerCallback::RefreshAshmemInfo(int32_t streamId, int fd, int32 DHLOGD("Refresh ashmem info success."); return HDF_SUCCESS; } + +int32_t DAudioManagerCallback::GetLatency(int32_t streamId, uint32_t& ms) +{ + DHLOGD("Get latency not support yet."); + (void)streamId; + (void)ms; + return HDF_SUCCESS; +} + +int32_t DAudioManagerCallback::GetRenderPosition(int32_t streamId, uint64_t &frames, + OHOS::HDI::DistributedAudio::Audioext::V2_1::CurrentTime &time) +{ + DHLOGD("Get render position not support yet."); + (void)streamId; + (void)frames; + (void)time; + return HDF_SUCCESS; +} } // DistributedHardware } // OHOS diff --git a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn index 06ad4522..abdb263c 100644 --- a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn +++ b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/BUILD.gn @@ -53,7 +53,7 @@ ohos_unittest("DAudioHdiHandlerTest") { "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "drivers_interface_distributed_audio:libdaudioext_proxy_2.1", "googletest:gmock", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", diff --git a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/include/audio_test_utils.h b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/include/audio_test_utils.h index b0f94739..771b1436 100644 --- a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/include/audio_test_utils.h +++ b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/include/audio_test_utils.h @@ -16,17 +16,17 @@ #ifndef OHOS_AUDIO_TEST_UTILS_H #define OHOS_AUDIO_TEST_UTILS_H -#include -#include +#include +#include #include "daudio_errorcode.h" #include "idaudio_hdi_callback.h" namespace OHOS { namespace DistributedHardware { -using OHOS::HDI::DistributedAudio::Audioext::V2_0::IDAudioCallback; -using OHOS::HDI::DistributedAudio::Audioext::V2_0::IDAudioManager; -using OHOS::HDI::DistributedAudio::Audioext::V2_0::IDAudioHdfCallback; +using OHOS::HDI::DistributedAudio::Audioext::V2_1::IDAudioCallback; +using OHOS::HDI::DistributedAudio::Audioext::V2_1::IDAudioManager; +using OHOS::HDI::DistributedAudio::Audioext::V2_1::IDAudioHdfCallback; class MockIDAudioManager : public IDAudioManager { public: @@ -34,7 +34,7 @@ public: ~MockIDAudioManager() {} int32_t RegisterAudioDevice(const std::string &adpName, int32_t devId, const std::string &capability, - const sptr &callbackObj) override + const sptr &callbackObj) override { return DH_SUCCESS; } @@ -45,7 +45,7 @@ public: } int32_t NotifyEvent(const std::string &adpName, int32_t devId, int32_t streamId, - const OHOS::HDI::DistributedAudio::Audioext::V2_0::DAudioEvent &event) override + const OHOS::HDI::DistributedAudio::Audioext::V2_1::DAudioEvent &event) override { return DH_SUCCESS; } diff --git a/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn b/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn index 28a1676b..877cd550 100644 --- a/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn +++ b/services/audiohdiproxy/test/unittest/daudio_manager_callback/BUILD.gn @@ -47,7 +47,7 @@ ohos_unittest("DAudioManagerCallbackTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", - "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "drivers_interface_distributed_audio:libdaudioext_proxy_2.1", "googletest:gmock", "ipc:ipc_core", ] diff --git a/services/audiohdiproxy/test/unittest/daudio_manager_callback/src/daudio_manager_callback_test.cpp b/services/audiohdiproxy/test/unittest/daudio_manager_callback/src/daudio_manager_callback_test.cpp index 7b3b8441..7d5bda7f 100644 --- a/services/audiohdiproxy/test/unittest/daudio_manager_callback/src/daudio_manager_callback_test.cpp +++ b/services/audiohdiproxy/test/unittest/daudio_manager_callback/src/daudio_manager_callback_test.cpp @@ -98,7 +98,7 @@ HWTEST_F(DAudioManagerCallbackTest, SetParameters_001, TestSize.Level1) ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); - OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioParameter param; + OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioParameter param; manCallback_->callback_ = nullptr; EXPECT_EQ(HDF_FAILURE, manCallback_->SetParameters(streamId_, param)); EXPECT_EQ(HDF_FAILURE, manCallback_->DestroyStream(streamId_)); @@ -115,7 +115,7 @@ HWTEST_F(DAudioManagerCallbackTest, SetParameters_002, TestSize.Level1) ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); - OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioParameter param = { + OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioParameter param = { .format = 0x1u, .channelCount = 2, .sampleRate = 48000, @@ -170,7 +170,7 @@ HWTEST_F(DAudioManagerCallbackTest, NotifyEvent_001, TestSize.Level1) manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); manCallback_->callback_ = nullptr; - OHOS::HDI::DistributedAudio::Audioext::V2_0::DAudioEvent event; + OHOS::HDI::DistributedAudio::Audioext::V2_1::DAudioEvent event; EXPECT_EQ(HDF_FAILURE, manCallback_->NotifyEvent(streamId_, event)); EXPECT_EQ(HDF_FAILURE, manCallback_->DestroyStream(streamId_)); } @@ -186,7 +186,7 @@ HWTEST_F(DAudioManagerCallbackTest, NotifyEvent_002, TestSize.Level1) ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); - OHOS::HDI::DistributedAudio::Audioext::V2_0::DAudioEvent event; + OHOS::HDI::DistributedAudio::Audioext::V2_1::DAudioEvent event; event.type = AudioEventHDF::AUDIO_EVENT_VOLUME_SET; event.content = "HDF_SUCCESS"; EXPECT_EQ(HDF_SUCCESS, manCallback_->NotifyEvent(streamId_, event)); @@ -232,7 +232,7 @@ HWTEST_F(DAudioManagerCallbackTest, WriteStreamData_001, TestSize.Level1) manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); manCallback_->callback_ = nullptr; - OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioData data; + OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioData data; EXPECT_EQ(HDF_FAILURE, manCallback_->WriteStreamData(streamId_, data)); EXPECT_EQ(HDF_FAILURE, manCallback_->DestroyStream(streamId_)); } @@ -248,7 +248,7 @@ HWTEST_F(DAudioManagerCallbackTest, WriteStreamData_002, TestSize.Level1) ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); - OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioData data; + OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioData data; data.param.format = 16; data.param.channelCount = 2; data.param.sampleRate = 48000; @@ -278,7 +278,7 @@ HWTEST_F(DAudioManagerCallbackTest, ReadStreamData_001, TestSize.Level1) manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); manCallback_->callback_ = nullptr; - OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioData data; + OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioData data; EXPECT_EQ(HDF_FAILURE, manCallback_->ReadStreamData(streamId_, data)); EXPECT_EQ(HDF_FAILURE, manCallback_->DestroyStream(streamId_)); } @@ -294,7 +294,7 @@ HWTEST_F(DAudioManagerCallbackTest, ReadStreamData_002, TestSize.Level1) ASSERT_TRUE(manCallback_ != nullptr); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->CreateStream(streamId_)); - OHOS::HDI::DistributedAudio::Audioext::V2_0::AudioData data; + OHOS::HDI::DistributedAudio::Audioext::V2_1::AudioData data; data.param.format = 16; data.param.channelCount = 2; data.param.sampleRate = 48000; @@ -320,7 +320,7 @@ HWTEST_F(DAudioManagerCallbackTest, ReadMmapPosition_001, TestSize.Level1) ASSERT_TRUE(manCallback_ != nullptr); int32_t streamId = 0; uint64_t frames = 1; - OHOS::HDI::DistributedAudio::Audioext::V2_0::CurrentTime time; + OHOS::HDI::DistributedAudio::Audioext::V2_1::CurrentTime time; EXPECT_EQ(HDF_SUCCESS, manCallback_->ReadMmapPosition(streamId, frames, time)); manCallback_->callback_ = std::make_shared(); EXPECT_EQ(HDF_SUCCESS, manCallback_->ReadMmapPosition(streamId, frames, time)); diff --git a/services/audiomanager/servicesource/BUILD.gn b/services/audiomanager/servicesource/BUILD.gn index e56e2a9c..523fe076 100755 --- a/services/audiomanager/servicesource/BUILD.gn +++ b/services/audiomanager/servicesource/BUILD.gn @@ -106,7 +106,7 @@ ohos_shared_library("distributed_audio_source") { "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "drivers_interface_distributed_audio:libdaudio_proxy_1.0", - "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "drivers_interface_distributed_audio:libdaudioext_proxy_2.1", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hdf_core:libhdf_utils", diff --git a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn index 3ce666e3..dcefd34b 100644 --- a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn @@ -78,7 +78,7 @@ ohos_unittest("DaudioSourceDevTest") { "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", - "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "drivers_interface_distributed_audio:libdaudioext_proxy_2.1", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "googletest:gmock", @@ -119,7 +119,7 @@ ohos_unittest("DMicDevTest") { "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "drivers_interface_distributed_audio:libdaudioext_proxy_2.1", "dsoftbus:softbus_client", "googletest:gmock", "hilog:libhilog", @@ -160,7 +160,7 @@ ohos_unittest("DSpeakerDevTest") { "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "drivers_interface_distributed_audio:libdaudioext_proxy_2.1", "dsoftbus:softbus_client", "googletest:gmock", "hilog:libhilog", @@ -205,7 +205,7 @@ ohos_unittest("DAudioEchoCannelManagerTest") { "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "drivers_interface_distributed_audio:libdaudioext_proxy_2.1", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "googletest:gmock", diff --git a/services/audiomanager/test/unittest/sourcemanager/BUILD.gn b/services/audiomanager/test/unittest/sourcemanager/BUILD.gn index fb08599b..9013af70 100644 --- a/services/audiomanager/test/unittest/sourcemanager/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcemanager/BUILD.gn @@ -76,7 +76,7 @@ ohos_unittest("DaudioSourceMgrTest") { "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", - "drivers_interface_distributed_audio:libdaudioext_proxy_2.0", + "drivers_interface_distributed_audio:libdaudioext_proxy_2.1", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "googletest:gmock", -- Gitee