From 70108ff5f8cc99c11ce1ca9fb498c5b3b038bf89 Mon Sep 17 00:00:00 2001 From: byndyx Date: Mon, 26 Feb 2024 16:23:25 +0800 Subject: [PATCH 1/2] modify handler Signed-off-by: byndyx --- audiohandler/BUILD.gn | 2 +- audiohandler/include/daudio_handler.h | 17 +-- audiohandler/src/daudio_handler.cpp | 113 ++---------------- .../test/unittest/src/daudio_handler_test.cpp | 12 -- common/dfx_utils/test/unittest/BUILD.gn | 2 +- .../managersource/src/dmic_dev.cpp | 2 +- services/audiomanager/servicesource/BUILD.gn | 1 + .../BUILD.gn | 1 + .../sourceservicedaudionotify_fuzzer/BUILD.gn | 1 + .../sourceserviceinitsource_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../src/av_receiver_engine_transport.cpp | 2 +- 14 files changed, 20 insertions(+), 137 deletions(-) diff --git a/audiohandler/BUILD.gn b/audiohandler/BUILD.gn index ef27e252..833ed5b9 100644 --- a/audiohandler/BUILD.gn +++ b/audiohandler/BUILD.gn @@ -45,9 +45,9 @@ ohos_shared_library("distributed_audio_handler") { external_deps = [ "audio_framework:audio_capturer", "audio_framework:audio_client", + "audio_framework:audio_renderer", "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", - "player_framework:media_client", ] defines = [ diff --git a/audiohandler/include/daudio_handler.h b/audiohandler/include/daudio_handler.h index 4b79ea82..dcb63aec 100644 --- a/audiohandler/include/daudio_handler.h +++ b/audiohandler/include/daudio_handler.h @@ -26,14 +26,6 @@ namespace OHOS { namespace DistributedHardware { -typedef struct { - std::vector sampleRates; - std::vector channels; - std::vector formats; - int32_t channelMaxVal; - int32_t channelMinVal; -} CoderInfo; - typedef struct { std::vector sampleRates; std::vector channels; @@ -55,16 +47,11 @@ public: private: DAudioHandler(); ~DAudioHandler(); - int32_t QueryCodecInfo(); int32_t QueryAudioInfo(); - void GetSupportAudioInfo(AudioInfo &audioInfos, CoderInfo &encoderInfos, CoderInfo &decoderInfos); private: - CoderInfo encoderInfos_; - CoderInfo decoderInfos_; - AudioInfo audioInfos_; - CoderInfo spkInfos_; - CoderInfo micInfos_; + AudioInfo spkInfos_; + AudioInfo micInfos_; std::shared_ptr listener_ = nullptr; }; diff --git a/audiohandler/src/daudio_handler.cpp b/audiohandler/src/daudio_handler.cpp index 36275a2e..3bf416bf 100644 --- a/audiohandler/src/daudio_handler.cpp +++ b/audiohandler/src/daudio_handler.cpp @@ -18,7 +18,6 @@ #include #include "audio_system_manager.h" -#include "avcodec_list.h" #include "nlohmann/json.hpp" #include "string_ex.h" @@ -39,14 +38,6 @@ IMPLEMENT_SINGLE_INSTANCE(DAudioHandler); DAudioHandler::DAudioHandler() { - encoderInfos_.channelMaxVal = 0; - encoderInfos_.channelMinVal = 0; - decoderInfos_.channelMaxVal = 0; - decoderInfos_.channelMinVal = 0; - spkInfos_.channelMaxVal = 0; - spkInfos_.channelMinVal = 0; - micInfos_.channelMaxVal = 0; - micInfos_.channelMinVal = 0; DHLOGD("Distributed audio handler constructed."); } @@ -58,14 +49,7 @@ DAudioHandler::~DAudioHandler() int32_t DAudioHandler::Initialize() { DHLOGI("Distributed audio handler initialize."); - int32_t ret = QueryCodecInfo(); - if (ret != DH_SUCCESS) { - DHLOGE("Failed to query the codec information."); - return ret; - } - ret = QueryAudioInfo(); - GetSupportAudioInfo(audioInfos_, encoderInfos_, decoderInfos_); - return ret; + return QueryAudioInfo(); } std::vector DAudioHandler::Query() @@ -124,102 +108,19 @@ std::vector DAudioHandler::ablityForDump() Query(); return ablityForDumpVec_; } -int32_t DAudioHandler::QueryCodecInfo() -{ - DHLOGD("Query codec information."); - auto avCodecList = Media::AVCodecListFactory::CreateAVCodecList(); - CHECK_NULL_RETURN(avCodecList, ERR_DH_AUDIO_NULLPTR); - - bool queryFlag = false; - for (auto codec : avCodecList->GetAudioEncoderCaps()) { - if (codec == nullptr || codec->GetCodecInfo() == nullptr || codec->GetCodecInfo()->GetName() != AVENC_AAC) { - continue; - } - encoderInfos_.sampleRates = codec->GetSupportedSampleRates(); - encoderInfos_.formats = codec->GetSupportedFormats(); - encoderInfos_.channelMaxVal = codec->GetSupportedChannel().maxVal; - encoderInfos_.channelMinVal = codec->GetSupportedChannel().minVal; - queryFlag = true; - } - - for (auto codec : avCodecList->GetAudioDecoderCaps()) { - if (codec == nullptr || codec->GetCodecInfo() == nullptr || codec->GetCodecInfo()->GetName() != AVENC_AAC) { - continue; - } - decoderInfos_.sampleRates = codec->GetSupportedSampleRates(); - decoderInfos_.formats = codec->GetSupportedFormats(); - decoderInfos_.channelMaxVal = codec->GetSupportedChannel().maxVal; - decoderInfos_.channelMinVal = codec->GetSupportedChannel().minVal; - queryFlag = true; - } - - if (!queryFlag) { - DHLOGE("Failed to query the codec information."); - return ERR_DH_AUDIO_FAILED; - } - return DH_SUCCESS; -} int32_t DAudioHandler::QueryAudioInfo() { DHLOGD("Start to query codec information."); - audioInfos_.sampleRates = OHOS::AudioStandard::AudioCapturer::GetSupportedSamplingRates(); - audioInfos_.formats = OHOS::AudioStandard::AudioCapturer::GetSupportedFormats(); - audioInfos_.channels = OHOS::AudioStandard::AudioCapturer::GetSupportedChannels(); + micInfos_.sampleRates = OHOS::AudioStandard::AudioCapturer::GetSupportedSamplingRates(); + micInfos_.formats = OHOS::AudioStandard::AudioCapturer::GetSupportedFormats(); + micInfos_.channels = OHOS::AudioStandard::AudioCapturer::GetSupportedChannels(); + spkInfos_.sampleRates = OHOS::AudioStandard::AudioRenderer::GetSupportedSamplingRates(); + spkInfos_.formats = OHOS::AudioStandard::AudioRenderer::GetSupportedFormats(); + spkInfos_.channels = OHOS::AudioStandard::AudioRenderer::GetSupportedChannels(); return DH_SUCCESS; } -void DAudioHandler::GetSupportAudioInfo(AudioInfo &audioInfos, CoderInfo &encoderInfos, - CoderInfo &decoderInfos) -{ - for (auto iter = audioInfos.sampleRates.begin(); iter != audioInfos.sampleRates.end(); iter++) { - if (std::find(encoderInfos.sampleRates.begin(), encoderInfos.sampleRates.end(), *iter) != - encoderInfos.sampleRates.end()) { - micInfos_.sampleRates.push_back(*iter); - } - if (std::find(decoderInfos.sampleRates.begin(), decoderInfos.sampleRates.end(), *iter) != - decoderInfos.sampleRates.end()) { - spkInfos_.sampleRates.push_back(*iter); - } - } - - for (auto iter = audioInfos.formats.begin(); iter != audioInfos.formats.end(); iter++) { - if (std::find(encoderInfos.formats.begin(), encoderInfos.formats.end(), *iter) != encoderInfos.formats.end()) { - micInfos_.formats.push_back(*iter); - } - if (std::find(decoderInfos.formats.begin(), decoderInfos.formats.end(), *iter) != decoderInfos.formats.end()) { - spkInfos_.formats.push_back(*iter); - } - } - - for (auto iter = audioInfos.channels.begin(); iter != audioInfos.channels.end(); iter++) { - if (*iter <= encoderInfos.channelMaxVal && *iter >= encoderInfos.channelMinVal) { - micInfos_.channels.push_back(*iter); - } - if (*iter <= decoderInfos.channelMaxVal && *iter >= decoderInfos.channelMinVal) { - spkInfos_.channels.push_back(*iter); - } - } - if (micInfos_.sampleRates.empty()) { - micInfos_.sampleRates.push_back(SAMPLE_RATE_DEFAULT); - } - if (spkInfos_.sampleRates.empty()) { - spkInfos_.sampleRates.push_back(SAMPLE_RATE_DEFAULT); - } - if (micInfos_.channels.empty()) { - micInfos_.channels.push_back(CHANNEL_COUNT_DEFAULT); - } - if (spkInfos_.channels.empty()) { - spkInfos_.channels.push_back(CHANNEL_COUNT_DEFAULT); - } - if (micInfos_.formats.empty()) { - micInfos_.formats.push_back(SAMPLE_FORMAT_DEFAULT); - } - if (spkInfos_.formats.empty()) { - spkInfos_.formats.push_back(SAMPLE_FORMAT_DEFAULT); - } -} - std::map DAudioHandler::QueryExtraInfo() { DHLOGD("Query extra information"); diff --git a/audiohandler/test/unittest/src/daudio_handler_test.cpp b/audiohandler/test/unittest/src/daudio_handler_test.cpp index 04c547b3..53fa86d2 100644 --- a/audiohandler/test/unittest/src/daudio_handler_test.cpp +++ b/audiohandler/test/unittest/src/daudio_handler_test.cpp @@ -42,18 +42,6 @@ HWTEST_F(DAudioHandlerTest, Initialize_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, actual); } -/** - * @tc.name: QueryCodecInfo_001 - * @tc.desc: Verify the QueryCodecInfo function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioHandlerTest, QueryCodecInfo_001, TestSize.Level1) -{ - int32_t actual = DAudioHandler::GetInstance().QueryCodecInfo(); - EXPECT_EQ(DH_SUCCESS, actual); -} - /** * @tc.name: QueryAudioInfo_001 * @tc.desc: Verify the QueryAudioInfo function. diff --git a/common/dfx_utils/test/unittest/BUILD.gn b/common/dfx_utils/test/unittest/BUILD.gn index 38013170..2c17792b 100644 --- a/common/dfx_utils/test/unittest/BUILD.gn +++ b/common/dfx_utils/test/unittest/BUILD.gn @@ -49,7 +49,6 @@ config("module_private_config") { "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", "${mediastandardfwk_path}/audiomanager/include", ] } @@ -72,6 +71,7 @@ ohos_unittest("DAudioDfxTest") { external_deps = [ "audio_framework:audio_capturer", + "audio_framework:audio_renderer", "c_utils:utils", "dsoftbus:softbus_client", "hisysevent:libhisysevent", diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp index 537aafad..5c0eaa22 100644 --- a/services/audiomanager/managersource/src/dmic_dev.cpp +++ b/services/audiomanager/managersource/src/dmic_dev.cpp @@ -56,7 +56,7 @@ void DMicDev::OnEngineTransMessage(const std::shared_ptr &messag void DMicDev::OnEngineTransDataAvailable(const std::shared_ptr &audioData) { - DHLOGI("On Engine Data available"); + DHLOGD("On Engine Data available"); OnDecodeTransDataDone(audioData); } diff --git a/services/audiomanager/servicesource/BUILD.gn b/services/audiomanager/servicesource/BUILD.gn index c7d2fb51..1d0ccaa5 100755 --- a/services/audiomanager/servicesource/BUILD.gn +++ b/services/audiomanager/servicesource/BUILD.gn @@ -34,6 +34,7 @@ ohos_shared_library("distributed_audio_source") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", "${mediastandardfwk_path}/audiomanager/include", + "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ diff --git a/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn index 9df9fde0..0fad8c76 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn @@ -38,6 +38,7 @@ ohos_fuzztest("SourceServiceConfigDistributedHardwareFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", + "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ diff --git a/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn index 65270fd9..3a13ac28 100644 --- a/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn @@ -39,6 +39,7 @@ ohos_fuzztest("SourceServiceDAudioNotifyFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", + "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ diff --git a/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn index b5dd2fdf..30a06518 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn @@ -39,6 +39,7 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", + "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ diff --git a/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn index 1601f4a8..e4053477 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn @@ -38,6 +38,7 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", + "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ diff --git a/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn index 5804e350..e00990fb 100644 --- a/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn @@ -39,6 +39,7 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", + "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ diff --git a/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn index cb841a09..f05d0ce3 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn @@ -38,6 +38,7 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", + "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ diff --git a/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp b/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp index a311d5f1..5f0de401 100644 --- a/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp +++ b/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp @@ -126,7 +126,7 @@ void AVTransReceiverTransport::OnEngineMessage(const std::shared_ptr &buffer) { - DHLOGI("On data availabled."); + DHLOGD("On data availabled."); CHECK_NULL_VOID(buffer); auto bufferData = buffer->GetBufferData(0); std::shared_ptr audioData = std::make_shared(bufferData->GetSize()); -- Gitee From 3a4a6012067540963566cb4bdca13d8ff523f572 Mon Sep 17 00:00:00 2001 From: byndyx Date: Mon, 26 Feb 2024 20:03:17 +0800 Subject: [PATCH 2/2] modify handler 2 Signed-off-by: byndyx --- audiohandler/include/daudio_handler.h | 1 + audiohandler/test/unittest/BUILD.gn | 5 ++++- common/dfx_utils/test/unittest/BUILD.gn | 1 + services/audiomanager/servicesource/BUILD.gn | 2 +- .../sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn | 2 +- .../sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- 10 files changed, 13 insertions(+), 8 deletions(-) diff --git a/audiohandler/include/daudio_handler.h b/audiohandler/include/daudio_handler.h index dcb63aec..e93aab70 100644 --- a/audiohandler/include/daudio_handler.h +++ b/audiohandler/include/daudio_handler.h @@ -23,6 +23,7 @@ #include "audio_param.h" #include "audio_capturer.h" #include "audio_info.h" +#include "audio_renderer.h" namespace OHOS { namespace DistributedHardware { diff --git a/audiohandler/test/unittest/BUILD.gn b/audiohandler/test/unittest/BUILD.gn index c250a8da..2c791831 100644 --- a/audiohandler/test/unittest/BUILD.gn +++ b/audiohandler/test/unittest/BUILD.gn @@ -50,7 +50,10 @@ ohos_unittest("AudioHandlerTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "audio_framework:audio_renderer", + "c_utils:utils", + ] } group("audio_handler_test") { diff --git a/common/dfx_utils/test/unittest/BUILD.gn b/common/dfx_utils/test/unittest/BUILD.gn index 2c17792b..35841816 100644 --- a/common/dfx_utils/test/unittest/BUILD.gn +++ b/common/dfx_utils/test/unittest/BUILD.gn @@ -49,6 +49,7 @@ config("module_private_config") { "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", + "${mediastandardfwk_path}/audiorenderer/include", "${mediastandardfwk_path}/audiomanager/include", ] } diff --git a/services/audiomanager/servicesource/BUILD.gn b/services/audiomanager/servicesource/BUILD.gn index 1d0ccaa5..b9b88976 100755 --- a/services/audiomanager/servicesource/BUILD.gn +++ b/services/audiomanager/servicesource/BUILD.gn @@ -34,7 +34,6 @@ ohos_shared_library("distributed_audio_source") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiocommon/include", "${mediastandardfwk_path}/audiomanager/include", - "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ @@ -93,6 +92,7 @@ ohos_shared_library("distributed_audio_source") { external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", + "audio_framework:audio_renderer", "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", diff --git a/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn index 0fad8c76..7d015093 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceconfigdistributedhardware_fuzzer/BUILD.gn @@ -38,7 +38,6 @@ ohos_fuzztest("SourceServiceConfigDistributedHardwareFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ @@ -61,6 +60,7 @@ ohos_fuzztest("SourceServiceConfigDistributedHardwareFuzzTest") { ] external_deps = [ + "audio_framework:audio_renderer", "c_utils:utils", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn index 3a13ac28..41bbfc6a 100644 --- a/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceservicedaudionotify_fuzzer/BUILD.gn @@ -39,7 +39,6 @@ ohos_fuzztest("SourceServiceDAudioNotifyFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ @@ -62,6 +61,7 @@ ohos_fuzztest("SourceServiceDAudioNotifyFuzzTest") { ] external_deps = [ + "audio_framework:audio_renderer", "c_utils:utils", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn index 30a06518..a6b8aa13 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceinitsource_fuzzer/BUILD.gn @@ -39,7 +39,6 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ @@ -64,6 +63,7 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { ] external_deps = [ + "audio_framework:audio_renderer", "c_utils:utils", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn index e4053477..c1cd645c 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn @@ -38,7 +38,6 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ @@ -61,6 +60,7 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { ] external_deps = [ + "audio_framework:audio_renderer", "c_utils:utils", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn index e00990fb..c9288ccf 100644 --- a/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceservicereleasesource_fuzzer/BUILD.gn @@ -39,7 +39,6 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ @@ -62,6 +61,7 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { ] external_deps = [ + "audio_framework:audio_renderer", "c_utils:utils", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn b/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn index f05d0ce3..6828a282 100644 --- a/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/services/audiomanager/test/fuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn @@ -38,7 +38,6 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { "${mediastandardfwk_path}/audiocapturer/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiocommon/include", - "${mediastandardfwk_path}/audiorenderer/include", ] include_dirs += [ @@ -61,6 +60,7 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { ] external_deps = [ + "audio_framework:audio_renderer", "c_utils:utils", "ipc:ipc_core", "safwk:system_ability_fwk", -- Gitee