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

86
device/camera/camera_decoder.c
View File

@ -9,60 +9,60 @@
#include "device/buffer_list.h"
#include "http/http.h"
int camera_configure_decoder(camera_t *camera, buffer_list_t *camera_src)
int camera_configure_decoder(camera_t *camera, buffer_list_t *camera_capture)
{
buffer_list_t *src = camera_src;
buffer_list_t *src = camera_capture;
device_video_force_key(camera->camera);
camera->decoder = device_v4l2_open("DECODER", "/dev/video10");
if (!device_open_buffer_list_output(camera->decoder, src)) {
return -1;
buffer_list_t *decoder_output = device_open_buffer_list_output(camera->decoder, src);
buffer_list_t *decoder_capture = device_open_buffer_list_capture(camera->decoder, decoder_output, 1.0, 0, true);
link_t *links = camera->links;
link_t *camera_link = &*links++;
link_t *decoder_link = &*links++;
*camera_link = (link_t){ camera_capture, { decoder_output }, {} };
*decoder_link = (link_t){ decoder_capture, { }, { } };
buffer_list_t **decoder_sinks = &decoder_link->sinks[0];
if (camera_capture->fmt.format == V4L2_PIX_FMT_MJPEG || camera_capture->fmt.format == V4L2_PIX_FMT_JPEG) {
camera_link->callbacks.on_buffer = http_jpeg_capture;
camera_link->callbacks.validate_buffer = http_jpeg_needs_buffer;
} else {
camera->codec_jpeg = device_v4l2_open("JPEG", "/dev/video31");
buffer_list_t *jpeg_output = device_open_buffer_list_output(camera->codec_jpeg, decoder_capture);
buffer_list_t *jpeg_capture = device_open_buffer_list_capture(camera->codec_jpeg, jpeg_output, 1.0, V4L2_PIX_FMT_JPEG, true);
if (!jpeg_capture) {
return -1;
}
*decoder_sinks++ = jpeg_output;
*links++ = (link_t){ jpeg_capture, { }, { http_jpeg_capture, http_jpeg_needs_buffer } };
}
if (!device_open_buffer_list_capture(camera->decoder, NULL, 1.0, 0, true)) {
return -1;
if (camera_capture->fmt.format == V4L2_PIX_FMT_H264) {
camera_link->callbacks.on_buffer = http_h264_capture;
camera_link->callbacks.validate_buffer = http_h264_needs_buffer;
} else {
camera->codec_h264 = device_v4l2_open("H264", "/dev/video11");
buffer_list_t *h264_output = device_open_buffer_list_output(camera->codec_jpeg, decoder_capture);
buffer_list_t *h264_capture = device_open_buffer_list_capture(camera->codec_jpeg, h264_output, 1.0, V4L2_PIX_FMT_H264, true);
if (!h264_output) {
return -1;
}
*decoder_sinks++ = h264_output;
*links++ = (link_t){ h264_capture, { }, { http_h264_capture, http_h264_needs_buffer } };
}
if (device_set_decoder_start(camera->decoder, true) < 0) {
return -1;
}
src = camera->decoder->capture_list;
if (camera_src->fmt.format != V4L2_PIX_FMT_MJPEG && camera_src->fmt.format != V4L2_PIX_FMT_JPEG) {
camera->codec_jpeg = device_v4l2_open("JPEG", "/dev/video31");
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)) {
return -1;
}
}
if (camera_src->fmt.format != V4L2_PIX_FMT_H264) {
camera->codec_h264 = device_v4l2_open("H264", "/dev/video11");
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;
}
}
link_t *links = camera->links;
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_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 } };
} else {
*links++ = (link_t){ camera->camera->capture_list, { camera->decoder->output_list } };
*links++ = (link_t){ camera->decoder->capture_list, { camera->codec_jpeg->output_list, camera->codec_h264->output_list } };
*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 } };
}
return 0;
}