From d183d912e7a6990118ac458fcf4892b3e5148531 Mon Sep 17 00:00:00 2001 From: joe49 Date: Thu, 11 Aug 2022 14:35:40 +0800 Subject: [PATCH] fix screen and dumper Signed-off-by: joe49 --- .../sinkservice/dscreenservice/include/dscreen_sink_service.h | 2 +- .../sinkservice/dscreenservice/src/dscreen_sink_service.cpp | 4 ++-- .../dscreenservice/include/dscreen_source_service.h | 2 +- .../dscreenservice/src/dscreen_source_service.cpp | 2 +- .../screensinkprocessor/decoder/include/image_sink_decoder.h | 2 +- .../screensourcetrans/include/screen_source_trans.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h index 6fe7cd17..68b08da5 100644 --- a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h +++ b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h @@ -35,7 +35,7 @@ public: int32_t SubscribeLocalHardware(const std::string &dhId, const std::string ¶m) override; int32_t UnsubscribeLocalHardware(const std::string &dhId) override; void DScreenNotify(const std::string &devId, int32_t eventCode, const std::string &eventContent) override; - int Dump(int32_t fd, const std::vector& args) override; + int32_t Dump(int32_t fd, const std::vector& args) override; protected: void OnStart() override; diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp index 8cb6cf25..bb888f81 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp @@ -102,9 +102,9 @@ void DScreenSinkService::DScreenNotify(const std::string &devId, int32_t eventCo ScreenRegionManager::GetInstance().HandleDScreenNotify(devId, eventCode, eventContent); } -int DScreenSinkService::Dump(int32_t fd, const std::vector& args) +int32_t DScreenSinkService::Dump(int32_t fd, const std::vector& args) { - DHLOGI("DScreenSourceService Dump."); + DHLOGI("DScreenSinkService Dump."); std::string result; ScreenRegionManager::GetInstance().GetScreenDumpInfo(result); int ret = dprintf(fd, "%s\n", result.c_str()); diff --git a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h index 415673d0..8f97cff9 100644 --- a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h +++ b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h @@ -40,7 +40,7 @@ public: int32_t ConfigDistributedHardware(const std::string &devId, const std::string &dhId, const std::string &key, const std::string &value) override; void DScreenNotify(const std::string &devId, const int32_t eventCode, const std::string &eventContent) override; - int Dump(int32_t fd, const std::vector& args) override; + int32_t Dump(int32_t fd, const std::vector& args) override; protected: void OnStart() override; diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp index 00e8cd8d..54613670 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp @@ -148,7 +148,7 @@ void DScreenSourceService::DScreenNotify(const std::string &devId, const int32_t DScreenManager::GetInstance().HandleDScreenNotify(devId, eventCode, eventContent); } -int DScreenSourceService::Dump(int32_t fd, const std::vector& args) +int32_t DScreenSourceService::Dump(int32_t fd, const std::vector& args) { DHLOGI("DScreenSourceService Dump."); std::string result; diff --git a/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h b/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h index f08b20eb..d3061757 100644 --- a/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h +++ b/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h @@ -65,7 +65,7 @@ private: private: static const constexpr char *LOG_TAG = "ImageSinkDecoder"; static constexpr uint32_t DECODE_WAIT_MILLISECONDS = 5000; - static constexpr size_t DATA_QUEUE_MAX_SIZE = 10; + static constexpr size_t DATA_QUEUE_MAX_SIZE = 1000; std::mutex dataMutex_; std::mutex decodeMutex_; diff --git a/services/screentransport/screensourcetrans/include/screen_source_trans.h b/services/screentransport/screensourcetrans/include/screen_source_trans.h index 667212b3..81c4bde0 100644 --- a/services/screentransport/screensourcetrans/include/screen_source_trans.h +++ b/services/screentransport/screensourcetrans/include/screen_source_trans.h @@ -63,7 +63,7 @@ private: static const constexpr char *LOG_TAG = "ScreenSourceTrans"; static constexpr uint8_t SESSION_WAIT_SECONDS = 5; static constexpr uint8_t DATA_WAIT_SECONDS = 1; - static constexpr size_t DATA_QUEUE_MAX_SIZE = 10; + static constexpr size_t DATA_QUEUE_MAX_SIZE = 1000; std::mutex sessionMtx_; std::mutex dataMtx_; -- Gitee