jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dependency on output_list and capture_list to create a pipeline

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-04-11 21:50:48 +02:00
parent 4497c91ae8
commit d7c263bae9
11 changed files with 160 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
device/camera/camera_isp.c
View File

@ -11,38 +11,36 @@
void write_yuvu(buffer_t *buffer);
int camera_configure_isp(camera_t *camera, buffer_list_t *src, float high_div, float low_div)
int camera_configure_isp(camera_t *camera, buffer_list_t *camera_capture, float high_div, float low_div)
{
link_t *links = camera->links;
camera->isp_srgb = device_v4l2_open("ISP", "/dev/video13");
camera->isp_yuuv = device_v4l2_open("ISP-YUUV", "/dev/video14");
if (camera->isp_yuuv) {
camera->isp_yuuv->output_device = camera->isp_srgb;
}
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, src) ||
!device_open_buffer_list_capture(camera->isp_yuuv, camera->isp_srgb->output_list, high_div, V4L2_PIX_FMT_YUYV, true)) {
buffer_list_t *isp_output = device_open_buffer_list_output(camera->isp_srgb, camera_capture);
buffer_list_t *isp_capture = device_open_buffer_list_capture(camera->isp_yuuv, isp_output, high_div, V4L2_PIX_FMT_YUYV, true);
*links++ = (link_t){ camera_capture, { isp_output } };
buffer_list_t *jpeg_output = device_open_buffer_list_output(camera->codec_jpeg, isp_capture);
buffer_list_t *jpeg_capture = device_open_buffer_list_capture(camera->codec_jpeg, jpeg_output, 1.0, V4L2_PIX_FMT_JPEG, true);
buffer_list_t *h264_output = device_open_buffer_list_output(camera->codec_h264, isp_capture);
buffer_list_t *h264_capture = device_open_buffer_list_capture(camera->codec_h264, h264_output, 1.0, V4L2_PIX_FMT_H264, true);
if (!jpeg_capture || !h264_capture) {
return -1;
}
camera->isp_yuuv->output_device = camera->isp_srgb;
link_t *links = camera->links;
*links++ = (link_t){ src, { camera->isp_srgb->output_list } };
src = camera->isp_yuuv->capture_list;
if (!device_open_buffer_list_output(camera->codec_jpeg, src) ||
!device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true) < 0) {
return -1;
}
if (!device_open_buffer_list_output(camera->codec_h264, src) ||
!device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true)) {
return -1;
}
*links++ = (link_t){ camera->isp_yuuv->capture_list, { camera->codec_jpeg->output_list, camera->codec_h264->output_list }, { write_yuvu } };
*links++ = (link_t){ camera->codec_jpeg->capture_list, { }, { http_jpeg_capture, http_jpeg_needs_buffer } };
*links++ = (link_t){ camera->codec_h264->capture_list, { }, { http_h264_capture, http_h264_needs_buffer } };
*links++ = (link_t){ isp_capture, { jpeg_output, h264_output }, { write_yuvu } };
*links++ = (link_t){ jpeg_capture, { }, { http_jpeg_capture, http_jpeg_needs_buffer } };
*links++ = (link_t){ h264_capture, { }, { http_h264_capture, http_h264_needs_buffer } };
// all done
if (low_div < 1) {
@ -50,28 +48,26 @@ int camera_configure_isp(camera_t *camera, buffer_list_t *src, float high_div, f
}
camera->isp_yuuv_lowres = device_v4l2_open("ISP-YUUV-LOW", "/dev/video15");
if (camera->isp_yuuv_lowres) {
camera->isp_yuuv_lowres->output_device = camera->isp_srgb;
}
camera->codec_jpeg_lowres = device_v4l2_open("JPEG-LOW", "/dev/video31");
camera->codec_h264_lowres = device_v4l2_open("H264-LOW", "/dev/video11");
if (!device_open_buffer_list_capture(camera->isp_yuuv_lowres, camera->camera->capture_list, low_div, V4L2_PIX_FMT_YUYV, true)) {
buffer_list_t *isp_lowres_capture = device_open_buffer_list_capture(camera->isp_yuuv_lowres, isp_output, low_div, V4L2_PIX_FMT_YUYV, true);
buffer_list_t *jpeg_lowres_output = device_open_buffer_list_output(camera->codec_jpeg_lowres, isp_lowres_capture);
buffer_list_t *jpeg_lowres_capture = device_open_buffer_list_capture(camera->codec_jpeg_lowres, jpeg_lowres_output, 1.0, V4L2_PIX_FMT_JPEG, true);
buffer_list_t *h264_lowres_output = device_open_buffer_list_output(camera->codec_h264_lowres, isp_lowres_capture);
buffer_list_t *h264_lowres_capture = device_open_buffer_list_capture(camera->codec_h264_lowres, h264_lowres_output, 1.0, V4L2_PIX_FMT_H264, true);
if (!jpeg_lowres_capture || !h264_lowres_capture) {
return -1;
}
camera->isp_yuuv_lowres->output_device = camera->isp_srgb;
src = camera->isp_yuuv_lowres->capture_list;
if (!device_open_buffer_list_output(camera->codec_jpeg_lowres, src) ||
!device_open_buffer_list_capture(camera->codec_jpeg_lowres, src, 1.0, V4L2_PIX_FMT_JPEG, true)) {
return -1;
}
if (!device_open_buffer_list_output(camera->codec_h264_lowres, src) ||
!device_open_buffer_list_capture(camera->codec_h264_lowres, src, 1.0, V4L2_PIX_FMT_H264, true)) {
return -1;
}
*links++ = (link_t){ camera->isp_yuuv_lowres->capture_list, { camera->codec_jpeg_lowres->output_list, camera->codec_h264_lowres->output_list }, { write_yuvu } };
*links++ = (link_t){ camera->codec_jpeg_lowres->capture_list, { }, { http_jpeg_lowres_capture, http_jpeg_needs_buffer } };
*links++ = (link_t){ camera->codec_h264_lowres->capture_list, { }, { http_h264_lowres_capture, http_h264_needs_buffer } };
*links++ = (link_t){ isp_capture, { jpeg_lowres_output, h264_lowres_output }, { write_yuvu } };
*links++ = (link_t){ jpeg_lowres_capture, { }, { http_jpeg_lowres_capture, http_jpeg_needs_buffer } };
*links++ = (link_t){ h264_lowres_capture, { }, { http_h264_lowres_capture, http_h264_needs_buffer } };
return 0;
}