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

Pass sizeimage to ensure that allocated buffers are of a correct size

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-11-05 13:53:55 +01:00
parent ca08adb62f
commit 0c244a61c8
6 changed files with 58 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
device/camera/camera_input.c
View File

@ -32,8 +32,14 @@ static int camera_configure_input_v4l2(camera_t *camera)
camera->camera->opts.allow_dma = false;
}
buffer_list_t *camera_capture = device_open_buffer_list(camera->camera, true,
camera->options.width, camera->options.height, camera->options.format, 0, camera->options.nbufs, true);
buffer_format_t fmt = {
.width = camera->options.width,
.height = camera->options.height,
.format = camera->options.format,
.nbufs = camera->options.nbufs
};
buffer_list_t *camera_capture = device_open_buffer_list(camera->camera, true, fmt, true);
if (!camera_capture) {
return -1;
}
@ -52,16 +58,14 @@ static int camera_configure_input_libcamera(camera_t *camera)
camera->camera->opts.allow_dma = camera->options.allow_dma;
buffer_list_t *camera_capture = device_open_buffer_list(
camera->camera,
true,
camera->options.width,
camera->options.height,
camera->options.format,
0,
camera->options.nbufs,
true
);
buffer_format_t fmt = {
.width = camera->options.width,
.height = camera->options.height,
.format = camera->options.format,
.nbufs = camera->options.nbufs
};
buffer_list_t *camera_capture = device_open_buffer_list(camera->camera, true, fmt, true);
if (!camera_capture) {
return -1;
}