diff options
| author | Hu Kejun <william.hu@rock-chips.com> | 2019-03-14 10:48:16 +0800 |
|---|---|---|
| committer | Tao Huang <huangtao@rock-chips.com> | 2019-03-20 18:45:22 +0800 |
| commit | 43634de342c08db74b665c9375a31806ed222886 (patch) | |
| tree | a866527ec9be00fc92a15601b2428e49df76b037 | |
| parent | df29350c9ca01875e0bb6238c766eb2a461b523f (diff) | |
media: rk-isp10: add control exposure of long and short frame for hdr
modify head file to match the change of camera engine
Change-Id: Ia139e733f766cf9cbb02e80ceda81a1817b3acbf
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
| -rw-r--r-- | include/media/v4l2-config_rockchip.h | 11 | ||||
| -rw-r--r-- | include/media/v4l2-controls_rockchip.h | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/media/v4l2-config_rockchip.h b/include/media/v4l2-config_rockchip.h index e5550903dcdb..00f744a52683 100644 --- a/include/media/v4l2-config_rockchip.h +++ b/include/media/v4l2-config_rockchip.h @@ -18,7 +18,7 @@ #define _V4L2_CONFIG_ROCKCHIP_H #define CAMERA_STRLEN 32 -#define CAMERA_METADATA_LEN (2 * PAGE_SIZE) +#define CAMERA_METADATA_LEN (4 * PAGE_SIZE) #define VALID_FR_EXP_T_INDEX 0 #define VALID_FR_EXP_G_INDEX 1 #define SENSOR_CONFIG_NUM 4 @@ -58,6 +58,10 @@ struct isp_supplemental_sensor_mode_data { unsigned short gain; unsigned char max_exp_gain_h; unsigned char max_exp_gain_l; + int exp_time_l; + unsigned short gain_l; + int exp_time_s; + unsigned short gain_s; }; struct camera_module_info_s { @@ -111,12 +115,17 @@ struct frame_timeinfo_s { }; struct sensor_metadata_s { + unsigned int exp_time_l; unsigned int exp_time; + unsigned int exp_time_s; + unsigned int gain_l; unsigned int gain; + unsigned int gain_s; }; struct v4l2_buffer_metadata_s { unsigned int frame_id; + unsigned int lights_stat; struct frame_timeinfo_s frame_t; struct flash_timeinfo_s flash_t; struct sensor_metadata_s sensor; diff --git a/include/media/v4l2-controls_rockchip.h b/include/media/v4l2-controls_rockchip.h index 62c2b8d87c7f..d6fd5b0eda2c 100644 --- a/include/media/v4l2-controls_rockchip.h +++ b/include/media/v4l2-controls_rockchip.h @@ -35,5 +35,9 @@ #define RK_V4L2_CID_AUTO_FPS (V4L2_CID_USER_RK_BASE + 3) #define RK_V4L2_CID_VTS (V4L2_CID_USER_RK_BASE + 4) #define RK_V4L2_CID_CLS_EXP (V4L2_CID_USER_RK_BASE + 5) +#define RK_V4L2_CID_L_EXP (V4L2_CID_USER_RK_BASE + 6) +#define RK_V4L2_CID_L_GAIN (V4L2_CID_USER_RK_BASE + 7) +#define RK_V4L2_CID_S_EXP (V4L2_CID_USER_RK_BASE + 8) +#define RK_V4L2_CID_S_GAIN (V4L2_CID_USER_RK_BASE + 9) #endif |