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

Improve H264

Browse Source
This commit is contained in:
Kamil Trzcinski 2022-04-05 20:32:39 +02:00
parent 65c0639cc5
commit 7e8789b53f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/camera_decoder.c
View File

@ -12,8 +12,9 @@ int camera_configure_decoder(camera_t *camera)
{ {
buffer_list_t *src = camera->camera->capture_list; buffer_list_t *src = camera->camera->capture_list;
device_video_force_key(camera->decoder);
camera->decoder = device_open("DECODER", "/dev/video10"); 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 || 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) { 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 || if (camera->options.format != V4L2_PIX_FMT_H264) {
device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true) < 0) { camera->codec_h264 = device_open("H264", "/dev/video11");
return -1;
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; 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->camera, { camera->decoder }, { http_jpeg_capture, http_jpeg_needs_buffer } };
*links++ = (link_t){ camera->decoder, { camera->codec_h264 } }; *links++ = (link_t){ camera->decoder, { camera->codec_h264 } };
*links++ = (link_t){ camera->codec_h264, { }, { http_h264_capture, http_h264_needs_buffer } }; *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 { } else {
*links++ = (link_t){ camera->camera, { camera->decoder } }; *links++ = (link_t){ camera->camera, { camera->decoder } };
*links++ = (link_t){ camera->decoder, { camera->codec_jpeg, camera->codec_h264 } }; *links++ = (link_t){ camera->decoder, { camera->codec_jpeg, camera->codec_h264 } };