diff --git a/av_transport/av_trans_engine/av_receiver/BUILD.gn b/av_transport/av_trans_engine/av_receiver/BUILD.gn index 5a0836601f3607be81e26913a783f29a4515916c..de15b15b90cb99483754e5ad5a6f9e3eaf99377b 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 6c632faf301d9d4fba73a600c2d8f651f5a30c64..80033913cb6984305f99288b3026dbc09714ba96 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 ac2dd8a5c25e7837b00b145b37c02f7acabc31bc..d17dafb4a314166ff150796b383c1abca516fcfe 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 5e2751bbb4e1d0f9847d66809e78e36a4e21ae1a..854e34ca658d8fde79cc2843014c05bdf4044b9a 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 445da80bb58379cb5f158cb8ae25ab9615b62d99..4c36a71829ad77ddc1956addd8a37d05faaa8a57 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 eba3b45adef2d636707a575e6adb9a40955e0bb2..507d5c9c92bd974171128e78c6766401ff11a40a 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 fd187f12657ad04982eb3b70d1b9e13d0152bed8..872f7cab278ad5b92a7d0a6b973e758085bb7e01 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",