From bdd7a3309964289a72609fb0873ef3a1ab45e22b Mon Sep 17 00:00:00 2001 From: yangli Date: Wed, 21 Jun 2023 10:37:47 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=8A=A0gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- services/screenservice/sinkservice/BUILD.gn | 6 ++++++ .../dscreenservice/include/dscreen_sink_service.h | 3 ++- .../dscreenservice/src/dscreen_sink_service.cpp | 1 + .../2.0/include/av_receiver_engine_adapter.h | 2 +- .../2.0/src/av_receiver_engine_adapter.cpp | 4 ++-- .../screenregionmgr/2.0/src/screenregion.cpp | 2 +- services/screenservice/sourceservice/BUILD.gn | 15 ++++++++++++++- .../dscreenmgr/2.0/include/dscreen.h | 2 +- .../include/dscreen_source_service.h | 2 +- 9 files changed, 29 insertions(+), 8 deletions(-) diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index a1f26f8c..ba29768b 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -22,6 +22,7 @@ ohos_shared_library("distributed_screen_sink") { "//third_party/json/include", "${fwk_common_path}/utils/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", + "${av_transport_path}/interface", ] include_dirs += [ @@ -51,10 +52,15 @@ ohos_shared_library("distributed_screen_sink") { "./dscreenservice/src/dscreen_sink_stub.cpp", "./screenregionmgr/1.0/src/screenregion.cpp", "./screenregionmgr/1.0/src/screenregionmgr.cpp", + "./screenregionmgr/2.0/src/screenregion.cpp", + "./screenregionmgr/2.0/src/screenregionmgr.cpp", + "./screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp", ] deps = [ + "${av_transport_path}/av_trans_engine/av_receiver:distributed_av_receiver", "${common_path}:distributed_screen_utils", + "${graphicstandard_path}/frameworks/surface:surface", "${services_path}/screenclient:distributed_screen_client", "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", ] diff --git a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h index 0039543d..876a964f 100644 --- a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h +++ b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h @@ -21,6 +21,7 @@ #include "dscreen_sink_stub.h" #include "1.0/include/screenregionmgr.h" +#include "2.0/include/screenregionmgr.h" namespace OHOS { namespace DistributedHardware { @@ -43,7 +44,7 @@ protected: DISALLOW_COPY_AND_MOVE(DScreenSinkService); private: - std::string version_ = "3.0"; + std::string version_ = "2.0"; bool registerToService_ = false; bool Init(); diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp index 23f5708a..a288b9d8 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp @@ -15,6 +15,7 @@ #include "dscreen_sink_service.h" #include "1.0/include/screenregionmgr.h" +#include "2.0/include/screenregionmgr.h" #include "if_system_ability_manager.h" #include "ipc_skeleton.h" diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter.h b/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter.h index a8bd2351..15d8e941 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter.h +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter.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 OnDataAvailable(const std::shared_ptr &buffer) override; + int32_t OnDataAvaliable(const std::shared_ptr &buffer) override; private: std::atomic initialized_ {false}; diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp index f3e6710b..98fb6e15 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "2.0/include/av_receiver_engine_adpater.h" +#include "2.0/include/av_receiver_engine_adapter.h" #include #include @@ -151,7 +151,7 @@ int32_t AVTransReceiverAdapter::OnMessageReceived(const std::shared_ptr &buffer) +int32_t AVTransReceiverAdapter::OnDataAvaliable(const std::shared_ptr &buffer) { if (adapterCallback_ != nullptr) { adapterCallback_->OnEngineDataDone(buffer); diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp index 10b9f002..aff647da 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp @@ -325,7 +325,7 @@ void ScreenRegion::OnEngineDataDone(const std::shared_ptr &buffer windowSurface_->CancelBuffer(wsBuffer); return; } - SetWSBuffer(wsBuffer, buffer); + GetWSBuffer(wsBuffer, buffer); BufferFlushConfig flushConfig = { {0, 0, wsBuffer->GetWidth(), wsBuffer->GetHeight()}, 0}; surfaceErr = windowSurface_->FlushBuffer(wsBuffer, -1, flushConfig); diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 2073703b..12c84022 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -18,10 +18,12 @@ import( ohos_shared_library("distributed_screen_source") { include_dirs = [ - "${av_transport_path}/common/include", "//third_party/json/include", "//third_party/libjpeg-turbo", + "//utils/system/safwk/native/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", + "${av_transport_path}/interface", + "${av_transport_path}/common/include", "${fwk_common_path}/utils/include", ] @@ -43,6 +45,10 @@ ohos_shared_library("distributed_screen_source") { "${services_path}/screentransport/screensourcetrans/include", "${services_path}/common/imageJpeg/include", "${services_path}/common/decision_center/include", + "//drivers/peripheral/display/interfaces/include", + "//drivers/peripheral/base", + "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", + "//foundation/graphic/graphic_2d/utils/buffer_handle/export", ] sources = [ @@ -54,13 +60,20 @@ ohos_shared_library("distributed_screen_source") { "./dscreenmgr/1.0/src/dscreen.cpp", "./dscreenmgr/1.0/src/dscreen_manager.cpp", "./dscreenmgr/common/src/screen_manager_adapter.cpp", + "./dscreenmgr/2.0/src/dscreen.cpp", + "./dscreenmgr/2.0/src/dscreen_manager.cpp", + "./dscreenmgr/2.0/src/av_sender_engine_adapter.cpp", "./dscreenservice/src/callback/dscreen_source_callback_proxy.cpp", "./dscreenservice/src/dscreen_source_service.cpp", "./dscreenservice/src/dscreen_source_stub.cpp", ] deps = [ + "${av_transport_path}/av_trans_engine/av_sender:distributed_av_sender", "${common_path}:distributed_screen_utils", + "${graphicstandard_path}/frameworks/surface:surface", + + "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", ] diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h b/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h index b4d20b3f..9d0c3d77 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h @@ -25,7 +25,7 @@ #include "iconsumer_surface.h" #include "dscreen_constants.h" #include "video_param.h" -#include "av_sender_engine_adpater.h" +#include "av_sender_engine_adapter.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h index 2e60efff..163a8b05 100644 --- a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h +++ b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h @@ -20,7 +20,7 @@ #include "ipc_object_stub.h" #include "1.0/include/dscreen_manager.h" - +#include "2.0/include/dscreen_manager.h" #include "dscreen_source_stub.h" #include "idscreen_source_callback.h" -- Gitee From 958f587a1ba5ba4ab732662b301c7a7c865b131d Mon Sep 17 00:00:00 2001 From: yangli Date: Wed, 21 Jun 2023 11:11:31 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=8A=A0gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- .../sinkservice/screenregionmgr/2.0/include/screenregion.h | 2 +- .../sinkservice/screenregionmgr/2.0/src/screenregion.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/include/screenregion.h b/services/screenservice/sinkservice/screenregionmgr/2.0/include/screenregion.h index 61f6fa1f..fba417d2 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/include/screenregion.h +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/include/screenregion.h @@ -38,7 +38,7 @@ public: void OnEngineEvent(DScreenEventType event, const std::string &content) override; void OnEngineMessage(const std::shared_ptr &message) override; void OnEngineDataDone(const std::shared_ptr &buffer) override; - void GetWSBuffer(sptr::SurfaceBuffer &wsBuffer, const std::shared_ptr &buffer); + void GetWSBuffer(sptr &wsBuffer, const std::shared_ptr &buffer); int32_t Release(); int32_t InitReceiverEngine(IAVEngineProvider *providerPtr); diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp index aff647da..3dc78830 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp @@ -259,7 +259,7 @@ void ScreenRegion::OnEngineMessage(const std::shared_ptr &messag } } -void ScreenRegion::GetWSBuffer(sptr::SurfaceBuffer &wsBuffer, const std::shared_ptr &buffer) +void ScreenRegion::GetWSBuffer(sptr &wsBuffer, const std::shared_ptr &buffer) { auto bufferData = buffer->GetBufferData(0); auto bufferAddr = bufferData->GetAddress(); -- Gitee From b7f625ec8dcb35b644938e7d909a6ab0f5810934 Mon Sep 17 00:00:00 2001 From: yangli Date: Wed, 21 Jun 2023 12:56:14 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=8A=A0gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- services/screenservice/sourceservice/BUILD.gn | 5 ----- 1 file changed, 5 deletions(-) diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 12c84022..cccd7c46 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -20,7 +20,6 @@ ohos_shared_library("distributed_screen_source") { include_dirs = [ "//third_party/json/include", "//third_party/libjpeg-turbo", - "//utils/system/safwk/native/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", "${av_transport_path}/interface", "${av_transport_path}/common/include", @@ -45,10 +44,6 @@ ohos_shared_library("distributed_screen_source") { "${services_path}/screentransport/screensourcetrans/include", "${services_path}/common/imageJpeg/include", "${services_path}/common/decision_center/include", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", ] sources = [ -- Gitee From fbd1e7fbc599c9d6778b2c6af075b9184804d0fd Mon Sep 17 00:00:00 2001 From: yangli Date: Wed, 21 Jun 2023 14:23:58 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=8A=A0gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- services/screenservice/sinkservice/BUILD.gn | 2 +- services/screenservice/sourceservice/BUILD.gn | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index ba29768b..53fe99a5 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -52,9 +52,9 @@ ohos_shared_library("distributed_screen_sink") { "./dscreenservice/src/dscreen_sink_stub.cpp", "./screenregionmgr/1.0/src/screenregion.cpp", "./screenregionmgr/1.0/src/screenregionmgr.cpp", + "./screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp", "./screenregionmgr/2.0/src/screenregion.cpp", "./screenregionmgr/2.0/src/screenregionmgr.cpp", - "./screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp", ] deps = [ diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index cccd7c46..abccc6b7 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -54,10 +54,10 @@ ohos_shared_library("distributed_screen_source") { "${services_path}/common/utils/src/video_param.cpp", "./dscreenmgr/1.0/src/dscreen.cpp", "./dscreenmgr/1.0/src/dscreen_manager.cpp", - "./dscreenmgr/common/src/screen_manager_adapter.cpp", + "./dscreenmgr/2.0/src/av_sender_engine_adapter.cpp", "./dscreenmgr/2.0/src/dscreen.cpp", "./dscreenmgr/2.0/src/dscreen_manager.cpp", - "./dscreenmgr/2.0/src/av_sender_engine_adapter.cpp", + "./dscreenmgr/common/src/screen_manager_adapter.cpp", "./dscreenservice/src/callback/dscreen_source_callback_proxy.cpp", "./dscreenservice/src/dscreen_source_service.cpp", "./dscreenservice/src/dscreen_source_stub.cpp", @@ -67,8 +67,6 @@ ohos_shared_library("distributed_screen_source") { "${av_transport_path}/av_trans_engine/av_sender:distributed_av_sender", "${common_path}:distributed_screen_utils", "${graphicstandard_path}/frameworks/surface:surface", - - "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", ] -- Gitee From 3e13532dc05fd53eeaef00cadb0e2189a418abf1 Mon Sep 17 00:00:00 2001 From: yangli Date: Wed, 21 Jun 2023 14:33:00 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=8A=A0gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index ef4881fe..f3293ae0 100644 --- a/bundle.json +++ b/bundle.json @@ -45,7 +45,7 @@ ], "third_party":[ "json", - "libjpeg_turbo" + "turbojpeg_static" ] }, "build":{ -- Gitee From 5de975915109260ab50821abd04105cf0a3fb11c Mon Sep 17 00:00:00 2001 From: yangli Date: Wed, 21 Jun 2023 15:58:51 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=8A=A0gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- services/screenservice/sinkservice/BUILD.gn | 6 ------ .../dscreenservice/include/dscreen_sink_service.h | 1 - .../sinkservice/dscreenservice/src/dscreen_sink_service.cpp | 3 --- services/screenservice/sourceservice/BUILD.gn | 6 ------ .../dscreenservice/include/dscreen_source_service.h | 1 - 5 files changed, 17 deletions(-) diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 53fe99a5..5c10eed5 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -18,11 +18,9 @@ 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", - "${av_transport_path}/interface", ] include_dirs += [ @@ -52,13 +50,9 @@ ohos_shared_library("distributed_screen_sink") { "./dscreenservice/src/dscreen_sink_stub.cpp", "./screenregionmgr/1.0/src/screenregion.cpp", "./screenregionmgr/1.0/src/screenregionmgr.cpp", - "./screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp", - "./screenregionmgr/2.0/src/screenregion.cpp", - "./screenregionmgr/2.0/src/screenregionmgr.cpp", ] deps = [ - "${av_transport_path}/av_trans_engine/av_receiver:distributed_av_receiver", "${common_path}:distributed_screen_utils", "${graphicstandard_path}/frameworks/surface:surface", "${services_path}/screenclient:distributed_screen_client", diff --git a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h index 876a964f..21f36d33 100644 --- a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h +++ b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h @@ -21,7 +21,6 @@ #include "dscreen_sink_stub.h" #include "1.0/include/screenregionmgr.h" -#include "2.0/include/screenregionmgr.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp index a288b9d8..8396dae9 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp @@ -14,9 +14,6 @@ */ #include "dscreen_sink_service.h" -#include "1.0/include/screenregionmgr.h" -#include "2.0/include/screenregionmgr.h" - #include "if_system_ability_manager.h" #include "ipc_skeleton.h" #include "ipc_types.h" diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index abccc6b7..872a71eb 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -21,8 +21,6 @@ ohos_shared_library("distributed_screen_source") { "//third_party/json/include", "//third_party/libjpeg-turbo", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", - "${av_transport_path}/interface", - "${av_transport_path}/common/include", "${fwk_common_path}/utils/include", ] @@ -54,9 +52,6 @@ ohos_shared_library("distributed_screen_source") { "${services_path}/common/utils/src/video_param.cpp", "./dscreenmgr/1.0/src/dscreen.cpp", "./dscreenmgr/1.0/src/dscreen_manager.cpp", - "./dscreenmgr/2.0/src/av_sender_engine_adapter.cpp", - "./dscreenmgr/2.0/src/dscreen.cpp", - "./dscreenmgr/2.0/src/dscreen_manager.cpp", "./dscreenmgr/common/src/screen_manager_adapter.cpp", "./dscreenservice/src/callback/dscreen_source_callback_proxy.cpp", "./dscreenservice/src/dscreen_source_service.cpp", @@ -64,7 +59,6 @@ ohos_shared_library("distributed_screen_source") { ] deps = [ - "${av_transport_path}/av_trans_engine/av_sender:distributed_av_sender", "${common_path}:distributed_screen_utils", "${graphicstandard_path}/frameworks/surface:surface", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", diff --git a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h index 163a8b05..3fe2abc2 100644 --- a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h +++ b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h @@ -20,7 +20,6 @@ #include "ipc_object_stub.h" #include "1.0/include/dscreen_manager.h" -#include "2.0/include/dscreen_manager.h" #include "dscreen_source_stub.h" #include "idscreen_source_callback.h" -- Gitee From 0bcfa98a7012d57bafacd46edb9291145aa15b82 Mon Sep 17 00:00:00 2001 From: yangli Date: Wed, 21 Jun 2023 17:33:38 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=8A=A0gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- services/screenservice/sinkservice/BUILD.gn | 1 + services/screenservice/sourceservice/BUILD.gn | 1 + 2 files changed, 2 insertions(+) diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 5c10eed5..6036e236 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 872a71eb..9089840c 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", -- Gitee From 343eae2ef7e6ace34f4a8644bf10529598f1acce Mon Sep 17 00:00:00 2001 From: yangli Date: Wed, 21 Jun 2023 18:18:42 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=8A=A0gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- services/screenservice/sourceservice/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 9089840c..2073703b 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -61,7 +61,6 @@ ohos_shared_library("distributed_screen_source") { deps = [ "${common_path}:distributed_screen_utils", - "${graphicstandard_path}/frameworks/surface:surface", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", ] -- Gitee From 06608939834b0ac86f689fec1b3a3959ec6bfe56 Mon Sep 17 00:00:00 2001 From: yangli Date: Sat, 24 Jun 2023 11:18:19 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=8A=A0gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index f3293ae0..9372ea8c 100644 --- a/bundle.json +++ b/bundle.json @@ -45,7 +45,7 @@ ], "third_party":[ "json", - "turbojpeg_static" + "turbojpeg_turbo" ] }, "build":{ -- Gitee From a2e53dfc45a5ded46a826f165968fee80ec37635 Mon Sep 17 00:00:00 2001 From: yangli Date: Sat, 24 Jun 2023 11:21:57 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8A=A0gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 9372ea8c..ef4881fe 100644 --- a/bundle.json +++ b/bundle.json @@ -45,7 +45,7 @@ ], "third_party":[ "json", - "turbojpeg_turbo" + "libjpeg_turbo" ] }, "build":{ -- Gitee From bdeed5a989aecfaf178f0a2f79752a7a68bde337 Mon Sep 17 00:00:00 2001 From: yangli Date: Sat, 24 Jun 2023 14:29:16 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- .../screenregionmgr/2.0/include/av_receiver_engine_adapter.h | 2 +- .../screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter.h b/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter.h index 15d8e941..a8bd2351 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter.h +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/include/av_receiver_engine_adapter.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_adapter.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp index 98fb6e15..5f01af00 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.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