Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

os04a10 support 720p90 #80

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

os04a10 support 720p90 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7f1da9
add support for gc4653 720p60
scpcom Feb 17, 2025
28f6371
* os04a10 support 720p90
lxowalle Jan 21, 2025
95d1e5d
* delete unused code
lxowalle Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions middleware/v2/component/isp/sensor/cv182x/gcore_gc4653/gc4653_cmos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ static CVI_S32 cmos_get_wdr_size(VI_PIPE ViPipe, ISP_SNS_ISP_INFO_S *pstIspCfg);
#define GC4653_FRAME_BUF_ADDR 0x031D

#define GC4653_RES_IS_1440P(w, h) ((w) <= 2560 && (h) <= 1440)
#define GC4653_RES_IS_720P(w, h) ((w) <= 1280 && (h) <= 720)

static CVI_S32 cmos_get_ae_default(VI_PIPE ViPipe, AE_SENSOR_DEFAULT_S *pstAeSnsDft)
{
Expand Down Expand Up @@ -485,15 +486,13 @@ static CVI_S32 cmos_set_wdr_mode(VI_PIPE ViPipe, CVI_U8 u8Mode)
CMOS_CHECK_POINTER(pstSnsState);

pstSnsState->bSyncInit = CVI_FALSE;

switch (u8Mode) {
case WDR_MODE_NONE:
pstSnsState->u8ImgMode = GC4653_MODE_2560X1440P30;
// pstSnsState->u8ImgMode = GC4653_MODE_2560X1440P30;
pstSnsState->enWDRMode = WDR_MODE_NONE;
pstSnsState->u32FLStd = g_astGc4653_mode[pstSnsState->u8ImgMode].u32VtsDef;
syslog(LOG_INFO, "WDR_MODE_NONE\n");
break;

case WDR_MODE_2To1_LINE:
default:
CVI_TRACE_SNS(CVI_DBG_ERR, "Unsupport sensor mode!\n");
Expand Down Expand Up @@ -683,6 +682,21 @@ static CVI_S32 cmos_set_image_mode(VI_PIPE ViPipe, ISP_CMOS_SENSOR_IMAGE_MODE_S
pstSnsState->enWDRMode);
return CVI_FAILURE;
}
} else if (pstSensorImageMode->f32Fps <= 60) {
if (pstSnsState->enWDRMode == WDR_MODE_NONE) {
if (GC4653_RES_IS_720P(pstSensorImageMode->u16Width, pstSensorImageMode->u16Height))
u8SensorImageMode = GC4653_MODE_1280X720P60;
else {
u8SensorImageMode = GC4653_MODE_2560X1440P30;
}
} else {
CVI_TRACE_SNS(CVI_DBG_ERR, "Not support! Width:%d, Height:%d, Fps:%f, WDRMode:%d\n",
pstSensorImageMode->u16Width,
pstSensorImageMode->u16Height,
pstSensorImageMode->f32Fps,
pstSnsState->enWDRMode);
return CVI_FAILURE;
}
} else {
CVI_TRACE_SNS(CVI_DBG_ERR, "Not support this Fps:%f\n", pstSensorImageMode->f32Fps);
return CVI_FAILURE;
Expand Down Expand Up @@ -763,7 +777,21 @@ static CVI_S32 sensor_rx_attr(VI_PIPE ViPipe, SNS_COMBO_DEV_ATTR_S *pstRxAttr)
CMOS_CHECK_POINTER(pstRxAttr);

memcpy(pstRxAttr, &gc4653_rx_attr, sizeof(*pstRxAttr));

if (pstSnsState->u8ImgMode == GC4653_MODE_1280X720P60) {
char *value = getenv("MAIX_SENSOR_FPS");
if (value == NULL) {
pstRxAttr->mclk.freq = CAMPLL_FREQ_27M;
} else {
int fps = atoi(value);
if (fps >= 80) {
pstRxAttr->mclk.freq = CAMPLL_FREQ_37P125M;
} else {
pstRxAttr->mclk.freq = CAMPLL_FREQ_27M;
}
}
} else if (pstSnsState->u8ImgMode == GC4653_MODE_2560X1440P30) {
pstRxAttr->mclk.freq = CAMPLL_FREQ_24M;
}
pstRxAttr->img_size.width = g_astGc4653_mode[pstSnsState->u8ImgMode].astImg[0].stSnsSize.u32Width;
pstRxAttr->img_size.height = g_astGc4653_mode[pstSnsState->u8ImgMode].astImg[0].stSnsSize.u32Height;
if (pstSnsState->enWDRMode == WDR_MODE_NONE)
Expand Down
1 change: 1 addition & 0 deletions middleware/v2/component/isp/sensor/cv182x/gcore_gc4653/gc4653_cmos_ex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ enum gc4653_linear_regs_e {
typedef enum _GC4653_MODE_E {
GC4653_MODE_2560X1440P30 = 0,
GC4653_MODE_LINEAR_NUM,
GC4653_MODE_1280X720P60,
GC4653_MODE_NUM
} GC4653_MODE_E;

Expand Down
41 changes: 41 additions & 0 deletions middleware/v2/component/isp/sensor/cv182x/gcore_gc4653/gc4653_cmos_param.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,47 @@ static const GC4653_MODE_S g_astGc4653_mode[GC4653_MODE_NUM] = {
.u32Step = 64,
},
},
[GC4653_MODE_1280X720P60] = {
.name = "1280X720P30",
.astImg[0] = {
.stSnsSize = {
.u32Width = 1280,
.u32Height = 720,
},
.stWndRect = {
.s32X = 0,
.s32Y = 0,
.u32Width = 1280,
.u32Height = 720,
},
.stMaxSize = {
.u32Width = 1280,
.u32Height = 720,
},
},
.f32MaxFps = 60,
.f32MinFps = 2.75, /* 1500 * 30 / 16383 */
.u32HtsDef = 1500,
.u32VtsDef = 750,//650
.stExp[0] = {
.u16Min = 1,
.u16Max = 0x3fff,
.u16Def = 0x2000,
.u16Step = 1,
},
.stAgain[0] = {
.u32Min = 1024,
.u32Max = 77648,
.u32Def = 1024,
.u32Step = 1,
},
.stDgain[0] = {
.u32Min = 1024,
.u32Max = 16368,
.u32Def = 1024,
.u32Step = 64,
},
}
};

