From 8ab587d30b461cf52844a351b912e3560b9dcbcd Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Sat, 3 Aug 2024 03:18:10 +0800 Subject: [PATCH] camerad: move `do_exit` to camera_qcom2.cc (#33086) move do_exit to camera_qcom2.cc --- system/camerad/cameras/camera_common.cc | 2 -- system/camerad/cameras/camera_qcom2.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/system/camerad/cameras/camera_common.cc b/system/camerad/cameras/camera_common.cc index 4032dad252..6aec03eae1 100644 --- a/system/camerad/cameras/camera_common.cc +++ b/system/camerad/cameras/camera_common.cc @@ -15,8 +15,6 @@ #include "CL/cl_ext_qcom.h" #endif -ExitHandler do_exit; - class ImgProc { public: ImgProc(cl_device_id device_id, cl_context context, const CameraBuf *b, const CameraState *s, int buf_width, int uv_offset) { diff --git a/system/camerad/cameras/camera_qcom2.cc b/system/camerad/cameras/camera_qcom2.cc index 2729aa264c..6aebc88718 100644 --- a/system/camerad/cameras/camera_qcom2.cc +++ b/system/camerad/cameras/camera_qcom2.cc @@ -24,7 +24,7 @@ const int MIPI_SETTLE_CNT = 33; // Calculated by camera_freqs.py // For debugging: // echo "4294967295" > /sys/module/cam_debug_util/parameters/debug_mdl -extern ExitHandler do_exit; +ExitHandler do_exit; CameraState::CameraState(MultiCameraState *multi_camera_state, const CameraConfig &config) : multi_cam_state(multi_camera_state),