diff --git a/distributedscreen.gni b/distributedscreen.gni index 4ba4d1d9fd1920ddc75a70627092b5297c895855..a36a7301a2427e3cebb1d9fc0e8de15c9089d495 100644 --- a/distributedscreen.gni +++ b/distributedscreen.gni @@ -26,6 +26,7 @@ fwk_utils_path = "${distributedhardwarefwk_path}/utils" fwk_common_path = "${distributedhardwarefwk_path}/common" fwk_services_path = "${distributedhardwarefwk_path}/services" fwk_interfaces_path = "${distributedhardwarefwk_path}/interfaces" +av_transport_path = "${distributedhardwarefwk_path}/av_transport" ipc_interfaces_path = "${ipc_path}/interfaces" build_flags = [ "-Werror" ] diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index 6ac2f2da10893169de1e8acb61a9d3ed4a255426..7134be765a3bd507280ee70f2a121164ada97ca8 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -21,6 +21,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "${av_transport_path}/common/include", "//third_party/json/include", "${fwk_common_path}/utils/include", "${fwk_common_path}/log/include", diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index e12d77b9b44f1a918161a79740b1a0dc6034cc53..a1f26f8cfa4a8d25e6cc35b9916b1147248e74e0 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -18,6 +18,7 @@ import( ohos_shared_library("distributed_screen_sink") { include_dirs = [ + "${av_transport_path}/common/include", "//third_party/json/include", "${fwk_common_path}/utils/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adpater.h b/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adpater.h index b995223e04a290ee688529e0d717be8dae5584a5..b8869971b4f8b2e79d831f6432eace42d709be1e 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adpater.h +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adpater.h @@ -54,7 +54,7 @@ public: // interfaces from IAVReceiverEngineCallback int32_t OnReceiverEvent(const AVTransEvent& event) override; int32_t OnMessageReceived(const std::shared_ptr &message) override; - int32_t OnDataAvaliable(const std::shared_ptr &buffer) override; + int32_t OnDataAvailable(const std::shared_ptr &buffer) override; private: std::atomic initialized_ {false}; diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adpater.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adpater.cpp index 77959add7d3fbda7f471ccd36b21361c19534b35..f3e6710b159829cb7b7adc4d95d2fb23c701516c 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adpater.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adpater.cpp @@ -151,7 +151,7 @@ int32_t AVTransReceiverAdapter::OnMessageReceived(const std::shared_ptr &buffer) +int32_t AVTransReceiverAdapter::OnDataAvailable(const std::shared_ptr &buffer) { if (adapterCallback_ != nullptr) { adapterCallback_->OnEngineDataDone(buffer); diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index b27cdf1ca0c904a9e167593e524caaf544d01c43..2073703b56826dafa033f56191dc5122927edcb2 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -18,6 +18,7 @@ import( ohos_shared_library("distributed_screen_source") { include_dirs = [ + "${av_transport_path}/common/include", "//third_party/json/include", "//third_party/libjpeg-turbo", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", diff --git a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn index a178c78166809c44b04a93580d31e1d659f0b5af..ae9e0976578dfa3e66fb8ea89eeb193cc92b07dd 100644 --- a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn @@ -23,6 +23,7 @@ ohos_fuzztest("OnChangeFuzzTest") { fuzz_config_file = "${services_path}/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer" include_dirs = [ + "${av_transport_path}/common/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", "${fwk_common_path}/utils/include", "${windowmanager_path}/interfaces/innerkits/wm", diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 8c5a3bd32c4a6f8261e6790d63f06011aaa9baa5..188fa070d5aee33b1ffc56e8b0b9e9b482398132 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -20,6 +20,7 @@ module_out_path = "distributed_screen/dscreen_sink_service_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "${av_transport_path}/common/include", "//third_party/json/include", "${fwk_common_path}/utils/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 6fe62d70444d1edf78df3dae196587558922a3b3..4b31c1eb8aaa846c8b639797a196aa2918b654f5 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -20,6 +20,7 @@ module_out_path = "distributed_screen/DscreenMgrTest" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "${av_transport_path}/common/include", "//third_party/json/include", "${driver_path}/interfaces/include", "${graphicstandard_path}/interfaces/inner_api/surface", diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 0d57fdf678321efe157c9349781002b0cf9da2b1..2182c7691e1451a5f0aa4cdbc7ad079311d6ba3f 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -18,6 +18,7 @@ import( ohos_shared_library("distributed_screen_sinktrans") { include_dirs = [ + "${av_transport_path}/common/include", "//third_party/json/include", "//third_party/libjpeg", "${fwk_common_path}/utils/include", diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index f01fede9cf32efdd09523646311c1f1cb21d42de..cb76f7708ecd151d80b9523ae23a45a322d506cf 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -18,6 +18,7 @@ import( ohos_shared_library("distributed_screen_sourcetrans") { include_dirs = [ + "${av_transport_path}/common/include", "//third_party/json/include", "//third_party/libjpeg-turbo", "${fwk_common_path}/utils/include",