From 0732ef4041daf6997584ff94dfa6efa48885a227 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 30 Jan 2024 16:13:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=B8=E6=9C=BA=E6=B5=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanglei Change-Id: I1a1643a591d85c5e24c914eeede9333329956d0c --- .../include/callback/dcamera_photo_callback.h | 3 +++ .../src/callback/dcamera_photo_callback.cpp | 15 +++++++++++++++ .../client/test/sample/dcamera_client_demo.h | 19 ++++++++++++++++++- .../dcamera_client_demo.h | 19 ++++++++++++++++++- 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h b/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h index b1effe83..0b2706b1 100644 --- a/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h +++ b/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h @@ -29,7 +29,10 @@ public: void OnCaptureStarted(const int32_t captureID, uint32_t exposureTime) const override; void OnCaptureEnded(const int32_t captureID, const int32_t frameCount) const override; void OnFrameShutter(const int32_t captureId, const uint64_t timestamp) const override; + void OnFrameShutterEnd(const int32_t captureId, const uint64_t timestamp) const override; + void OnCaptureReady(const int32_t captureId, const uint64_t timestamp) const override; void OnCaptureError(const int32_t captureId, const int32_t errorCode) const override; + void OnEstimatedCaptureDuration(const int32_t duration) const override; private: std::shared_ptr callback_; diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp index 85c633f7..d79e4f55 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp @@ -44,6 +44,21 @@ void DCameraPhotoCallback::OnFrameShutter(const int32_t captureId, const uint64_ DHLOGI("enter, captureId: %{public}d, timestamp: %{public}" PRIu64, captureId, timestamp); } +void DCameraPhotoCallback::OnFrameShutterEnd(const int32_t captureId, const uint64_t timestamp) const +{ + DHLOGI("enter, captureId: %{public}d, timestamp: %{public}" PRIu64, captureId, timestamp); +} + +void DCameraPhotoCallback::OnCaptureReady(const int32_t captureId, const uint64_t timestamp) const +{ + DHLOGI("enter, captureId: %{public}d, timestamp: %{public}" PRIu64, captureId, timestamp); +} + +void DCameraPhotoCallback::OnEstimatedCaptureDuration(const int32_t duration) const +{ + DHLOGI("enter, duration: %{public}d", duration); +} + void DCameraPhotoCallback::OnCaptureError(const int32_t captureId, const int32_t errorCode) const { DHLOGE("enter, captureId: %{public}d, errorCode: %{public}d", captureId, errorCode); diff --git a/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h b/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h index 65ba1e9d..3890667b 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h +++ b/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h @@ -213,10 +213,27 @@ public: void OnFrameShutter(const int32_t captureId, const uint64_t timestamp) const { - DHLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %{public}d timestamp: %{public}llu", + DHLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %{public}d timestamp: %{public}" PRIu64, captureId, timestamp); } + void OnFrameShutterEnd(const int32_t captureId, const uint64_t timestamp) const + { + DHLOGI("DemoDCameraPhotoCallback::OnFrameShutterEnd captureID: %{public}d timestamp: %{public}" PRIu64, + captureId, timestamp); + } + + void OnCaptureReady(const int32_t captureId, const uint64_t timestamp) const + { + DHLOGI("DemoDCameraPhotoCallback::OnCaptureReady captureID: %{public}d timestamp: %{public}" PRIu64, + captureId, timestamp); + } + + void OnEstimatedCaptureDuration(const int32_t duration) const + { + DHLOGI("DemoDCameraPhotoCallback::OnEstimatedCaptureDuration duration: %{public}d", duration); + } + void OnCaptureError(const int32_t captureId, const int32_t errorCode) const { DHLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %{public}d errorCode: %{public}d", diff --git a/test/distributedcameraclienttest/dcamera_client_demo.h b/test/distributedcameraclienttest/dcamera_client_demo.h index be614d33..7b24ddde 100644 --- a/test/distributedcameraclienttest/dcamera_client_demo.h +++ b/test/distributedcameraclienttest/dcamera_client_demo.h @@ -213,10 +213,27 @@ public: void OnFrameShutter(const int32_t captureId, const uint64_t timestamp) const { - DHLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %{public}d timestamp: %{public}llu", + DHLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %{public}d timestamp: %{public}" PRIu64, captureId, timestamp); } + void OnFrameShutterEnd(const int32_t captureId, const uint64_t timestamp) const + { + DHLOGI("DemoDCameraPhotoCallback::OnFrameShutterEnd captureID: %{public}d timestamp: %{public}" PRIu64, + captureId, timestamp); + } + + void OnCaptureReady(const int32_t captureId, const uint64_t timestamp) const + { + DHLOGI("DemoDCameraPhotoCallback::OnFrameShutterEnd captureID: %{public}d timestamp: %{public}" PRIu64, + captureId, timestamp); + } + + void OnEstimatedCaptureDuration(const int32_t duration) const + { + DHLOGI("DemoDCameraPhotoCallback::OnEstimatedCaptureDuration duration: %{public}d", duration); + } + void OnCaptureError(const int32_t captureId, const int32_t errorCode) const { DHLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %{public}d errorCode: %{public}d", -- Gitee