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

Fix buffer leakage on camera reconnect

Browse Source
This commit is contained in:
Kamil Trzcinski 2022-10-25 16:37:30 +02:00
parent caafd0da44
commit 6bdb33ff3a
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
device/camera/camera.c
View File

@ -41,15 +41,22 @@ void camera_close(camera_t **camerap)
*camerap = NULL; *camerap = NULL;
for (int i = MAX_DEVICES; i-- > 0; ) { for (int i = MAX_DEVICES; i-- > 0; ) {
if (camera->devices[i]) { link_t *link = &camera->links[i];
device_close(camera->devices[i]);
camera->devices[i] = NULL; if (link->callbacks.on_buffer) {
link->callbacks.on_buffer(NULL);
link->callbacks.on_buffer = NULL;
}
if (link->callbacks.buf_lock) {
buffer_lock_capture(link->callbacks.buf_lock, NULL);
link->callbacks.buf_lock = NULL;
} }
} }
for (int i = MAX_DEVICES; i-- > 0; ) { for (int i = MAX_DEVICES; i-- > 0; ) {
if (camera->links[i].callbacks.on_buffer) { if (camera->devices[i]) {
camera->links[i].callbacks.on_buffer = NULL; device_close(camera->devices[i]);
camera->devices[i] = NULL;
} }
} }