From 603fd35e4f57501386ab47948cd954421e59b90d Mon Sep 17 00:00:00 2001 From: yangli Date: Sun, 25 Jun 2023 17:28:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BC=A0=E8=BE=93?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8A=A0gn=E5=92=8C=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= 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 + services/screenservice/sourceservice/BUILD.gn | 6 +++++- .../dscreenservice/include/dscreen_source_service.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 6036e236..cc90f3b9 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -18,10 +18,11 @@ 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", + "${av_transport_path}/common/include", ] include_dirs += [ @@ -51,6 +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/screenregion.cpp", + "./screenregionmgr/2.0/src/screenregionmgr.cpp", + "./screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp", ] deps = [ diff --git a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h index 21f36d33..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 { diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 2073703b..f5fc7507 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -18,10 +18,11 @@ 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", + "${av_transport_path}/interface", + "${av_transport_path}/common/include", "${fwk_common_path}/utils/include", ] @@ -54,6 +55,9 @@ 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", diff --git a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h index 3fe2abc2..163a8b05 100644 --- a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h +++ b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h @@ -20,6 +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 9f4a86f428bed46deb358b73548b4ae641afd98b Mon Sep 17 00:00:00 2001 From: yangli Date: Mon, 26 Jun 2023 10:07:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3fd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- .../screenregionmgr/2.0/src/screenregion.cpp | 6 +++--- .../dscreenmgr/2.0/include/dscreen.h | 2 ++ .../dscreenmgr/2.0/src/dscreen.cpp | 17 ++++++++++++----- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp index 3dc78830..f5359ea0 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp @@ -151,11 +151,11 @@ int32_t ScreenRegion::SetUp(const std::string &content) } std::string codecType; if (videoParam_->GetCodecType() == VIDEO_CODEC_TYPE_VIDEO_H265) { - codecType = MINE_VIDEO_H265; + codecType = MIME_VIDEO_H265; } else if (videoParam_->GetCodecType() == VIDEO_CODEC_TYPE_VIDEO_H264) { - codecType = MINE_VIDEO_H264; + codecType = MIME_VIDEO_H264; } else { - codecType = MINE_VIDEO_RAW; + codecType = MIME_VIDEO_RAW; } std::string pixelFormat; if (videoParam_->GetVideoFormat() == VIDEO_DATA_FORMAT_YUVI420) { diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h b/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h index 9d0c3d77..dc6cb63b 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h @@ -20,6 +20,7 @@ #include #include #include +#include "sync_fence.h" #include "surface.h" #include "iconsumer_surface.h" @@ -128,6 +129,7 @@ private: std::queue> taskQueue_; bool taskThreadRunning_; std::shared_ptr senderAdapter_; + OHOS::sptr syncFence_ = SyncFence::INVALID_FENCE; }; } // namespace V2_0 } // namespace DistributedHardware diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp index 805b96e7..0619f733 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp @@ -285,12 +285,19 @@ void DScreen::ConsumeSurface() return; } sptr surfaceBuffer = nullptr; - int32_t fence = -1; + syncFence_ = SyncFence::INVALID_FENCE; int64_t timestamp = 0; OHOS::Rect damage = {0, 0, 0, 0}; - SurfaceError surfaceErr = consumerSurface_->AcquireBuffer(surfaceBuffer, fence, timestamp, damage); + SurfaceError surfaceErr = consumerSurface_->AcquireBuffer(surfaceBuffer, syncFence_, timestamp, damage); if (surfaceErr != SURFACE_ERROR_OK) { DHLOGE("consumerSurface_ acquire buffer failed, errcode: %d", surfaceErr); + consumerSurface_->ReleaseBuffer(surfaceBuffer, -1); + return; + } + int32_t retcode = syncFence_->Wait(SURFACE_SYNC_FENCE_TIMEOUT); + if (retcode == -ETIME) { + DHLOGE("%s: Sync fence wait timeout, retcode is %." PRId32, retcode); + consumerSurface_->ReleaseBuffer(surfaceBuffer, -1); return; } uint32_t surBufSize = surfaceBuffer->GetSize(); @@ -368,11 +375,11 @@ int32_t DScreen::StopSenderEngine() void DScreen::ChooseParameter(std::string &codecType, std::string &pixelFormat) { if (videoParam_->GetCodecType() == VIDEO_CODEC_TYPE_VIDEO_H265) { - codecType = MINE_VIDEO_H265; + codecType = MIME_VIDEO_H265; } else if (videoParam_->GetCodecType() == VIDEO_CODEC_TYPE_VIDEO_H264) { - codecType = MINE_VIDEO_H264; + codecType = MIME_VIDEO_H264; } else { - codecType = MINE_VIDEO_RAW; + codecType = MIME_VIDEO_RAW; } if (videoParam_->GetVideoFormat() == VIDEO_DATA_FORMAT_YUVI420) { pixelFormat = VIDEO_FORMAT_YUVI420; -- Gitee From 236734151d08e2f9df19dd30cf8f11f66a485989 Mon Sep 17 00:00:00 2001 From: yangli Date: Mon, 26 Jun 2023 10:13:34 +0800 Subject: [PATCH 3/7] =?UTF-8?q?gn=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- services/screenservice/sinkservice/BUILD.gn | 8 ++++---- services/screenservice/sourceservice/BUILD.gn | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index cc90f3b9..700fc969 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -19,10 +19,10 @@ import( ohos_shared_library("distributed_screen_sink") { include_dirs = [ "//third_party/json/include", - "${fwk_common_path}/utils/include", - "${distributedhardwarefwk_path}/interfaces/inner_kits/include", - "${av_transport_path}/interface", "${av_transport_path}/common/include", + "${av_transport_path}/interface", + "${distributedhardwarefwk_path}/interfaces/inner_kits/include", + "${fwk_common_path}/utils/include", ] include_dirs += [ @@ -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 f5fc7507..791d3adf 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -20,9 +20,9 @@ ohos_shared_library("distributed_screen_source") { include_dirs = [ "//third_party/json/include", "//third_party/libjpeg-turbo", - "${distributedhardwarefwk_path}/interfaces/inner_kits/include", - "${av_transport_path}/interface", "${av_transport_path}/common/include", + "${av_transport_path}/interface", + "${distributedhardwarefwk_path}/interfaces/inner_kits/include", "${fwk_common_path}/utils/include", ] @@ -55,9 +55,9 @@ 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", + "./dscreenmgr/2.0/src/dscreen_manager.cpp", + "./dscreenmgr/2.0/src/dscreen.cpp", "./dscreenservice/src/callback/dscreen_source_callback_proxy.cpp", "./dscreenservice/src/dscreen_source_service.cpp", "./dscreenservice/src/dscreen_source_stub.cpp", -- Gitee From 9989a1dd3f5d430f43ef5b1f19ee62830a8d1b4a Mon Sep 17 00:00:00 2001 From: yangli Date: Mon, 26 Jun 2023 11:51:41 +0800 Subject: [PATCH 4/7] =?UTF-8?q?gn=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- services/screenservice/sinkservice/BUILD.gn | 22 +++++++++---------- services/screenservice/sourceservice/BUILD.gn | 16 +++++++------- .../dscreenmgr/1.0/src/dscreen_manager.cpp | 2 +- .../2.0/include/av_sender_engine_adapter.h | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 700fc969..4ac8be11 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -27,27 +27,22 @@ ohos_shared_library("distributed_screen_sink") { include_dirs += [ "./dscreenservice/include", - "${services_path}/screenservice/sinkservice/screenregionmgr", + "${common_path}/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include/callback", "${interfaces_path}/innerkits/native_cpp/screen_source/include", "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", - "${common_path}/include", - "${services_path}/common/utils/include", "${services_path}/common/databuffer/include", "${services_path}/common/screen_channel/include", - "${services_path}/screentransport/screensinktrans/include", - "${services_path}/screentransport/screensinkprocessor/include", - "${services_path}/screentransport/screensinkprocessor/decoder/include", + "${services_path}/common/utils/include", "${services_path}/screenclient/include/", + "${services_path}/screenservice/sinkservice/screenregionmgr", + "${services_path}/screentransport/screensinkprocessor/decoder/include", + "${services_path}/screentransport/screensinkprocessor/include", + "${services_path}/screentransport/screensinktrans/include", ] sources = [ - "${interfaces_path}/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp", - "${interfaces_path}/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp", - "${services_path}/common/utils/src/dscreen_fwkkit.cpp", - "${services_path}/common/utils/src/dscreen_maprelation.cpp", - "${services_path}/common/utils/src/video_param.cpp", "./dscreenservice/src/dscreen_sink_service.cpp", "./dscreenservice/src/dscreen_sink_stub.cpp", "./screenregionmgr/1.0/src/screenregion.cpp", @@ -55,6 +50,11 @@ ohos_shared_library("distributed_screen_sink") { "./screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp", "./screenregionmgr/2.0/src/screenregion.cpp", "./screenregionmgr/2.0/src/screenregionmgr.cpp", + "${interfaces_path}/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp", + "${interfaces_path}/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp", + "${services_path}/common/utils/src/dscreen_fwkkit.cpp", + "${services_path}/common/utils/src/dscreen_maprelation.cpp", + "${services_path}/common/utils/src/video_param.cpp", ] deps = [ diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 791d3adf..491cd17d 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -47,20 +47,20 @@ ohos_shared_library("distributed_screen_source") { ] sources = [ - "${interfaces_path}/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp", - "${interfaces_path}/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp", - "${services_path}/common/utils/src/dscreen_fwkkit.cpp", - "${services_path}/common/utils/src/dscreen_maprelation.cpp", - "${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/1.0/src/dscreen.cpp", "./dscreenmgr/2.0/src/av_sender_engine_adapter.cpp", "./dscreenmgr/2.0/src/dscreen_manager.cpp", "./dscreenmgr/2.0/src/dscreen.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", + "${interfaces_path}/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp", + "${interfaces_path}/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp", + "${services_path}/common/utils/src/dscreen_fwkkit.cpp", + "${services_path}/common/utils/src/dscreen_maprelation.cpp", + "${services_path}/common/utils/src/video_param.cpp", ] deps = [ diff --git a/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp index c72f3421..4b1bd4ad 100644 --- a/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp @@ -123,7 +123,7 @@ void DScreenManager::HandleScreenChange(const std::shared_ptr &changedS } uint64_t screenId = changedScreen->GetScreenId(); - DHLOGI("DScreenManager::HandleScreenChange, screenId: %u, changeEvent: %", screenId, event); + DHLOGI("DScreenManager::HandleScreenChange, screenId: %u, changeEvent: %u", screenId, event); if (event == Rosen::ScreenGroupChangeEvent::ADD_TO_GROUP) { if (AddToGroup(changedScreen, screenId) != DH_SUCCESS) { DHLOGE("AddToGroup failed."); diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter.h b/services/screenservice/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter.h index 8b43e917..51a92ef8 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter.h +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter.h @@ -57,7 +57,7 @@ public: int32_t SetParameter(const AVTransTag &tag, const std::string ¶m); int32_t PushData(const VideoData &video); int32_t SendMessageToRemote(const std::shared_ptr &message); - int32_t CreateControlChannel(const std::string& peerDevId); + int32_t CreateControlChannel(const std::string &peerDevId); int32_t RegisterAdapterCallback(const std::shared_ptr &callback); // interfaces from IAVSenderEngineCallback -- Gitee From 04ef9e3185d62cb185c7bffac31d307722621356 Mon Sep 17 00:00:00 2001 From: yangli Date: Mon, 26 Jun 2023 12:46:30 +0800 Subject: [PATCH 5/7] =?UTF-8?q?gn=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- services/screenservice/sinkservice/BUILD.gn | 28 +++++++++---------- services/screenservice/sourceservice/BUILD.gn | 19 +++++++------ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 4ac8be11..21c7433b 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -18,31 +18,36 @@ import( ohos_shared_library("distributed_screen_sink") { include_dirs = [ - "//third_party/json/include", "${av_transport_path}/common/include", - "${av_transport_path}/interface", - "${distributedhardwarefwk_path}/interfaces/inner_kits/include", + "//third_party/json/include", "${fwk_common_path}/utils/include", + "${distributedhardwarefwk_path}/interfaces/inner_kits/include", + "${av_transport_path}/interface", ] include_dirs += [ "./dscreenservice/include", - "${common_path}/include", + "${services_path}/screenservice/sinkservice/screenregionmgr", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include/callback", "${interfaces_path}/innerkits/native_cpp/screen_source/include", "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", + "${common_path}/include", + "${services_path}/common/utils/include", "${services_path}/common/databuffer/include", "${services_path}/common/screen_channel/include", - "${services_path}/common/utils/include", - "${services_path}/screenclient/include/", - "${services_path}/screenservice/sinkservice/screenregionmgr", - "${services_path}/screentransport/screensinkprocessor/decoder/include", - "${services_path}/screentransport/screensinkprocessor/include", "${services_path}/screentransport/screensinktrans/include", + "${services_path}/screentransport/screensinkprocessor/include", + "${services_path}/screentransport/screensinkprocessor/decoder/include", + "${services_path}/screenclient/include/", ] sources = [ + "${interfaces_path}/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp", + "${interfaces_path}/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp", + "${services_path}/common/utils/src/dscreen_fwkkit.cpp", + "${services_path}/common/utils/src/dscreen_maprelation.cpp", + "${services_path}/common/utils/src/video_param.cpp", "./dscreenservice/src/dscreen_sink_service.cpp", "./dscreenservice/src/dscreen_sink_stub.cpp", "./screenregionmgr/1.0/src/screenregion.cpp", @@ -50,11 +55,6 @@ ohos_shared_library("distributed_screen_sink") { "./screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp", "./screenregionmgr/2.0/src/screenregion.cpp", "./screenregionmgr/2.0/src/screenregionmgr.cpp", - "${interfaces_path}/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp", - "${interfaces_path}/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp", - "${services_path}/common/utils/src/dscreen_fwkkit.cpp", - "${services_path}/common/utils/src/dscreen_maprelation.cpp", - "${services_path}/common/utils/src/video_param.cpp", ] deps = [ diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 491cd17d..6ac925fe 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -20,9 +20,9 @@ ohos_shared_library("distributed_screen_source") { include_dirs = [ "//third_party/json/include", "//third_party/libjpeg-turbo", - "${av_transport_path}/common/include", - "${av_transport_path}/interface", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", + "${av_transport_path}/interface", + "${av_transport_path}/common/include", "${fwk_common_path}/utils/include", ] @@ -47,24 +47,25 @@ ohos_shared_library("distributed_screen_source") { ] sources = [ - "./dscreenmgr/1.0/src/dscreen_manager.cpp", + "${interfaces_path}/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp", + "${interfaces_path}/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp", + "${services_path}/common/utils/src/dscreen_fwkkit.cpp", + "${services_path}/common/utils/src/dscreen_maprelation.cpp", + "${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_manager.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", "./dscreenservice/src/dscreen_source_stub.cpp", - "${interfaces_path}/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp", - "${interfaces_path}/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp", - "${services_path}/common/utils/src/dscreen_fwkkit.cpp", - "${services_path}/common/utils/src/dscreen_maprelation.cpp", - "${services_path}/common/utils/src/video_param.cpp", ] deps = [ "${common_path}:distributed_screen_utils", + "${graphicstandard_path}/frameworks/surface:surface", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", ] -- Gitee From 608e8d1d39597ff0dd59a8c0ee62cb45fe284aae Mon Sep 17 00:00:00 2001 From: yangli Date: Tue, 27 Jun 2023 09:43:33 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- distributedscreen.gni | 3 +-- services/common/test/unittest/utils/BUILD.gn | 5 ++++- services/screenservice/sinkservice/BUILD.gn | 4 +--- services/screenservice/sourceservice/BUILD.gn | 4 +--- .../sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn | 2 +- .../test/unittest/sinkservice/screenregionmgr/BUILD.gn | 2 +- .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 10 ++++++---- services/screentransport/screensinktrans/BUILD.gn | 2 +- services/screentransport/screensourcetrans/BUILD.gn | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/distributedscreen.gni b/distributedscreen.gni index a36a7301..0def35a9 100644 --- a/distributedscreen.gni +++ b/distributedscreen.gni @@ -18,7 +18,7 @@ windowmanager_path = "//foundation/window/window_manager" mediastandard_path = "//foundation/multimedia/player_framework" driver_path = "//drivers/peripheral/display" ipc_path = "//foundation/communication/ipc" -graphicstandard_path = "//foundation/graphic/graphic_2d" +# graphicstandard_path = "//foundation/graphic/graphic_2d" common_path = "${distributedscreen_path}/common" services_path = "${distributedscreen_path}/services" interfaces_path = "${distributedscreen_path}/interfaces" @@ -26,7 +26,6 @@ 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 7134be76..ace7af45 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -55,7 +55,10 @@ ohos_unittest("UtilsTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "distributed_hardware_fwk:libdhfwk_sdk" ] + external_deps = [ + "distributed_hardware_fwk:distributed_av_sender", + "distributed_hardware_fwk:libdhfwk_sdk" + ] } group("utils_test") { diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 21c7433b..6103376c 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 += [ @@ -59,7 +57,6 @@ ohos_shared_library("distributed_screen_sink") { deps = [ "${common_path}:distributed_screen_utils", - "${graphicstandard_path}/frameworks/surface:surface", "${services_path}/screenclient:distributed_screen_client", "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", ] @@ -72,6 +69,7 @@ ohos_shared_library("distributed_screen_sink") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:libdhfwk_sdk", "graphic_standard:libgraphic_utils", "graphic_standard:surface", diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 6ac925fe..8f1519bf 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", ] @@ -65,7 +63,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", ] @@ -77,6 +74,7 @@ ohos_shared_library("distributed_screen_source") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:libdhfwk_sdk", "graphic_standard:libcomposer", "graphic_standard:surface", 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 ae9e0976..4ee209e9 100644 --- a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn @@ -23,7 +23,6 @@ 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", @@ -61,6 +60,7 @@ ohos_fuzztest("OnChangeFuzzTest") { ] external_deps = [ + "distributed_hardware_fwk:distributed_av_sender", "graphic_standard:surface", "window_manager:libdm", ] diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 188fa070..8426c8f2 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -20,7 +20,6 @@ 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", @@ -64,6 +63,7 @@ ohos_unittest("DscreenRegionMgrTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", "graphic_standard:libgraphic_utils", "graphic_standard:surface", "hisysevent_native:libhisysevent", diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 4b31c1eb..8bf42fe7 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -20,12 +20,11 @@ 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", - "${graphicstandard_path}/interfaces/inner_api/common", - "${graphicstandard_path}/utils/buffer_handle/export", + # "${graphicstandard_path}/interfaces/inner_api/surface", + # "${graphicstandard_path}/interfaces/inner_api/common", + # "${graphicstandard_path}/utils/buffer_handle/export", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", "${distributedhardwarefwk_path}/common/utils/include", "${mediastandard_path}/interfaces/inner_api/native", @@ -72,6 +71,9 @@ ohos_unittest("DscreenMgrTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_sender", + "graphic_standard:libcomposer", + "graphic_standard:surface", "graphic_standard:sync_fence", "hdf_core:libhdi", "player_framework:media_client", diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 2182c769..e3d43ba3 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -18,7 +18,6 @@ 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", @@ -74,6 +73,7 @@ ohos_shared_library("distributed_screen_sinktrans") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "graphic_standard:surface", diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index cb76f770..7486acb7 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -18,7 +18,6 @@ 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", @@ -73,6 +72,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "graphic_standard:surface", -- Gitee From 3c92397155c68db44908dd5cde1209dc0a41a35d Mon Sep 17 00:00:00 2001 From: yangli Date: Thu, 29 Jun 2023 09:06:12 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- services/common/test/unittest/utils/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index ace7af45..b2c716ed 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -21,7 +21,6 @@ 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", -- Gitee