static ISP_CMOS_NOISE_CALIBRATION_S g_stIspNoiseCalibratio = {.CalibrationCoef = {
Expand Down
172 changes: 171 additions & 1 deletion middleware/v2/component/isp/sensor/cv182x/gcore_gc4653/gc4653_sensor_ctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#define GC4653_CHIP_ID 0x4653

static void gc4653_linear_1440p30_init(VI_PIPE ViPipe);
static void gc4653_linear_720p60_init(VI_PIPE ViPipe);

CVI_U8 gc4653_i2c_addr = 0x29;
const CVI_U32 gc4653_addr_byte = 2;
Expand Down Expand Up @@ -200,9 +201,17 @@ int gc4653_probe(VI_PIPE ViPipe)

void gc4653_init(VI_PIPE ViPipe)
{
CVI_U8 u8ImgMode;

gc4653_i2c_init(ViPipe);

gc4653_linear_1440p30_init(ViPipe);
u8ImgMode = g_pastGc4653[ViPipe]->u8ImgMode;

if (u8ImgMode == GC4653_MODE_1280X720P60) {
gc4653_linear_720p60_init(ViPipe);
} else {
gc4653_linear_1440p30_init(ViPipe);
}

g_pastGc4653[ViPipe]->bInit = CVI_TRUE;
}
Expand Down Expand Up @@ -365,3 +374,164 @@ static void gc4653_linear_1440p30_init(VI_PIPE ViPipe)

printf("ViPipe:%d,===GC4653 1440P 30fps 10bit LINEAR Init OK!===\n", ViPipe);
}

static void gc4653_linear_720p60_init(VI_PIPE ViPipe)
{
gc4653_write_register(ViPipe, 0x03fe, 0xf0);
gc4653_write_register(ViPipe, 0x03fe, 0x00);
gc4653_write_register(ViPipe, 0x0317, 0x00);
gc4653_write_register(ViPipe, 0x0320, 0x77);
gc4653_write_register(ViPipe, 0x0324, 0xc8);
gc4653_write_register(ViPipe, 0x0325, 0x06);
gc4653_write_register(ViPipe, 0x0326, 0x60);
gc4653_write_register(ViPipe, 0x0327, 0x03);
gc4653_write_register(ViPipe, 0x0334, 0x40);
gc4653_write_register(ViPipe, 0x0336, 0x60);
gc4653_write_register(ViPipe, 0x0337, 0x82);
gc4653_write_register(ViPipe, 0x0335, 0x55);
gc4653_write_register(ViPipe, 0x0315, 0x25);
gc4653_write_register(ViPipe, 0x031c, 0xc6);
gc4653_write_register(ViPipe, 0x0287, 0x18);
gc4653_write_register(ViPipe, 0x0084, 0x00);
gc4653_write_register(ViPipe, 0x0087, 0x50);
gc4653_write_register(ViPipe, 0x029d, 0x08);
gc4653_write_register(ViPipe, 0x0290, 0x00);
gc4653_write_register(ViPipe, 0x0217, 0x40);
gc4653_write_register(ViPipe, 0x0234, 0x20);
gc4653_write_register(ViPipe, 0x0340, 0x05);
gc4653_write_register(ViPipe, 0x0341, 0xdd);
gc4653_write_register(ViPipe, 0x0341, 0xd0);
gc4653_write_register(ViPipe, 0x0345, 0x06);
gc4653_write_register(ViPipe, 0x034b, 0xb0);

gc4653_write_register(ViPipe, 0x034c, 0x05);
gc4653_write_register(ViPipe, 0x034e, 0x02);
gc4653_write_register(ViPipe, 0x034f, 0xd0);
gc4653_write_register(ViPipe, 0x0352, 0x08);
gc4653_write_register(ViPipe, 0x0354, 0x08);
gc4653_write_register(ViPipe, 0x02d1, 0xe0);
gc4653_write_register(ViPipe, 0x0223, 0xf2);
gc4653_write_register(ViPipe, 0x0238, 0xa4);
gc4653_write_register(ViPipe, 0x02ce, 0x7f);
gc4653_write_register(ViPipe, 0x0232, 0xc4);
gc4653_write_register(ViPipe, 0x02d3, 0x05);
gc4653_write_register(ViPipe, 0x0243, 0x06);
gc4653_write_register(ViPipe, 0x02ee, 0x30);
gc4653_write_register(ViPipe, 0x026f, 0x70);
gc4653_write_register(ViPipe, 0x0257, 0x09);
gc4653_write_register(ViPipe, 0x0211, 0x02);
gc4653_write_register(ViPipe, 0x0219, 0x09);
gc4653_write_register(ViPipe, 0x023f, 0x2d);
gc4653_write_register(ViPipe, 0x0518, 0x00);
gc4653_write_register(ViPipe, 0x0519, 0x01);
gc4653_write_register(ViPipe, 0x0515, 0x08);
gc4653_write_register(ViPipe, 0x02d9, 0x3f);
gc4653_write_register(ViPipe, 0x02da, 0x02);
gc4653_write_register(ViPipe, 0x02db, 0xe8);
gc4653_write_register(ViPipe, 0x02e6, 0x20);
gc4653_write_register(ViPipe, 0x021b, 0x10);
gc4653_write_register(ViPipe, 0x0252, 0x22);
gc4653_write_register(ViPipe, 0x024e, 0x22);
gc4653_write_register(ViPipe, 0x02c4, 0x01);
gc4653_write_register(ViPipe, 0x021d, 0x17);
gc4653_write_register(ViPipe, 0x024a, 0x01);
gc4653_write_register(ViPipe, 0x02ca, 0x02);
gc4653_write_register(ViPipe, 0x0262, 0x10);
gc4653_write_register(ViPipe, 0x029a, 0x20);
gc4653_write_register(ViPipe, 0x021c, 0x0e);
gc4653_write_register(ViPipe, 0x0298, 0x03);
gc4653_write_register(ViPipe, 0x029c, 0x00);
gc4653_write_register(ViPipe, 0x027e, 0x14);
gc4653_write_register(ViPipe, 0x02c2, 0x10);
gc4653_write_register(ViPipe, 0x0540, 0x20);
gc4653_write_register(ViPipe, 0x0546, 0x01);
gc4653_write_register(ViPipe, 0x0548, 0x01);
gc4653_write_register(ViPipe, 0x0544, 0x01);
gc4653_write_register(ViPipe, 0x0242, 0x1b);
gc4653_write_register(ViPipe, 0x02c0, 0x1b);
gc4653_write_register(ViPipe, 0x02c3, 0x20);
gc4653_write_register(ViPipe, 0x02e4, 0x10);
gc4653_write_register(ViPipe, 0x022e, 0x00);
gc4653_write_register(ViPipe, 0x027b, 0x3f);
gc4653_write_register(ViPipe, 0x0269, 0x0f);
gc4653_write_register(ViPipe, 0x02d2, 0x40);
gc4653_write_register(ViPipe, 0x027c, 0x08);
gc4653_write_register(ViPipe, 0x023a, 0x2e);
gc4653_write_register(ViPipe, 0x0245, 0xce);
gc4653_write_register(ViPipe, 0x0530, 0x20);
gc4653_write_register(ViPipe, 0x0531, 0x02);
gc4653_write_register(ViPipe, 0x0228, 0x50);
gc4653_write_register(ViPipe, 0x02ab, 0x00);
gc4653_write_register(ViPipe, 0x0250, 0x00);
gc4653_write_register(ViPipe, 0x0221, 0x50);
gc4653_write_register(ViPipe, 0x02ac, 0x00);
gc4653_write_register(ViPipe, 0x02a5, 0x02);
gc4653_write_register(ViPipe, 0x0260, 0x0b);
gc4653_write_register(ViPipe, 0x0216, 0x04);
gc4653_write_register(ViPipe, 0x0299, 0x1C);
gc4653_write_register(ViPipe, 0x02bb, 0x0d);
gc4653_write_register(ViPipe, 0x02a3, 0x02);
gc4653_write_register(ViPipe, 0x02a4, 0x02);
gc4653_write_register(ViPipe, 0x021e, 0x02);
gc4653_write_register(ViPipe, 0x024f, 0x08);
gc4653_write_register(ViPipe, 0x028c, 0x08);
gc4653_write_register(ViPipe, 0x0532, 0x3f);
gc4653_write_register(ViPipe, 0x0533, 0x02);
gc4653_write_register(ViPipe, 0x0277, 0xc0);
gc4653_write_register(ViPipe, 0x0276, 0xc0);
gc4653_write_register(ViPipe, 0x0239, 0xc0);
gc4653_write_register(ViPipe, 0x0202, 0x05);
gc4653_write_register(ViPipe, 0x0203, 0xd0);
gc4653_write_register(ViPipe, 0x0205, 0xc0);
gc4653_write_register(ViPipe, 0x02b0, 0x68);
gc4653_write_register(ViPipe, 0x0002, 0xa9);
gc4653_write_register(ViPipe, 0x0004, 0x01);
gc4653_write_register(ViPipe, 0x021a, 0x98);
gc4653_write_register(ViPipe, 0x0266, 0xa0);
gc4653_write_register(ViPipe, 0x0020, 0x01);
gc4653_write_register(ViPipe, 0x0021, 0x03);
gc4653_write_register(ViPipe, 0x0022, 0x00);
gc4653_write_register(ViPipe, 0x0023, 0x04);
gc4653_write_register(ViPipe, 0x0342, 0x06);
gc4653_write_register(ViPipe, 0x0343, 0x40);
gc4653_write_register(ViPipe, 0x03fe, 0x10);
gc4653_write_register(ViPipe, 0x03fe, 0x00);
gc4653_write_register(ViPipe, 0x0106, 0x78);
gc4653_write_register(ViPipe, 0x0108, 0x0c);
gc4653_write_register(ViPipe, 0x0114, 0x01);
gc4653_write_register(ViPipe, 0x0115, 0x12);
gc4653_write_register(ViPipe, 0x0180, 0x46);
gc4653_write_register(ViPipe, 0x0181, 0x30);
gc4653_write_register(ViPipe, 0x0182, 0x05);
gc4653_write_register(ViPipe, 0x0185, 0x01);
gc4653_write_register(ViPipe, 0x03fe, 0x10);
gc4653_write_register(ViPipe, 0x03fe, 0x00);
gc4653_write_register(ViPipe, 0x0100, 0x09);

gc4653_write_register(ViPipe, 0x000f, 0x00);
// otp
gc4653_write_register(ViPipe, 0x0080, 0x02);
gc4653_write_register(ViPipe, 0x0097, 0x0a);
gc4653_write_register(ViPipe, 0x0098, 0x10);
gc4653_write_register(ViPipe, 0x0099, 0x05);
gc4653_write_register(ViPipe, 0x009a, 0xb0);
gc4653_write_register(ViPipe, 0x0317, 0x08);
gc4653_write_register(ViPipe, 0x0a67, 0x80);
gc4653_write_register(ViPipe, 0x0a70, 0x03);
gc4653_write_register(ViPipe, 0x0a82, 0x00);
gc4653_write_register(ViPipe, 0x0a83, 0x10);
gc4653_write_register(ViPipe, 0x0a80, 0x2b);
gc4653_write_register(ViPipe, 0x05be, 0x00);
gc4653_write_register(ViPipe, 0x05a9, 0x01);
gc4653_write_register(ViPipe, 0x0313, 0x80);
gc4653_write_register(ViPipe, 0x05be, 0x01);
gc4653_write_register(ViPipe, 0x0317, 0x00);
gc4653_write_register(ViPipe, 0x0a67, 0x00);

gc4653_write_register(ViPipe, 0x0000, 0x00); // end flag

gc4653_default_reg_init(ViPipe);
delay_ms(10);

printf("ViPipe:%d,===GC4653 720P 60fps 10bit LINEAR Init OK!===\n", ViPipe);
}
5 changes: 5 additions & 0 deletions middleware/v2/component/isp/sensor/cv182x/ov_os04a10/os04a10_cmos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,8 @@ static CVI_S32 cmos_set_image_mode(VI_PIPE ViPipe, ISP_CMOS_SENSOR_IMAGE_MODE_S
OS04A10_SENSOR_GET_CTX(ViPipe, pstSnsState);
CMOS_CHECK_POINTER(pstSnsState);

printf("############# [%s][%d] fps:%f\r\n", __func__, __LINE__, pstSensorImageMode->f32Fps);

u8SensorImageMode = pstSnsState->u8ImgMode;
pstSnsState->bSyncInit = CVI_FALSE;
if (pstSensorImageMode->f32Fps <= 30) {
Expand Down Expand Up @@ -1207,6 +1209,9 @@ static CVI_S32 cmos_set_image_mode(VI_PIPE ViPipe, ISP_CMOS_SENSOR_IMAGE_MODE_S
return CVI_FAILURE;
}
} else {
if (pstSensorImageMode->u16Width <= 1280 && pstSensorImageMode->u16Height <= 720) {
u8SensorImageMode = OS04A10_MODE_720P90_12BIT;
}
}

if ((pstSnsState->bInit == CVI_TRUE) && (u8SensorImageMode == pstSnsState->u8ImgMode)) {
Expand Down
1 change: 1 addition & 0 deletions middleware/v2/component/isp/sensor/cv182x/ov_os04a10/os04a10_cmos_ex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ enum os04a10_wdr2_regs_e {

typedef enum _OS04A10_MODE_E {
OS04A10_MODE_1440P30_12BIT = 0,
OS04A10_MODE_720P90_12BIT,
OS04A10_MODE_LINEAR_NUM,
OS04A10_MODE_1440P30_WDR = OS04A10_MODE_LINEAR_NUM,
OS04A10_MODE_NUM
Expand Down
41 changes: 41 additions & 0 deletions middleware/v2/component/isp/sensor/cv182x/ov_os04a10/os04a10_cmos_param.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,47 @@ static const OS04A10_MODE_S g_astOs04a10_mode[OS04A10_MODE_NUM] = {
.u32Step = 1,
},
},
[OS04A10_MODE_720P90_12BIT] = {
.name = "640x480_fps130_12bit",
.astImg[0] = {
.stSnsSize = {
.u32Width = 1280,
.u32Height = 720,
},
.stWndRect = {
.s32X = 0,
.s32Y = 0,
.u32Width = 1280,
.u32Height = 720,
},
.stMaxSize = {
.u32Width = 1280,
.u32Height = 720,
},
},
.f32MaxFps = 30,
.f32MinFps = 0.74, /* 0x658 * 30 / 0xFFFF */
.u32HtsDef = 1400,
.u32VtsDef = 780,
.stExp[0] = {
.u16Min = 1,
.u16Max = 780 - 8,
.u16Def = 500,
.u16Step = 1,
},
.stAgain[0] = {
.u32Min = 1024,
.u32Max = 68200,
.u32Def = 1024,
.u32Step = 1,
},
.stDgain[0] = {
.u32Min = 1024,
.u32Max = 16373,
.u32Def = 1024,
.u32Step = 1,
},
},
[OS04A10_MODE_1440P30_WDR] = {
.name = "1440p30wdr",
.astImg[0] = {
Expand Down
Loading