From 3159cd56883ca016e51056312e5baedebeca76d5 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 5 Apr 2022 09:22:07 +0200 Subject: [PATCH] Make it work --- cmd/camera.c | 4 ++-- cmd/camera_srgb_legacy_isp.c | 3 ++- cmd/main.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cmd/camera.c b/cmd/camera.c index e22c705..0bc5e63 100644 --- a/cmd/camera.c +++ b/cmd/camera.c @@ -7,8 +7,8 @@ void camera_init(camera_t *camera) { memset(camera, 0, sizeof(*camera)); - camera->width = 2328; - camera->height = 1748; + camera->width = 1280; + camera->height = 720; camera->nbufs = 4; } diff --git a/cmd/camera_srgb_legacy_isp.c b/cmd/camera_srgb_legacy_isp.c index 05b3b3f..dcdfb07 100644 --- a/cmd/camera_srgb_legacy_isp.c +++ b/cmd/camera_srgb_legacy_isp.c @@ -22,7 +22,8 @@ int camera_configure_srgb_legacy_isp(camera_t *camera) camera->codec_jpeg = device_open("JPEG", "/dev/video31"); camera->codec_h264 = device_open("H264", "/dev/video11"); - if (device_open_buffer_list(camera->legacy_isp.isp, false, src->fmt_width, src->fmt_height, src->fmt_format, camera->nbufs) < 0) { + if (device_open_buffer_list(camera->legacy_isp.isp, false, src->fmt_width, src->fmt_height, src->fmt_format, camera->nbufs) < 0 || + device_open_buffer_list(camera->legacy_isp.isp, true, src->fmt_width, src->fmt_height, V4L2_PIX_FMT_YUYV, camera->nbufs) < 0) { return -1; } diff --git a/cmd/main.c b/cmd/main.c index 8815863..8dea82b 100644 --- a/cmd/main.c +++ b/cmd/main.c @@ -33,13 +33,23 @@ int main(int argc, char *argv[]) camera_init(&camera); + // camera.width = 2328; + // camera.height = 1748; + // camera.nbufs = 4; + if (camera_open(&camera, "/dev/video0") < 0) { goto error; } +#if 0 if (camera_configure_srgb_isp(&camera, true) < 0) { goto error; } +#else + if (camera_configure_srgb_legacy_isp(&camera) < 0) { + goto error; + } +#endif if (camera_set_params(&camera) < 0) { goto error;