From 61e9ea4af6f3d2c5011cb3cae18e12a6d25745d7 Mon Sep 17 00:00:00 2001 From: renguang1116 Date: Sat, 17 Jun 2023 14:55:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E9=9F=B3=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E7=BB=84=E4=BB=B6=E3=80=91=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=AE=A1=E7=90=86=E6=A1=86=E6=9E=B6=E6=96=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B4=E6=96=87=E4=BB=B6=E5=BC=95=E7=94=A8?= =?UTF-8?q?=20Signed-off-by:=20renguang1116=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- distributedscreen.gni | 1 + services/common/test/unittest/utils/BUILD.gn | 1 + services/screenservice/sinkservice/BUILD.gn | 1 + services/screenservice/sourceservice/BUILD.gn | 1 + services/screentransport/screensinktrans/BUILD.gn | 1 + services/screentransport/screensourcetrans/BUILD.gn | 1 + 6 files changed, 6 insertions(+) diff --git a/distributedscreen.gni b/distributedscreen.gni index 4ba4d1d9..a36a7301 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 6ac2f2da..7134be76 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 e12d77b9..a1f26f8c 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/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index b27cdf1c..2073703b 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/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 0d57fdf6..2182c769 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 f01fede9..cb76f770 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", -- Gitee From bdaea42c5dd234c4fea7b3d472a9b08085861898 Mon Sep 17 00:00:00 2001 From: renguang1116 Date: Sat, 17 Jun 2023 15:04:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E9=9F=B3=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E7=BB=84=E4=BB=B6=E3=80=91=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=AE=A1=E7=90=86=E6=A1=86=E6=9E=B6=E6=96=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B4=E6=96=87=E4=BB=B6=E5=BC=95=E7=94=A8?= =?UTF-8?q?=20Signed-off-by:=20renguang1116=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screenregionmgr/2.0/include/av_receiver_engine_adpater.h | 2 +- .../screenregionmgr/2.0/src/av_receiver_engine_adpater.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b995223e..b8869971 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 77959add..f3e6710b 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); -- Gitee From a926d16c96b0c762304048f7f92516f5cdec60b5 Mon Sep 17 00:00:00 2001 From: renguang1116 Date: Tue, 20 Jun 2023 11:26:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E9=9F=B3=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E7=BB=84=E4=BB=B6=E3=80=91=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=AE=A1=E7=90=86=E6=A1=86=E6=9E=B6=E6=96=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B4=E6=96=87=E4=BB=B6=E5=BC=95=E7=94=A8?= =?UTF-8?q?=20Signed-off-by:=20renguang1116=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn | 1 + .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 1 + 2 files changed, 2 insertions(+) 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 a178c781..ae9e0976 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/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 6fe62d70..4b31c1eb 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", -- Gitee From 70f3ba699e23e552bc0e18d722d36e572ade254b Mon Sep 17 00:00:00 2001 From: renguang1116 Date: Tue, 20 Jun 2023 12:11:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E9=9F=B3=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E7=BB=84=E4=BB=B6=E3=80=91=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=AE=A1=E7=90=86=E6=A1=86=E6=9E=B6=E6=96=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B4=E6=96=87=E4=BB=B6=E5=BC=95=E7=94=A8?= =?UTF-8?q?=20Signed-off-by:=20renguang1116=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/unittest/sinkservice/screenregionmgr/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 8c5a3bd3..188fa070 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", -- Gitee