Merge branch 'fix/add_ov2710_exp_report' into 'master'

Fix/add ov2710 exp report

See merge request espressif/esp-video-components!326

Author: donghengqaz

esp_cam_sensor/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Added option to return byte swap flags for GC0308
+- Added luma para in ov2710 driver.
 
 ## 1.4.0
 

esp_cam_sensor/include/esp_cam_sensor_types.h

@@ -74,6 +74,7 @@ typedef enum {
 
 #define ESP_CAM_SENSOR_STATS_FLAG_WB_GAIN           (1 <<  0)
 #define ESP_CAM_SENSOR_STATS_FLAG_AGC_GAIN          (1 <<  1)
+#define ESP_CAM_SENSOR_STATS_FLAG_EXPOSURE          (1 <<  2)
 
 #define ESP_CAM_SENSOR_PARAM_TYPE_NUMBER            1
 #define ESP_CAM_SENSOR_PARAM_TYPE_BITMASK           2
@@ -437,7 +438,8 @@ typedef struct {
 typedef struct {
     uint32_t flags;
     uint32_t seq;
-    uint16_t agc_gain; /*!< AGC gain output to sensor */
+    uint32_t aec_exp;  /*!< AEC exposure output to sensor */
+    volatile float agc_gain; /*!< AGC gain output to sensor */
     union {
         struct {
             uint8_t red_avg;

esp_cam_sensor/sensors/ov2710/cfg/ov2710_default.json

@@ -101,6 +101,23 @@
                         1, 1, 1, 1, 1,
                         1, 1, 1, 1, 1
                     ]
+                },
+                "env":
+                {
+                    "k": 250000,
+                    "speed_param":
+                    [
+                        -0.005463, -0.010018, 0.000000, 0.033241, 0.085583, 0.136704,  0.160734,  0.148777,
+                         0.148777,  0.160734, 0.136704, 0.085583, 0.033241, 0.000000, -0.010018, -0.005463
+                    ],
+                    "weight":
+                    [
+                        1, 1, 1, 1, 1,
+                        1, 1, 1, 1, 1,
+                        1, 1, 1, 1, 1,
+                        1, 1, 1, 1, 1,
+                        1, 1, 1, 1, 1
+                    ]
                 }
             }
         },
@@ -415,7 +432,25 @@
         },
         "atc":
         {
-            "init_value": 48
+            "model": 0,
+            "init_value": 48,
+            "delay_frames": 3,
+            "luma_env": "env.luma.avg",
+            "luma_lut":
+            [
+                {
+                    "luma": 250,
+                    "ae_value": 48
+                },
+                {
+                    "luma": 500,
+                    "ae_value": 60
+                },
+                {
+                    "luma": 750,
+                    "ae_value": 75
+                }
+            ]
         }
     }
 }

esp_cam_sensor/sensors/ov2710/ov2710.c

@@ -54,6 +54,8 @@ static const char *TAG = "ov2710";
 static portMUX_TYPE s_stats_mutex = portMUX_INITIALIZER_UNLOCKED;
 #endif
 
+#define OV2710_GAIN_V(_v, _b)   ((uint32_t)(((_v) >> ((_b))) & 0x01) + 1)
+
 static const esp_cam_sensor_isp_info_t ov2710_isp_info[] = {
     /* For MIPI */
     {
@@ -62,6 +64,7 @@ static const esp_cam_sensor_isp_info_t ov2710_isp_info[] = {
             .pclk = 80000000,
             .vts = 1322,
             .hts = 2420,
+            .tline_ns = 30222,
             .bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
         }
     },
@@ -71,6 +74,7 @@ static const esp_cam_sensor_isp_info_t ov2710_isp_info[] = {
             .pclk = 80000000,
             .vts = 1322,
             .hts = 2420,
+            .tline_ns = 26666,
             .bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
         },
     },
