diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index a1f26f8cfa4a8d25e6cc35b9916b1147248e74e0..6036e236ef9a333e60573c5ba2c005b3d7ab5695 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -55,6 +55,7 @@ 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", ] diff --git a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h index 0039543d92a2dc7455e7fe02d6da3a306a17c5b9..21f36d33473f8b03528b5006be264215ea7a2600 100644 --- a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h +++ b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h @@ -43,7 +43,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 23f5708ad1bd06b063ac36a339f48b53391116f3..8396dae9454af0520befb17d8da99c46a69d83b9 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp @@ -14,8 +14,6 @@ */ #include "dscreen_sink_service.h" -#include "1.0/include/screenregionmgr.h" - #include "if_system_ability_manager.h" #include "ipc_skeleton.h" #include "ipc_types.h" diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/include/screenregion.h b/services/screenservice/sinkservice/screenregionmgr/2.0/include/screenregion.h index 61f6fa1fe1faa4ead19703f9bdca17c30a400246..fba417d2a11cad802c5735e6857c8edfc05addb6 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/av_receiver_engine_adapter.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp index f3e6710b159829cb7b7adc4d95d2fb23c701516c..5f01af009250645fecddfc20bb59e647e3554f9b 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 diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp index 10b9f0023eebc2b0eba3a98ffe88bfa1ff843018..3dc7883059a7e433b19c9d09b36cbf5898450742 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(); @@ -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/dscreenmgr/2.0/include/dscreen.h b/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h index b4d20b3f29cf334f8c7fc5aa3f4ba0db08a52bbe..9d0c3d77487f736a52b281af14715dfb4d646c2f 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 2e60efff6463adc153b96106d5391754e7d09ad5..3fe2abc2867f7dbe5899e28f6b6901ec3daf5498 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 "dscreen_source_stub.h" #include "idscreen_source_callback.h"