Reduce C2 dcamera noise at night (#1798)

old-commit-hash: 1036c68251

selfdrive/boardd/boardd.cc

@@ -33,8 +33,8 @@
 
 #define MAX_IR_POWER 0.5f
 #define MIN_IR_POWER 0.0f
-#define CUTOFF_GAIN 0.015625f  // iso400
-#define SATURATE_GAIN 0.0625f  // iso1600
+#define CUTOFF_IL 200
+#define SATURATE_IL 1600
 #define NIBBLE_TO_HEX(n) ((n) < 10 ? (n) + '0' : ((n) - 10) + 'a')
 #define VOLTAGE_K 0.091  // LPF gain for 5s tau (dt/tau / (dt/tau + 1))
 
@@ -690,15 +690,15 @@ void *hardware_control_thread(void *crap) {
     }
     if (sm.updated("frontFrame")){
       auto event = sm["frontFrame"];
-      float cur_front_gain = event.getFrontFrame().getGainFrac();
+      int cur_integ_lines = event.getFrontFrame().getIntegLines();
       last_front_frame_t = event.getLogMonoTime();
 
-      if (cur_front_gain <= CUTOFF_GAIN) {
+      if (cur_integ_lines <= CUTOFF_IL) {
         ir_pwr = 100.0 * MIN_IR_POWER;
-      } else if (cur_front_gain > SATURATE_GAIN) {
+      } else if (cur_integ_lines > SATURATE_IL) {
         ir_pwr = 100.0 * MAX_IR_POWER;
       } else {
-        ir_pwr = 100.0 * (MIN_IR_POWER + ((cur_front_gain - CUTOFF_GAIN) * (MAX_IR_POWER - MIN_IR_POWER) / (SATURATE_GAIN - CUTOFF_GAIN)));
+        ir_pwr = 100.0 * (MIN_IR_POWER + ((cur_integ_lines - CUTOFF_IL) * (MAX_IR_POWER - MIN_IR_POWER) / (SATURATE_IL - CUTOFF_IL)));
       }
     }
     // Disable ir_pwr on front frame timeout

selfdrive/camerad/cameras/camera_qcom.cc

@@ -203,23 +203,24 @@ static int imx298_apply_exposure(CameraState *s, int gain, int integ_lines, int
   return err;
 }
 
-static inline int ov8865_get_coarse_gain(int gain) {
-  static const int gains[] = {0, 256, 384, 448, 480};
-  int i;
+static int ov8865_apply_exposure(CameraState *s, int gain, int integ_lines, int frame_length) {
+  //printf("front camera: %d %d %d\n", gain, integ_lines, frame_length);
+  int err, coarse_gain_bitmap, fine_gain_bitmap;
 
+  // get bitmaps from iso
+  static const int gains[] = {0, 100, 200, 400, 800};
+  int i;
   for (i = 1; i < ARRAYSIZE(gains); i++) {
     if (gain >= gains[i - 1] && gain < gains[i])
       break;
   }
+  int coarse_gain = i - 1;
+  float fine_gain = (gain - gains[coarse_gain])/(float)(gains[coarse_gain+1]-gains[coarse_gain]);
+  coarse_gain_bitmap = (1 << coarse_gain) - 1;
+  fine_gain_bitmap = ((int)(16*fine_gain) << 3) + 128; // 7th is always 1, 0-2nd are always 0
 
-  return i - 1;
-}
-
-static int ov8865_apply_exposure(CameraState *s, int gain, int integ_lines, int frame_length) {
-  //printf("front camera: %d %d %d\n", gain, integ_lines, frame_length);
-  int err, gain_bitmap;
-  gain_bitmap = (1 << ov8865_get_coarse_gain(gain)) - 1;
   integ_lines *= 16; // The exposure value in reg is in 16ths of a line
+
   struct msm_camera_i2c_reg_array reg_array[] = {
     //{0x104,0x1,0},
 
@@ -230,7 +231,7 @@ static int ov8865_apply_exposure(CameraState *s, int gain, int integ_lines, int
     // AEC MANUAL
     {0x3503, 0x4, 0},
     // AEC GAIN
-    {0x3508, (uint16_t)(gain_bitmap), 0}, {0x3509, 0xf8, 0},
+    {0x3508, (uint16_t)(coarse_gain_bitmap), 0}, {0x3509, (uint16_t)(fine_gain_bitmap), 0},
 
     //{0x104,0x0,0},
   };
@@ -388,7 +389,10 @@ static void set_exposure(CameraState *s, float exposure_frac, float gain_frac) {
     || integ_lines != s->cur_integ_lines
     || frame_length != s->cur_frame_length) {
 
-    if (s->apply_exposure) {
+    if (s->apply_exposure == ov8865_apply_exposure) {
+      gain = 800 * gain_frac; // ISO
+      err = s->apply_exposure(s, gain, integ_lines, frame_length);
+    } else if (s->apply_exposure) {
       err = s->apply_exposure(s, gain, integ_lines, frame_length);
     }
 
@@ -411,7 +415,27 @@ static void set_exposure(CameraState *s, float exposure_frac, float gain_frac) {
 
 static void do_autoexposure(CameraState *s, float grey_frac) {
   const float target_grey = 0.3;
+  if (s->apply_exposure == ov8865_apply_exposure) {
+    // gain limits downstream
+    const float gain_frac_min = 0.015625;
+    const float gain_frac_max = 1.0;
+    // exposure time limits
+    unsigned int frame_length = s->pixel_clock / s->line_length_pclk / s->fps;
+    const unsigned int exposure_time_min = 16;
+    const unsigned int exposure_time_max = frame_length - 11; // copied from set_exposure()
 
+    float exposure_factor = pow(1.05, (target_grey - grey_frac) / 0.05);
+    if (s->cur_gain_frac > 0.125 && exposure_factor < 1) {
+      s->cur_gain_frac *= exposure_factor;
+    } else if (s->cur_integ_lines * exposure_factor <= exposure_time_max && s->cur_integ_lines * exposure_factor >= exposure_time_min) { // adjust exposure time first
+      s->cur_exposure_frac *= exposure_factor;
+    } else if (s->cur_gain_frac * exposure_factor <= gain_frac_max && s->cur_gain_frac * exposure_factor >= gain_frac_min) {
+      s->cur_gain_frac *= exposure_factor;
+    }
+
+    set_exposure(s, s->cur_exposure_frac, s->cur_gain_frac);
+
+  } else { // keep the old for others
     float new_exposure = s->cur_exposure_frac;
     new_exposure *= pow(1.05, (target_grey - grey_frac) / 0.05 );
     //LOGD("diff %f: %f to %f", target_grey - grey_frac, s->cur_exposure_frac, new_exposure);
@@ -424,6 +448,7 @@ static void do_autoexposure(CameraState *s, float grey_frac) {
     }
 
     set_exposure(s, new_exposure, new_gain);
+  }
 }
 
 void camera_autoexposure(CameraState *s, float grey_frac) {