From 8b0b3074bba81d6c40c3eb6c388414921de885c3 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Sat, 13 Mar 2021 12:03:15 +0800
Subject: [PATCH] camera_qcom2: add std::mutex exp_lock (#20183)

* add std::mutex exp_lock

* auto &meta_data
old-commit-hash: 4c225c6e1d107e4b2c6678625966d7e8e61f0956
---
 selfdrive/camerad/cameras/camera_qcom2.cc | 16 +++++++++++-----
 selfdrive/camerad/cameras/camera_qcom2.h  |  3 ++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/selfdrive/camerad/cameras/camera_qcom2.cc b/selfdrive/camerad/cameras/camera_qcom2.cc
index 85161ac97e..ae81db6bb4 100644
--- a/selfdrive/camerad/cameras/camera_qcom2.cc
+++ b/selfdrive/camerad/cameras/camera_qcom2.cc
@@ -938,11 +938,15 @@ void handle_camera_event(CameraState *s, void *evdat) {
     // metas
     s->frame_id_last = main_id;
     s->request_id_last = real_id;
-    s->buf.camera_bufs_metadata[buf_idx].frame_id = main_id - s->idx_offset;
-    s->buf.camera_bufs_metadata[buf_idx].timestamp_sof = timestamp;
-    s->buf.camera_bufs_metadata[buf_idx].global_gain = s->analog_gain + (100*s->dc_gain_enabled);
-    s->buf.camera_bufs_metadata[buf_idx].gain_frac = s->analog_gain_frac;
-    s->buf.camera_bufs_metadata[buf_idx].integ_lines = s->exposure_time;
+
+    auto &meta_data = s->buf.camera_bufs_metadata[buf_idx];
+    meta_data.frame_id = main_id - s->idx_offset;
+    meta_data.timestamp_sof = timestamp;
+    s->exp_lock.lock();
+    meta_data.global_gain = s->analog_gain + (100*s->dc_gain_enabled);
+    meta_data.gain_frac = s->analog_gain_frac;
+    meta_data.integ_lines = s->exposure_time;
+    s->exp_lock.unlock();
 
     // dispatch
     enqueue_req_multi(s, real_id + FRAME_BUF_COUNT, 1, 1);
@@ -1002,6 +1006,7 @@ static void set_camera_exposure(CameraState *s, float grey_frac) {
     exposure_factor = s->ef_filtered;
   }
 
+  s->exp_lock.lock();
   // always prioritize exposure time adjust
   s->exposure_time *= exposure_factor;
 
@@ -1041,6 +1046,7 @@ static void set_camera_exposure(CameraState *s, float grey_frac) {
   AG = 0xFF00 + AG * 16 + AG;
   s->analog_gain_frac = sensor_analog_gains[s->analog_gain];
 
+  s->exp_lock.unlock();
   // printf("cam %d, min %d, max %d \n", s->camera_num, s->exposure_time_min, s->exposure_time_max);
   // printf("cam %d, set AG to 0x%X, S to %d, dc %d \n", s->camera_num, AG, s->exposure_time, s->dc_gain_enabled);
 
diff --git a/selfdrive/camerad/cameras/camera_qcom2.h b/selfdrive/camerad/cameras/camera_qcom2.h
index 1d329b503c..7ae5280cbf 100644
--- a/selfdrive/camerad/cameras/camera_qcom2.h
+++ b/selfdrive/camerad/cameras/camera_qcom2.h
@@ -19,7 +19,8 @@
 
 typedef struct CameraState {
   CameraInfo ci;
-
+  
+  std::mutex exp_lock;
   float analog_gain_frac;
   uint16_t analog_gain;
   bool dc_gain_enabled;