From a1c974c9be8e2768e7ca49f2272dfceec4e0d506 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 12 Apr 2022 09:18:40 +0200 Subject: [PATCH] Remove `camera_legacy_isp.c` --- device/camera/camera_isp.c | 23 +++++++++++++++++++++ device/camera/camera_legacy_isp.c | 33 ------------------------------- 2 files changed, 23 insertions(+), 33 deletions(-) delete mode 100644 device/camera/camera_legacy_isp.c diff --git a/device/camera/camera_isp.c b/device/camera/camera_isp.c index 066031e..93f800b 100644 --- a/device/camera/camera_isp.c +++ b/device/camera/camera_isp.c @@ -35,3 +35,26 @@ int camera_configure_isp(camera_t *camera, buffer_list_t *src_capture, float hig return 0; } + +static const char *isp_names[2] = { + "ISP", + "ISP-LOW" +}; + +int camera_configure_legacy_isp(camera_t *camera, buffer_list_t *src_capture, float div, int res) +{ + camera->legacy_isp[res] = device_v4l2_open(isp_names[res], "/dev/video12"); + + buffer_list_t *isp_output = device_open_buffer_list_output( + camera->legacy_isp[res], src_capture); + buffer_list_t *isp_capture = device_open_buffer_list_capture( + camera->legacy_isp[res], isp_output, div, V4L2_PIX_FMT_YUYV, true); + + camera_capture_add_output(camera, src_capture, isp_output); + + if (camera_configure_output(camera, isp_capture, res) < 0) { + return -1; + } + + return 0; +} diff --git a/device/camera/camera_legacy_isp.c b/device/camera/camera_legacy_isp.c deleted file mode 100644 index ca1316a..0000000 --- a/device/camera/camera_legacy_isp.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "camera.h" - -#include "device/buffer.h" -#include "device/buffer_list.h" -#include "device/device.h" -#include "device/links.h" -#include "opts/log.h" -#include "opts/fourcc.h" -#include "device/buffer_list.h" -#include "http/http.h" - -static const char *isp_names[2] = { - "ISP", - "ISP-LOW" -}; - -int camera_configure_legacy_isp(camera_t *camera, buffer_list_t *src_capture, float div, int res) -{ - camera->legacy_isp[res] = device_v4l2_open(isp_names[res], "/dev/video12"); - - buffer_list_t *isp_output = device_open_buffer_list_output( - camera->legacy_isp[res], src_capture); - buffer_list_t *isp_capture = device_open_buffer_list_capture( - camera->legacy_isp[res], isp_output, div, V4L2_PIX_FMT_YUYV, true); - - camera_capture_add_output(camera, src_capture, isp_output); - - if (camera_configure_output(camera, isp_capture, res) < 0) { - return -1; - } - - return 0; -}