From 7e8789b53f9c378c9830950dbdf0aa70720265e1 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 5 Apr 2022 20:32:39 +0200 Subject: [PATCH] Improve H264 --- cmd/camera_decoder.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cmd/camera_decoder.c b/cmd/camera_decoder.c index 117d111..d7adfd3 100644 --- a/cmd/camera_decoder.c +++ b/cmd/camera_decoder.c @@ -12,8 +12,9 @@ int camera_configure_decoder(camera_t *camera) { buffer_list_t *src = camera->camera->capture_list; + device_video_force_key(camera->decoder); + camera->decoder = device_open("DECODER", "/dev/video10"); - camera->codec_h264 = device_open("H264", "/dev/video11"); if (device_open_buffer_list_output(camera->decoder, src) < 0 || device_open_buffer_list_capture(camera->decoder, src, 1.0, V4L2_PIX_FMT_YUV420, true) < 0) { @@ -31,9 +32,13 @@ int camera_configure_decoder(camera_t *camera) } } - if (device_open_buffer_list_output(camera->codec_h264, src) < 0 || - device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true) < 0) { - return -1; + if (camera->options.format != V4L2_PIX_FMT_H264) { + camera->codec_h264 = device_open("H264", "/dev/video11"); + + if (device_open_buffer_list_output(camera->codec_h264, src) < 0 || + device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true) < 0) { + return -1; + } } link_t *links = camera->links; @@ -42,6 +47,10 @@ int camera_configure_decoder(camera_t *camera) *links++ = (link_t){ camera->camera, { camera->decoder }, { http_jpeg_capture, http_jpeg_needs_buffer } }; *links++ = (link_t){ camera->decoder, { camera->codec_h264 } }; *links++ = (link_t){ camera->codec_h264, { }, { http_h264_capture, http_h264_needs_buffer } }; + } else if (camera->options.format != V4L2_PIX_FMT_H264) { + *links++ = (link_t){ camera->camera, { camera->decoder }, { http_h264_capture, http_h264_needs_buffer }}; + *links++ = (link_t){ camera->decoder, { camera->codec_jpeg } }; + *links++ = (link_t){ camera->codec_jpeg, { }, { http_jpeg_capture, http_jpeg_needs_buffer } }; } else { *links++ = (link_t){ camera->camera, { camera->decoder } }; *links++ = (link_t){ camera->decoder, { camera->codec_jpeg, camera->codec_h264 } };