From a816336de5c64e479dcd06f670f0de16c8da1735 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Fri, 8 Apr 2022 09:23:55 +0200 Subject: [PATCH] Fix direct method --- cmd/camera.c | 2 +- cmd/camera_decoder.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmd/camera.c b/cmd/camera.c index c4a8144..87a15c4 100644 --- a/cmd/camera.c +++ b/cmd/camera.c @@ -82,7 +82,7 @@ camera_t *camera_open(camera_options_t *options) goto error; } #else - if (camera_configure_legacy_isp(&camera, camera->options.high_res_factor) < 0) { + if (camera_configure_legacy_isp(camera, camera->options.high_res_factor) < 0) { goto error; } #endif diff --git a/cmd/camera_decoder.c b/cmd/camera_decoder.c index 5c3224a..6d288e0 100644 --- a/cmd/camera_decoder.c +++ b/cmd/camera_decoder.c @@ -10,7 +10,8 @@ int camera_configure_decoder(camera_t *camera) { - buffer_list_t *src = camera->camera->capture_list; + buffer_list_t *camera_src = camera->camera->capture_list; + buffer_list_t *src = camera_src; device_video_force_key(camera->camera); camera->decoder = device_open("DECODER", "/dev/video10"); @@ -29,7 +30,7 @@ int camera_configure_decoder(camera_t *camera) src = camera->decoder->capture_list; - if (camera->options.format != V4L2_PIX_FMT_MJPEG && camera->options.format != V4L2_PIX_FMT_JPEG) { + if (camera_src->fmt_format != V4L2_PIX_FMT_MJPEG && camera_src->fmt_format != V4L2_PIX_FMT_JPEG) { camera->codec_jpeg = device_open("JPEG", "/dev/video31"); if (device_open_buffer_list_output(camera->codec_jpeg, src) < 0 || @@ -38,7 +39,7 @@ int camera_configure_decoder(camera_t *camera) } } - if (camera->options.format != V4L2_PIX_FMT_H264) { + if (camera_src->fmt_format != V4L2_PIX_FMT_H264) { camera->codec_h264 = device_open("H264", "/dev/video11"); if (device_open_buffer_list_output(camera->codec_h264, src) < 0 || @@ -49,11 +50,11 @@ int camera_configure_decoder(camera_t *camera) link_t *links = camera->links; - if (camera->options.format == V4L2_PIX_FMT_MJPEG || camera->options.format == V4L2_PIX_FMT_JPEG) { + if (camera_src->fmt_format == V4L2_PIX_FMT_MJPEG || camera_src->fmt_format == V4L2_PIX_FMT_JPEG) { *links++ = (link_t){ camera->camera->capture_list, { camera->decoder->output_list }, { http_jpeg_capture, http_jpeg_needs_buffer } }; *links++ = (link_t){ camera->decoder->capture_list, { camera->codec_h264->output_list } }; *links++ = (link_t){ camera->codec_h264->capture_list, { }, { http_h264_capture, http_h264_needs_buffer } }; - } else if (camera->options.format == V4L2_PIX_FMT_H264) { + } else if (camera_src->fmt_format == V4L2_PIX_FMT_H264) { *links++ = (link_t){ camera->camera->capture_list, { camera->decoder->output_list }, { http_h264_capture, http_h264_needs_buffer }}; *links++ = (link_t){ camera->decoder->capture_list, { camera->codec_jpeg->output_list } }; *links++ = (link_t){ camera->codec_jpeg->capture_list, { }, { http_jpeg_capture, http_jpeg_needs_buffer } };