Skip to content

Commit 7a45263

Browse files
committed
* os04a10 support 720p90
1 parent 9a761a1 commit 7a45263

File tree

8 files changed

+410
-7
lines changed

8 files changed

+410
-7
lines changed

components/3rd_party/sophgo-middleware/sophgo-middleware/v2/component/isp/sensor/sg200x/gcore_gc4653/gc4653_cmos.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ static CVI_S32 sensor_rx_attr(VI_PIPE ViPipe, SNS_COMBO_DEV_ATTR_S *pstRxAttr)
783783
pstRxAttr->mclk.freq = CAMPLL_FREQ_27M;
784784
} else {
785785
int fps = atoi(value);
786-
if (fps == 80) {
786+
if (fps >= 80) {
787787
pstRxAttr->mclk.freq = CAMPLL_FREQ_37P125M;
788788
} else {
789789
pstRxAttr->mclk.freq = CAMPLL_FREQ_27M;

components/3rd_party/sophgo-middleware/sophgo-middleware/v2/component/isp/sensor/sg200x/ov_os04a10/os04a10_cmos.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,8 @@ static CVI_S32 cmos_set_image_mode(VI_PIPE ViPipe, ISP_CMOS_SENSOR_IMAGE_MODE_S
11731173
OS04A10_SENSOR_GET_CTX(ViPipe, pstSnsState);
11741174
CMOS_CHECK_POINTER(pstSnsState);
11751175

1176+
printf("############# [%s][%d] fps:%f\r\n", __func__, __LINE__, pstSensorImageMode->f32Fps);
1177+
11761178
u8SensorImageMode = pstSnsState->u8ImgMode;
11771179
pstSnsState->bSyncInit = CVI_FALSE;
11781180
if (pstSensorImageMode->f32Fps <= 30) {
@@ -1207,6 +1209,9 @@ static CVI_S32 cmos_set_image_mode(VI_PIPE ViPipe, ISP_CMOS_SENSOR_IMAGE_MODE_S
12071209
return CVI_FAILURE;
12081210
}
12091211
} else {
1212+
if (pstSensorImageMode->u16Width <= 1280 && pstSensorImageMode->u16Height <= 720) {
1213+
u8SensorImageMode = OS04A10_MODE_720P90_12BIT;
1214+
}
12101215
}
12111216

12121217
if ((pstSnsState->bInit == CVI_TRUE) && (u8SensorImageMode == pstSnsState->u8ImgMode)) {

components/3rd_party/sophgo-middleware/sophgo-middleware/v2/component/isp/sensor/sg200x/ov_os04a10/os04a10_cmos_ex.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ enum os04a10_wdr2_regs_e {
6666

6767
typedef enum _OS04A10_MODE_E {
6868
OS04A10_MODE_1440P30_12BIT = 0,
69+
OS04A10_MODE_720P90_12BIT,
6970
OS04A10_MODE_LINEAR_NUM,
7071
OS04A10_MODE_1440P30_WDR = OS04A10_MODE_LINEAR_NUM,
7172
OS04A10_MODE_NUM

components/3rd_party/sophgo-middleware/sophgo-middleware/v2/component/isp/sensor/sg200x/ov_os04a10/os04a10_cmos_param.h

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,47 @@ static const OS04A10_MODE_S g_astOs04a10_mode[OS04A10_MODE_NUM] = {
6161
.u32Step = 1,
6262
},
6363
},
64+
[OS04A10_MODE_720P90_12BIT] = {
65+
.name = "640x480_fps130_12bit",
66+
.astImg[0] = {
67+
.stSnsSize = {
68+
.u32Width = 1280,
69+
.u32Height = 720,
70+
},
71+
.stWndRect = {
72+
.s32X = 0,
73+
.s32Y = 0,
74+
.u32Width = 1280,
75+
.u32Height = 720,
76+
},
77+
.stMaxSize = {
78+
.u32Width = 1280,
79+
.u32Height = 720,
80+
},
81+
},
82+
.f32MaxFps = 30,
83+
.f32MinFps = 0.74, /* 0x658 * 30 / 0xFFFF */
84+
.u32HtsDef = 1400,
85+
.u32VtsDef = 780,
86+
.stExp[0] = {
87+
.u16Min = 1,
88+
.u16Max = 780 - 8,
89+
.u16Def = 500,
90+
.u16Step = 1,
91+
},
92+
.stAgain[0] = {
93+
.u32Min = 1024,
94+
.u32Max = 68200,
95+
.u32Def = 1024,
96+
.u32Step = 1,
97+
},
98+
.stDgain[0] = {
99+
.u32Min = 1024,
100+
.u32Max = 16373,
101+
.u32Def = 1024,
102+
.u32Step = 1,
103+
},
104+
},
64105
[OS04A10_MODE_1440P30_WDR] = {
65106
.name = "1440p30wdr",
66107
.astImg[0] = {

0 commit comments

Comments
 (0)