@@ -161,7 +165,8 @@ static esp_err_t ov2710_set_reg_bits(esp_sccb_io_handle_t sccb_handle, uint16_t
 #if CONFIG_CAMERA_OV2710_STATS_UPDATE_EN
 static void wb_timer_callback(TimerHandle_t timer)
 {
-    uint8_t read_v[5] = {0};
+    uint8_t read_v[8] = {0};
+    uint8_t read_v2 = 0;
     esp_cam_sensor_device_t *dev = (esp_cam_sensor_device_t *)pvTimerGetTimerID(timer);
     struct ov2710_cam *cam_ov2710 = (struct ov2710_cam *)dev->priv;
 
@@ -170,14 +175,28 @@ static void wb_timer_callback(TimerHandle_t timer)
     ov2710_read(dev->sccb_handle, OV2710_REG_BLUE_BEFORE_GAIN_AVERAGE, &read_v[2]);
     ov2710_read(dev->sccb_handle, OV2710_REG_AEC_AGC_ADJ_MSB, &read_v[3]);
     ov2710_read(dev->sccb_handle, OV2710_REG_AEC_AGC_ADJ_LSB, &read_v[4]);
+    ov2710_read(dev->sccb_handle, OV2710_REG_AEC_EXPO_H, &read_v[5]);
+    ov2710_read(dev->sccb_handle, OV2710_REG_AEC_EXPO_M, &read_v[6]);
+    ov2710_read(dev->sccb_handle, OV2710_REG_AEC_EXPO_L, &read_v[7]);
+    // ov2710_read(dev->sccb_handle, 0x568A, &read_v2);
+    ov2710_read(dev->sccb_handle, 0x5690, &read_v2);
 
     portENTER_CRITICAL(&s_stats_mutex);
     cam_ov2710->ov2710_para.stats.wb_avg.red_avg = read_v[0];
     cam_ov2710->ov2710_para.stats.wb_avg.green_avg = read_v[1];
     cam_ov2710->ov2710_para.stats.wb_avg.blue_avg = read_v[2];
-    cam_ov2710->ov2710_para.stats.agc_gain = ((read_v[3] & 0x01) + 1) * ((read_v[4] & 0x80) + 1) * ((read_v[4] & 0x40) + 1) * ((read_v[4] & 0x20) + 1) * ((read_v[4] & 0x10) + 1) * ((read_v[4] & 0x0f) / 16 + 1);
+    cam_ov2710->ov2710_para.stats.agc_gain = ((float)(read_v[4] & 0xf) / 16.0 + 1.0) * \
+            OV2710_GAIN_V(read_v[3], 0) * \
+            OV2710_GAIN_V(read_v[4], 7) * \
+            OV2710_GAIN_V(read_v[4], 6) * \
+            OV2710_GAIN_V(read_v[4], 5) * \
+            OV2710_GAIN_V(read_v[4], 4);
+
+    cam_ov2710->ov2710_para.stats.aec_exp = ((uint32_t)(read_v[5] & 0x0f) << 16) | ((uint32_t)read_v[6] << 8) | ((uint32_t)read_v[7]);
     cam_ov2710->ov2710_para.stats.seq++;
     portEXIT_CRITICAL(&s_stats_mutex);
+    ESP_LOGD(TAG, "_gain=%f, avg=0x%"PRIx8", _exp=0x%" PRIx32, cam_ov2710->ov2710_para.stats.agc_gain, read_v2, cam_ov2710->ov2710_para.stats.aec_exp);
+    ESP_LOGD(TAG, "_luma=%f", (float)read_v2 * 1000 / cam_ov2710->ov2710_para.stats.agc_gain / cam_ov2710->ov2710_para.stats.aec_exp);
 }
 #endif
 
@@ -626,7 +645,7 @@ esp_cam_sensor_device_t *ov2710_detect(esp_cam_sensor_config_t *config)
 
 #if CONFIG_CAMERA_OV2710_STATS_UPDATE_EN
     // Init cam privae pata
-    cam_ov2710->ov2710_para.stats.flags = ESP_CAM_SENSOR_STATS_FLAG_WB_GAIN | ESP_CAM_SENSOR_STATS_FLAG_AGC_GAIN;
+    cam_ov2710->ov2710_para.stats.flags = ESP_CAM_SENSOR_STATS_FLAG_WB_GAIN | ESP_CAM_SENSOR_STATS_FLAG_AGC_GAIN | ESP_CAM_SENSOR_STATS_FLAG_EXPOSURE;
     cam_ov2710->wb_timer_handle = xTimerCreate("wb_t", CONFIG_CAMERA_OV2710_STATS_UPDATE_INTERVAL / portTICK_PERIOD_MS, pdTRUE,
                                   (void *)dev, wb_timer_callback);
     if (!cam_ov2710->wb_timer_handle) {

esp_cam_sensor/sensors/ov2710/private_include/ov2710_regs.h

@@ -25,6 +25,9 @@ extern "C" {
 #define OV2710_REG_BLUE_BEFORE_GAIN_AVERAGE     0x5198  /* R Bit[7:0]: Before AWB gain's blue data average*/
 #define OV2710_REG_AEC_AGC_ADJ_MSB              0x350A
 #define OV2710_REG_AEC_AGC_ADJ_LSB              0x350B
+#define OV2710_REG_AEC_EXPO_H                   0x3500
+#define OV2710_REG_AEC_EXPO_M                   0x3501
+#define OV2710_REG_AEC_EXPO_L                   0x3502
 
 #ifdef __cplusplus
 }

esp_video/CHANGELOG.md

@@ -3,6 +3,7 @@
 - Add RISC-V software swap byte function for DVP video device
 - Add the customized video class to call esp_cam_sensor ioctl commands directly
 - Add the second SPI video device
+- Add camera sensor exposure parameter to statistics
 - Improve AEC controller time precision
 - Fix the CSI video device initializes twice when starting up
 - Update to use esp_cam_sensor v1.4.x

esp_video/src/esp_video_isp_pipeline.c

@@ -906,6 +906,10 @@ static void get_sensor_state(esp_video_isp_t *isp, int index)
                     isp->sensor.cur_gain = sensor_stats.agc_gain;
                 }
 
+                if (sensor_stats.flags & ESP_CAM_SENSOR_STATS_FLAG_EXPOSURE) {
+                    isp->sensor.cur_exposure = sensor_stats.aec_exp;
+                }
+
                 if (sensor_stats.flags & ESP_CAM_SENSOR_STATS_FLAG_WB_GAIN) {
                     isp_awb_stat_result_t *awb = &isp->isp_stats[index]->awb.awb_result;