From cacb039696f8367404b6a7dfb9f75ee30c58a033 Mon Sep 17 00:00:00 2001 From: byndyx Date: Mon, 16 Jun 2025 17:15:21 +0800 Subject: [PATCH] instance Signed-off-by: byndyx --- av_transport/av_trans_engine/av_receiver/BUILD.gn | 1 + .../av_receiver/src/av_audio_receiver_engine_provider.cpp | 5 ----- av_transport/av_trans_engine/av_sender/BUILD.gn | 1 + .../av_sender/src/av_audio_sender_engine_provider.cpp | 5 ----- .../filters/test/av_trans_input_filter_test/BUILD.gn | 1 + .../filters/test/av_trans_output_filter_test/BUILD.gn | 1 + av_transport/framework/BUILD.gn | 2 -- 7 files changed, 4 insertions(+), 12 deletions(-) diff --git a/av_transport/av_trans_engine/av_receiver/BUILD.gn b/av_transport/av_trans_engine/av_receiver/BUILD.gn index 5a083660..de15b15b 100644 --- a/av_transport/av_trans_engine/av_receiver/BUILD.gn +++ b/av_transport/av_trans_engine/av_receiver/BUILD.gn @@ -63,6 +63,7 @@ ohos_shared_library("distributed_av_receiver") { "${common_path}/src/av_trans_meta.cpp", "${common_path}/src/av_trans_utils.cpp", "${common_path}/src/softbus_channel_adapter.cpp", + "${distributed_av_transport_path}/av_trans_engine/filters/av_trans_input/av_trans_bus_input_filter.cpp", "${engine_path}/av_receiver/src/av_audio_receiver_engine.cpp", "${engine_path}/av_receiver/src/av_audio_receiver_engine_provider.cpp", "${engine_path}/av_receiver/src/av_receiver_engine.cpp", diff --git a/av_transport/av_trans_engine/av_receiver/src/av_audio_receiver_engine_provider.cpp b/av_transport/av_trans_engine/av_receiver/src/av_audio_receiver_engine_provider.cpp index 6c632faf..80033913 100644 --- a/av_transport/av_trans_engine/av_receiver/src/av_audio_receiver_engine_provider.cpp +++ b/av_transport/av_trans_engine/av_receiver/src/av_audio_receiver_engine_provider.cpp @@ -25,11 +25,6 @@ namespace DistributedHardware { AVAudioReceiverEngineProvider::AVAudioReceiverEngineProvider(const std::string &ownerName) : ownerName_(ownerName) { AVTRANS_LOGI("AVAudioReceiverEngineProvider ctor."); - sessionName_ = ownerName + "_" + RECEIVER_CONTROL_SESSION_NAME_SUFFIX; - if (ownerName != OWNER_NAME_D_MIC && ownerName != OWNER_NAME_D_VIRMODEM_MIC) { - SoftbusChannelAdapter::GetInstance().CreateChannelServer(TransName2PkgName(ownerName), sessionName_); - SoftbusChannelAdapter::GetInstance().RegisterChannelListener(sessionName_, AV_TRANS_SPECIAL_DEVICE_ID, this); - } } AVAudioReceiverEngineProvider::~AVAudioReceiverEngineProvider() diff --git a/av_transport/av_trans_engine/av_sender/BUILD.gn b/av_transport/av_trans_engine/av_sender/BUILD.gn index ac2dd8a5..d17dafb4 100644 --- a/av_transport/av_trans_engine/av_sender/BUILD.gn +++ b/av_transport/av_trans_engine/av_sender/BUILD.gn @@ -58,6 +58,7 @@ ohos_shared_library("distributed_av_sender") { "${common_path}/src/av_trans_meta.cpp", "${common_path}/src/av_trans_utils.cpp", "${common_path}/src/softbus_channel_adapter.cpp", + "${distributed_av_transport_path}/av_trans_engine/filters/av_trans_output/dsoftbus_output_filter.cpp", "${engine_path}/av_sender/src/av_audio_sender_engine.cpp", "${engine_path}/av_sender/src/av_audio_sender_engine_provider.cpp", "${engine_path}/av_sender/src/av_sender_engine.cpp", diff --git a/av_transport/av_trans_engine/av_sender/src/av_audio_sender_engine_provider.cpp b/av_transport/av_trans_engine/av_sender/src/av_audio_sender_engine_provider.cpp index 5e2751bb..854e34ca 100644 --- a/av_transport/av_trans_engine/av_sender/src/av_audio_sender_engine_provider.cpp +++ b/av_transport/av_trans_engine/av_sender/src/av_audio_sender_engine_provider.cpp @@ -25,11 +25,6 @@ namespace DistributedHardware { AVAudioSenderEngineProvider::AVAudioSenderEngineProvider(const std::string ownerName) : ownerName_(ownerName) { AVTRANS_LOGI("AVAudioSenderEngineProvider ctor."); - sessionName_ = ownerName + "_" + SENDER_CONTROL_SESSION_NAME_SUFFIX; - if (ownerName == OWNER_NAME_D_MIC || ownerName == OWNER_NAME_D_VIRMODEM_MIC) { - SoftbusChannelAdapter::GetInstance().CreateChannelServer(TransName2PkgName(ownerName), sessionName_); - SoftbusChannelAdapter::GetInstance().RegisterChannelListener(sessionName_, AV_TRANS_SPECIAL_DEVICE_ID, this); - } } AVAudioSenderEngineProvider::~AVAudioSenderEngineProvider() diff --git a/av_transport/av_trans_engine/filters/test/av_trans_input_filter_test/BUILD.gn b/av_transport/av_trans_engine/filters/test/av_trans_input_filter_test/BUILD.gn index 445da80b..4c36a718 100644 --- a/av_transport/av_trans_engine/filters/test/av_trans_input_filter_test/BUILD.gn +++ b/av_transport/av_trans_engine/filters/test/av_trans_input_filter_test/BUILD.gn @@ -103,6 +103,7 @@ ohos_unittest("AVTransBusInputFilterTest") { deps = [ "${distributed_av_transport_path}/framework:distributed_av_pipeline_fwk", + "${engine_path}/av_receiver:distributed_av_receiver", ] if (histreamer_compile_part) { diff --git a/av_transport/av_trans_engine/filters/test/av_trans_output_filter_test/BUILD.gn b/av_transport/av_trans_engine/filters/test/av_trans_output_filter_test/BUILD.gn index eba3b45a..507d5c9c 100644 --- a/av_transport/av_trans_engine/filters/test/av_trans_output_filter_test/BUILD.gn +++ b/av_transport/av_trans_engine/filters/test/av_trans_output_filter_test/BUILD.gn @@ -104,6 +104,7 @@ ohos_unittest("AVTransAudioDSoftbusOutputFilterTest") { deps = [ "${distributed_av_transport_path}/framework:distributed_av_pipeline_fwk", + "${engine_path}/av_sender:distributed_av_sender", ] if (histreamer_compile_part) { diff --git a/av_transport/framework/BUILD.gn b/av_transport/framework/BUILD.gn index fd187f12..872f7cab 100644 --- a/av_transport/framework/BUILD.gn +++ b/av_transport/framework/BUILD.gn @@ -52,9 +52,7 @@ ohos_shared_library("distributed_av_pipeline_fwk") { "${distributed_av_transport_path}/av_trans_engine/filters/av_trans_coder/av_trans_audio_decoder_filter.cpp", "${distributed_av_transport_path}/av_trans_engine/filters/av_trans_coder/av_trans_audio_encoder_filter.cpp", "${distributed_av_transport_path}/av_trans_engine/filters/av_trans_input/av_trans_audio_input_filter.cpp", - "${distributed_av_transport_path}/av_trans_engine/filters/av_trans_input/av_trans_bus_input_filter.cpp", "${distributed_av_transport_path}/av_trans_engine/filters/av_trans_output/daudio_output_filter.cpp", - "${distributed_av_transport_path}/av_trans_engine/filters/av_trans_output/dsoftbus_output_filter.cpp", "${distributed_av_transport_path}/framework/filter/src/filter.cpp", "${distributed_av_transport_path}/framework/filter/src/filter_factory.cpp", "${distributed_av_transport_path}/framework/pipeline/src/pipeline.cpp", -- Gitee