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

Camera options

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-04-05 16:00:17 +02:00
parent 7dd1ec9c0c
commit 9cf4cc359a
7 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/camera_decoder.c
View File

@ -10,10 +10,6 @@
int camera_configure_decoder(camera_t *camera)
{
if (device_open_buffer_list(camera->camera, true, camera->width, camera->height, camera->format, 0, camera->nbufs, true) < 0) {
return -1;
}
buffer_list_t *src = camera->camera->capture_list;
camera->decoder = device_open("DECODER", "/dev/video10");
@ -26,7 +22,7 @@ int camera_configure_decoder(camera_t *camera)
src = camera->decoder->capture_list;
if (camera->format != V4L2_PIX_FMT_MJPEG && camera->format != V4L2_PIX_FMT_JPEG) {
if (camera->options.format != V4L2_PIX_FMT_MJPEG && camera->options.format != V4L2_PIX_FMT_JPEG) {
camera->codec_jpeg = device_open("JPEG", "/dev/video31");
if (device_open_buffer_list_output(camera->codec_jpeg, src) < 0 ||
@ -42,7 +38,7 @@ int camera_configure_decoder(camera_t *camera)
link_t *links = camera->links;
if (camera->format == V4L2_PIX_FMT_MJPEG || camera->format == V4L2_PIX_FMT_JPEG) {
if (camera->options.format == V4L2_PIX_FMT_MJPEG || camera->options.format == V4L2_PIX_FMT_JPEG) {
*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 } };