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

Simplify camera decoder

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-04-05 15:35:34 +02:00
parent 601d73c9ec
commit a861c25a09
6 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/camera_decoder.c
View File

@ -17,7 +17,6 @@ int camera_configure_decoder(camera_t *camera)
buffer_list_t *src = camera->camera->capture_list;
camera->decoder.decoder = device_open("DECODER", "/dev/video10");
camera->codec_jpeg = device_open("JPEG", "/dev/video31");
camera->codec_h264 = device_open("H264", "/dev/video11");
if (device_open_buffer_list_output(camera->decoder.decoder, src) < 0 ||
@ -27,9 +26,13 @@ int camera_configure_decoder(camera_t *camera)
src = camera->decoder.decoder->capture_list;
if (device_open_buffer_list_output(camera->codec_jpeg, src) < 0 ||
device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true) < 0) {
return -1;
if (camera->format != V4L2_PIX_FMT_MJPEG && camera->format != V4L2_PIX_FMT_JPEG) {
camera->codec_jpeg = device_open("JPEG", "/dev/video31");
if (device_open_buffer_list_output(camera->codec_jpeg, src) < 0 ||
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) < 0 ||
@ -39,9 +42,15 @@ int camera_configure_decoder(camera_t *camera)
link_t *links = camera->links;
*links++ = (link_t){ camera->camera, { camera->decoder.decoder } };
*links++ = (link_t){ camera->decoder.decoder, { camera->codec_jpeg, camera->codec_h264 } };
*links++ = (link_t){ camera->codec_jpeg, { }, { http_jpeg_capture, http_jpeg_needs_buffer } };
*links++ = (link_t){ camera->codec_h264, { }, { http_h264_capture, http_h264_needs_buffer } };
if (camera->format == V4L2_PIX_FMT_MJPEG || camera->format == V4L2_PIX_FMT_JPEG) {
*links++ = (link_t){ camera->camera, { camera->decoder.decoder }, { http_jpeg_capture, http_jpeg_needs_buffer } };
*links++ = (link_t){ camera->decoder.decoder, { camera->codec_h264 } };
*links++ = (link_t){ camera->codec_h264, { }, { http_h264_capture, http_h264_needs_buffer } };
} else {
*links++ = (link_t){ camera->camera, { camera->decoder.decoder } };
*links++ = (link_t){ camera->decoder.decoder, { camera->codec_jpeg, camera->codec_h264 } };
*links++ = (link_t){ camera->codec_jpeg, { }, { http_jpeg_capture, http_jpeg_needs_buffer } };
*links++ = (link_t){ camera->codec_h264, { }, { http_h264_capture, http_h264_needs_buffer } };
}
return 0;
}