Merge branch 'ov5647_fps' into 'dev'

add ovsensor 720p vga 960p See merge request maix_sw/k230_canmv!259
kendryte · Jun 21, 2024 · 8edf7bb · 8edf7bb
2 parents 2e141e5 + 5177c32
commit 8edf7bb
Show file tree

Hide file tree

Showing 47 changed files with 43,579 additions and 154 deletions.
diff --git a/k230_sdk_overlay/src/big/mpp/include/comm/k_sensor_comm.h b/k230_sdk_overlay/src/big/mpp/include/comm/k_sensor_comm.h
@@ -98,7 +98,7 @@ typedef enum {
     OV_OV5647_MIPI_CSI1_1920X1080_30FPS_10BIT_LINEAR = 27,
     OV_OV5647_MIPI_CSI2_1920X1080_30FPS_10BIT_LINEAR = 28,
 
-    XS9922B_MIPI_CSI0_1280X720_30FPS_YUV422_DOL3 = 29,
+    // XS9922B_MIPI_CSI0_1280X720_30FPS_YUV422_DOL3 = 29,
 
     XS9950_MIPI_CSI0_1280X720_30FPS_YUV422 = 30,
     XS9950_MIPI_CSI1_1280X720_30FPS_YUV422 = 31,
@@ -115,6 +115,17 @@ typedef enum {
 
     GC2053_MIPI_CSI0_1920X1080_30FPS_10BIT_LINEAR = 40,
 
+    OV_OV5647_MIPI_CSI1_640x480_90FPS_10BIT_LINEAR = 41,
+    OV_OV5647_MIPI_CSI1_1280X720_60FPS_10BIT_LINEAR = 42,
+    OV_OV5647_MIPI_CSI1_1280X960_60FPS_10BIT_LINEAR = 43,
+
+    OV_OV5647_MIPI_CSI0_1280X720_60FPS_10BIT_LINEAR = 44,
+    OV_OV5647_MIPI_CSI0_1280X960_60FPS_10BIT_LINEAR = 45,
+
+    OV_OV5647_MIPI_CSI2_640x480_90FPS_10BIT_LINEAR = 46,
+    OV_OV5647_MIPI_CSI2_1280X720_60FPS_10BIT_LINEAR = 47,
+    OV_OV5647_MIPI_CSI2_1280X960_60FPS_10BIT_LINEAR = 48,
+
     SENSOR_TYPE_MAX,
 } k_vicap_sensor_type;
 

diff --git a/k230_sdk_overlay/src/big/mpp/include/comm/k_vicap_comm.h b/k230_sdk_overlay/src/big/mpp/include/comm/k_vicap_comm.h
@@ -379,6 +379,7 @@ typedef struct {
     k_vicap_vi_flash_mode flash_mode;
     k_vicap_vi_first_frame_sel first_frame;
     k_u16 glitch_filter;
+    k_u16 fps;
     k_vicap_sensor_type sensor_type;
 } k_vicap_sensor_info;
 
@@ -618,6 +619,11 @@ typedef struct
     k_video_frame_info info;
 } k_vicap_mcm_chn_vf_info;
 
+typedef struct {
+    k_u32 adapt_id[16];
+    k_u32 adapt_len;
+}k_vicap_adapt_id;
+
 #define K_ERR_VICAP_INVALID_DEVID     K_DEF_ERR(K_ID_VICAP, K_ERR_LEVEL_ERROR, K_ERR_INVALID_DEVID)
 #define K_ERR_VICAP_INVALID_CHNID     K_DEF_ERR(K_ID_VICAP, K_ERR_LEVEL_ERROR, K_ERR_INVALID_CHNID)
 #define K_ERR_VICAP_ILLEGAL_PARAM     K_DEF_ERR(K_ID_VICAP, K_ERR_LEVEL_ERROR, K_ERR_ILLEGAL_PARAM)