From 289a4e4edae5c7f8305d5ef1c4661ad30210a762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=9B=BD=E5=BA=86?= Date: Tue, 3 Sep 2024 16:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=8A=E8=AD=A6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=A9=BA=E6=8C=87=E9=92=88=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 韦国庆 --- .../cameraservice/cameraoperator/client/src/dcamera_client.cpp | 2 ++ .../src/distributedcameramgr/dcamera_sink_controller.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp index 79a8a42a..f99a23e7 100644 --- a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp +++ b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp @@ -143,6 +143,7 @@ void DCameraClient::UpdateSettingCache(const std::string& metadataStr) void DCameraClient::FindCameraMetadata(const std::string& metadataStr) { std::shared_ptr cameraMetadata = Camera::MetadataUtils::DecodeFromString(metadataStr); + CHECK_AND_RETURN_LOG(cameraMetadata == nullptr, "FindCameraMetadata get cameraMetadata is null"); camera_metadata_item_t focusItem; int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_CONTROL_FOCUS_MODE, &focusItem); if (ret == CAM_META_SUCCESS) { @@ -584,6 +585,7 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& inf void DCameraClient::SetPhotoCaptureRotation(const std::shared_ptr& cameraMetadata, std::shared_ptr& photoCaptureSetting) { + CHECK_AND_RETURN_LOG(cameraMetadata == nullptr, "SetPhotoCaptureRotation param cameraMetadata is null"); uint32_t rotationCount = 1; camera_metadata_item_t item; int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_ORIENTATION, &item); diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index 573ed2ce..7b258cc9 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -400,6 +400,7 @@ void DCameraSinkController::ProcessFrameTrigger(const AppExecFwk::InnerEvent::Po { DHLOGD("Receive frame trigger event then start process data in sink controller."); std::shared_ptr param = event->GetSharedObject(); + CHECK_AND_RETURN_LOG(param == nullptr, "ProcessFrameTrigger get param is null"); accessControl_->TriggerFrame(*param); } @@ -408,6 +409,7 @@ void DCameraSinkController::ProcessPostAuthorization(const AppExecFwk::InnerEven DHLOGD("Receive post authorization event then start process data in sink controller."); std::shared_ptr>> captureInfos = event->GetSharedObject>>(); + CHECK_AND_RETURN_LOG(captureInfos == nullptr, "ProcessPostAuthorization get captureInfos is null"); PostAuthorization(*captureInfos); } -- Gitee