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 b1effe8310b37569ca05094b66342706bc48c814..0b2706b18a6a6b305596ea66f2e6417240deb1c9 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 85c633f79b1d95cb618855de3e2598a623bf86b3..d79e4f55458cc8b9aad9856c00df1e7847d20e88 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 65ba1e9d08b642ba9f100b73809d2583266bdb3e..3890667b0d9039291a1d56eda9cb85538c4f0a7b 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 be614d338b57b2f349b659ffb3091cfbc7386715..7b24ddde61f1fdb14116d5b876d620d926e1fed1 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",