mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-26 21:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

camera: Added more accurate timestamps.

Browse Source
This commit is contained in:
Ryan C. Gordon
2023-12-16 16:00:15 -05:00
parent d3e6ef3cc6
commit f87d536229
3 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/camera/SDL_camera.c
View File

@@ -109,6 +109,9 @@ static void ClosePhysicalCameraDevice(SDL_CameraDevice *device)
device->filled_output_surfaces.next = NULL;
device->empty_output_surfaces.next = NULL;
device->app_held_output_surfaces.next = NULL;
device->base_timestamp = 0;
device->adjust_timestamp = 0;
}
// this must not be called while `device` is still in a device list, or while a device's camera thread is still running.
@@ -535,7 +538,12 @@ SDL_bool SDL_CameraThreadIterate(SDL_CameraDevice *device)
SDL_Log("CAMERA: New frame available!");
#endif
if (device->empty_output_surfaces.next == NULL) {
if (device->drop_frames > 0) {
device->drop_frames--;
camera_driver.impl.ReleaseFrame(device, device->acquire_surface);
device->acquire_surface->pixels = NULL;
device->acquire_surface->pitch = 0;
} else if (device->empty_output_surfaces.next == NULL) {
// uhoh, no output frames available! Either the app is slow, or it forgot to release frames when done with them. Drop this new frame.
#if DEBUG_CAMERA
SDL_Log("CAMERA: No empty output surfaces! Dropping frame!");
@@ -544,6 +552,12 @@ SDL_bool SDL_CameraThreadIterate(SDL_CameraDevice *device)
device->acquire_surface->pixels = NULL;
device->acquire_surface->pitch = 0;
} else {
if (!device->adjust_timestamp) {
device->adjust_timestamp = SDL_GetTicksNS();
device->base_timestamp = timestampNS;
}
timestampNS = (timestampNS - device->base_timestamp) + device->adjust_timestamp;
slist = device->empty_output_surfaces.next;
output_surface = slist->surface;
device->empty_output_surfaces.next = slist->next;
@@ -828,6 +842,8 @@ SDL_Camera *SDL_OpenCameraDevice(SDL_CameraDeviceID instance_id, const SDL_Camer
device->output_surfaces[i].surface = surf;
}
device->drop_frames = 1;
// Start the camera thread if necessary
if (!camera_driver.impl.ProvidesOwnCallbackThread) {
char threadname[64];