From d4b18aac2a98b9f9d7fbb8e9a54483e5999db032 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Mon, 11 Apr 2022 20:58:30 +0200 Subject: [PATCH] Make `buffer_list_t *device_open_buffer_list` to return `buffer_list` --- device/camera/camera.h | 8 ++++---- device/camera/camera_decoder.c | 3 +-- device/camera/camera_direct.c | 4 +--- device/camera/camera_isp.c | 10 +++++----- device/camera/camera_legacy_isp.c | 4 +--- device/camera/camera_libcamera.c | 9 +++++---- device/camera/camera_v4l2.c | 19 ++++++++++--------- device/device.c | 24 ++++++++++++++++-------- device/device.h | 2 +- 9 files changed, 44 insertions(+), 39 deletions(-) diff --git a/device/camera/camera.h b/device/camera/camera.h index 7731d3d..ec02fb2 100644 --- a/device/camera/camera.h +++ b/device/camera/camera.h @@ -72,7 +72,7 @@ int camera_run(camera_t *camera); int camera_configure_v4l2(camera_t *camera); int camera_configure_libcamera(camera_t *camera); -int camera_configure_isp(camera_t *camera, float high_div, float low_div); -int camera_configure_legacy_isp(camera_t *camera, float div); -int camera_configure_direct(camera_t *camera); -int camera_configure_decoder(camera_t *camera); +int camera_configure_isp(camera_t *camera, buffer_list_t *src, float high_div, float low_div); +int camera_configure_legacy_isp(camera_t *camera, buffer_list_t *src, float div); +int camera_configure_direct(camera_t *camera, buffer_list_t *src); +int camera_configure_decoder(camera_t *camera, buffer_list_t *src); diff --git a/device/camera/camera_decoder.c b/device/camera/camera_decoder.c index a9cc2f8..639559f 100644 --- a/device/camera/camera_decoder.c +++ b/device/camera/camera_decoder.c @@ -9,9 +9,8 @@ #include "device/buffer_list.h" #include "http/http.h" -int camera_configure_decoder(camera_t *camera) +int camera_configure_decoder(camera_t *camera, buffer_list_t *camera_src) { - buffer_list_t *camera_src = camera->camera->capture_list; buffer_list_t *src = camera_src; device_video_force_key(camera->camera); diff --git a/device/camera/camera_direct.c b/device/camera/camera_direct.c index f6bf96c..ce2c339 100644 --- a/device/camera/camera_direct.c +++ b/device/camera/camera_direct.c @@ -9,10 +9,8 @@ #include "device/buffer_list.h" #include "http/http.h" -int camera_configure_direct(camera_t *camera) +int camera_configure_direct(camera_t *camera, buffer_list_t *src) { - buffer_list_t *src = camera->camera->capture_list; - camera->codec_jpeg = device_v4l2_open("JPEG", "/dev/video31"); camera->codec_h264 = device_v4l2_open("H264", "/dev/video11"); diff --git a/device/camera/camera_isp.c b/device/camera/camera_isp.c index b6887bf..a1d62f8 100644 --- a/device/camera/camera_isp.c +++ b/device/camera/camera_isp.c @@ -11,24 +11,24 @@ void write_yuvu(buffer_t *buffer); -int camera_configure_isp(camera_t *camera, float high_div, float low_div) +int camera_configure_isp(camera_t *camera, buffer_list_t *src, float high_div, float low_div) { camera->isp_srgb = device_v4l2_open("ISP", "/dev/video13"); camera->isp_yuuv = device_v4l2_open("ISP-YUUV", "/dev/video14"); camera->codec_jpeg = device_v4l2_open("JPEG", "/dev/video31"); camera->codec_h264 = device_v4l2_open("H264", "/dev/video11"); - if (device_open_buffer_list_output(camera->isp_srgb, camera->camera->capture_list) < 0 || - device_open_buffer_list_capture(camera->isp_yuuv, camera->camera->capture_list, high_div, V4L2_PIX_FMT_YUYV, true) < 0) { + if (device_open_buffer_list_output(camera->isp_srgb, src) < 0 || + device_open_buffer_list_capture(camera->isp_yuuv, camera->isp_srgb->output_list, high_div, V4L2_PIX_FMT_YUYV, true) < 0) { return -1; } camera->isp_yuuv->output_device = camera->isp_srgb; link_t *links = camera->links; - *links++ = (link_t){ camera->camera->capture_list, { camera->isp_srgb->output_list } }; + *links++ = (link_t){ src, { camera->isp_srgb->output_list } }; - buffer_list_t *src = camera->isp_yuuv->capture_list; + src = camera->isp_yuuv->capture_list; if (device_open_buffer_list_output(camera->codec_jpeg, src) < 0 || device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true) < 0) { diff --git a/device/camera/camera_legacy_isp.c b/device/camera/camera_legacy_isp.c index 3a9e9e5..3451e61 100644 --- a/device/camera/camera_legacy_isp.c +++ b/device/camera/camera_legacy_isp.c @@ -21,10 +21,8 @@ void write_yuvu(buffer_t *buffer) #endif } -int camera_configure_legacy_isp(camera_t *camera, float div) +int camera_configure_legacy_isp(camera_t *camera, buffer_list_t *src, float div) { - buffer_list_t *src = camera->camera->capture_list; - camera->legacy_isp = device_v4l2_open("ISP", "/dev/video12"); camera->codec_jpeg = device_v4l2_open("JPEG", "/dev/video31"); camera->codec_h264 = device_v4l2_open("H264", "/dev/video11"); diff --git a/device/camera/camera_libcamera.c b/device/camera/camera_libcamera.c index 2d2b039..3de6bc7 100644 --- a/device/camera/camera_libcamera.c +++ b/device/camera/camera_libcamera.c @@ -16,16 +16,17 @@ int camera_configure_libcamera(camera_t *camera) camera->camera->opts.allow_dma = camera->options.allow_dma; - if (device_open_buffer_list(camera->camera, true, camera->options.width / camera->options.high_res_factor, camera->options.height / camera->options.high_res_factor, camera->options.format, 0, camera->options.nbufs, true) < 0) { + buffer_list_t *src = device_open_buffer_list(camera->camera, true, camera->options.width / camera->options.high_res_factor, camera->options.height / camera->options.high_res_factor, camera->options.format, 0, camera->options.nbufs, true); + if (!src) { goto error; } - camera->camera->capture_list->do_timestamps = true; + src->do_timestamps = true; if (camera->options.fps > 0) { - camera->camera->capture_list->fmt.interval_us = 1000 * 1000 / camera->options.fps; + src->fmt.interval_us = 1000 * 1000 / camera->options.fps; } - if (camera_configure_direct(camera) < 0) { + if (camera_configure_direct(camera, src) < 0) { goto error; } diff --git a/device/camera/camera_v4l2.c b/device/camera/camera_v4l2.c index 8d69ea0..4c5070f 100644 --- a/device/camera/camera_v4l2.c +++ b/device/camera/camera_v4l2.c @@ -21,16 +21,17 @@ int camera_configure_v4l2(camera_t *camera) camera->camera->opts.allow_dma = false; } - if (device_open_buffer_list(camera->camera, true, camera->options.width, camera->options.height, camera->options.format, 0, camera->options.nbufs, true) < 0) { + buffer_list_t *src = device_open_buffer_list(camera->camera, true, camera->options.width, camera->options.height, camera->options.format, 0, camera->options.nbufs, true); + if (!src) { goto error; } - camera->camera->capture_list->do_timestamps = true; + src->do_timestamps = true; if (camera->options.fps > 0) { - camera->camera->capture_list->fmt.interval_us = 1000 * 1000 / camera->options.fps; + src->fmt.interval_us = 1000 * 1000 / camera->options.fps; } - switch (camera->camera->capture_list->fmt.format) { + switch (src->fmt.format) { case V4L2_PIX_FMT_YUYV: case V4L2_PIX_FMT_YVYU: case V4L2_PIX_FMT_VYUY: @@ -38,25 +39,25 @@ int camera_configure_v4l2(camera_t *camera) case V4L2_PIX_FMT_YUV420: case V4L2_PIX_FMT_RGB565: case V4L2_PIX_FMT_RGB24: - if (camera_configure_direct(camera) < 0) { + if (camera_configure_direct(camera, src) < 0) { goto error; } break; case V4L2_PIX_FMT_MJPEG: case V4L2_PIX_FMT_H264: - if (camera_configure_decoder(camera) < 0) { + if (camera_configure_decoder(camera, src) < 0) { goto error; } break; case V4L2_PIX_FMT_SRGGB10P: #if 1 - if (camera_configure_isp(camera, camera->options.high_res_factor, camera->options.low_res_factor) < 0) { + if (camera_configure_isp(camera, src, camera->options.high_res_factor, camera->options.low_res_factor) < 0) { goto error; } #else - if (camera_configure_legacy_isp(camera, camera->options.high_res_factor) < 0) { + if (camera_configure_legacy_isp(camera, src, camera->options.high_res_factor) < 0) { goto error; } #endif @@ -64,7 +65,7 @@ int camera_configure_v4l2(camera_t *camera) default: LOG_ERROR(camera, "Unsupported camera format=%s", - fourcc_to_string(camera->camera->capture_list->fmt.format).buf); + fourcc_to_string(src->fmt.format).buf); break; } diff --git a/device/device.c b/device/device.c index 01c7c51..5ce29a7 100644 --- a/device/device.c +++ b/device/device.c @@ -43,14 +43,14 @@ void device_close(device_t *dev) { free(dev); } -int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_mmap) +buffer_list_t *device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_mmap) { unsigned type; char name[64]; struct buffer_list_s **buf_list = NULL; if (!dev) { - return -1; + return NULL; } if (!dev->opts.allow_dma) { @@ -88,21 +88,25 @@ int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsi goto error; } - return 0; + return *buf_list; error: buffer_list_close(*buf_list); *buf_list = NULL; - return -1; + return NULL; } int device_open_buffer_list_output(device_t *dev, buffer_list_t *capture_list) { - return device_open_buffer_list(dev, false, + if (device_open_buffer_list(dev, false, capture_list->fmt.width, capture_list->fmt.height, capture_list->fmt.format, capture_list->fmt.bytesperline, capture_list->nbufs, - capture_list->dev->opts.allow_dma ? !capture_list->do_mmap : true); + capture_list->dev->opts.allow_dma ? !capture_list->do_mmap : true)) { + return 0; + } + + return -1; } int device_open_buffer_list_capture(device_t *dev, buffer_list_t *output_list, float div, unsigned format, bool do_mmap) @@ -114,9 +118,13 @@ int device_open_buffer_list_capture(device_t *dev, buffer_list_t *output_list, f return -1; } - return device_open_buffer_list(dev, true, + if (device_open_buffer_list(dev, true, output_list->fmt.width / div, output_list->fmt.height / div, - format, 0, output_list->nbufs, do_mmap); + format, 0, output_list->nbufs, do_mmap)) { + return 0; + } + + return -1; } int device_set_stream(device_t *dev, bool do_on) diff --git a/device/device.h b/device/device.h index 6b03aaf..9eff7ff 100644 --- a/device/device.h +++ b/device/device.h @@ -54,7 +54,7 @@ typedef struct device_s { device_t *device_open(const char *name, const char *path, device_hw_t *hw); void device_close(device_t *dev); -int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_mmap); +buffer_list_t *device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_mmap); int device_open_buffer_list_output(device_t *dev, buffer_list_t *capture_list); int device_open_buffer_list_capture(device_t *dev, buffer_list_t *output_list, float div, unsigned format, bool do_mmap); int device_consume_event(device_t *dev);