eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-21 12:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't assume evdev events and SDL_GetTicks() use the same time source

Browse source 
The evdev events are in the same time base as gettimeofday(), but SDL_GetTicks() might be using clock_gettime()
This commit is contained in:
Sam Lantinga 2022-12-05 10:40:16 -08:00
parent 57d34f2e10
commit 75f1eb9216
3 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/core/linux/SDL_evdev.c
View file

@ -38,7 +38,6 @@
#include <sys/ioctl.h>
#include <linux/input.h>
#include "../../timer/SDL_timer_c.h"
#include "../../events/SDL_events_c.h"
#include "../../events/SDL_scancode_tables_c.h"
#include "../../core/linux/SDL_evdev_capabilities.h"
@ -876,7 +875,9 @@ static int SDL_EVDEV_device_removed(const char *dev_path)
Uint64 SDL_EVDEV_GetEventTimestamp(struct input_event *event)
{
static Uint64 timestamp_offset;
Uint64 timestamp;
Uint64 now = SDL_GetTicksNS();
/* The kernel internally has nanosecond timestamps, but converts it
to microseconds when delivering the events */
@ -884,9 +885,15 @@ Uint64 SDL_EVDEV_GetEventTimestamp(struct input_event *event)
timestamp *= SDL_NS_PER_SECOND;
timestamp += SDL_US_TO_NS(event->time.tv_usec);
/* Let's assume for now that we're using the same time base */
timestamp -= SDL_GetTickStartNS();
if (!timestamp_offset) {
timestamp_offset = (now - timestamp);
}
timestamp += timestamp_offset;
if (timestamp > now) {
timestamp_offset -= (timestamp - now);
timestamp = now;
}
return timestamp;
}