isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

frame-clock: Pass frame info when notifying presented

Browse Source 
Instead of just the timestamp, pass the frame info struct we already,
that also include refresh rate.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1285
This commit is contained in:
Jonas Ådahl 2020-05-20 22:10:31 +02:00
parent f086eafe57
commit ff65c95aee
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter/clutter-frame-clock.c
View File

@ -164,8 +164,10 @@ maybe_reschedule_update (ClutterFrameClock *frame_clock)
void void
clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock, clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock,
int64_t presentation_time_us) ClutterFrameInfo *frame_info)
{ {
int64_t presentation_time_us = frame_info->presentation_time;
if (presentation_time_us > frame_clock->last_presentation_time_us || if (presentation_time_us > frame_clock->last_presentation_time_us ||
((presentation_time_us - frame_clock->last_presentation_time_us) > ((presentation_time_us - frame_clock->last_presentation_time_us) >
INT64_MAX / 2)) INT64_MAX / 2))

2
clutter/clutter/clutter-frame-clock.h
View File

@ -54,7 +54,7 @@ ClutterFrameClock * clutter_frame_clock_new (float re
CLUTTER_EXPORT CLUTTER_EXPORT
void clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock, void clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock,
int64_t presentation_time_us); ClutterFrameInfo *frame_info);
CLUTTER_EXPORT CLUTTER_EXPORT
void clutter_frame_clock_schedule_update (ClutterFrameClock *frame_clock); void clutter_frame_clock_schedule_update (ClutterFrameClock *frame_clock);

8
src/tests/clutter/conform/frame-clock-timeline.c
View File

@ -10,7 +10,13 @@ timeline_frame_clock_frame (ClutterFrameClock *frame_clock,
int64_t time_us, int64_t time_us,
gpointer user_data) gpointer user_data)
{ {
clutter_frame_clock_notify_presented (frame_clock, g_get_monotonic_time ()); ClutterFrameInfo frame_info;
frame_info = (ClutterFrameInfo) {
.presentation_time = g_get_monotonic_time (),
.refresh_rate = refresh_rate,
};
clutter_frame_clock_notify_presented (frame_clock, &frame_info);
clutter_frame_clock_schedule_update (frame_clock); clutter_frame_clock_schedule_update (frame_clock);
return CLUTTER_FRAME_RESULT_PENDING_PRESENTED; return CLUTTER_FRAME_RESULT_PENDING_PRESENTED;

28
src/tests/clutter/conform/frame-clock.c
View File

@ -25,6 +25,16 @@ typedef struct _FrameClockTest
GMainLoop *main_loop; GMainLoop *main_loop;
} FrameClockTest; } FrameClockTest;
static void
init_frame_info (ClutterFrameInfo *frame_info,
int64_t presentation_time_us)
{
*frame_info = (ClutterFrameInfo) {
.presentation_time = presentation_time_us,
.refresh_rate = refresh_rate,
};
}
static gboolean static gboolean
fake_hw_clock_source_dispatch (GSource *source, fake_hw_clock_source_dispatch (GSource *source,
GSourceFunc callback, GSourceFunc callback,
@ -35,9 +45,11 @@ fake_hw_clock_source_dispatch (GSource *source,
if (fake_hw_clock->has_pending_present) if (fake_hw_clock->has_pending_present)
{ {
ClutterFrameInfo frame_info;
fake_hw_clock->has_pending_present = FALSE; fake_hw_clock->has_pending_present = FALSE;
clutter_frame_clock_notify_presented (frame_clock, init_frame_info (&frame_info, g_source_get_time (source));
g_source_get_time (source)); clutter_frame_clock_notify_presented (frame_clock, &frame_info);
if (callback) if (callback)
callback (user_data); callback (user_data);
} }
@ -176,6 +188,7 @@ immediate_frame_clock_frame (ClutterFrameClock *frame_clock,
gpointer user_data) gpointer user_data)
{ {
GMainLoop *main_loop = user_data; GMainLoop *main_loop = user_data;
ClutterFrameInfo frame_info;
g_assert_cmpint (frame_count, ==, expected_frame_count); g_assert_cmpint (frame_count, ==, expected_frame_count);
@ -189,7 +202,8 @@ immediate_frame_clock_frame (ClutterFrameClock *frame_clock,
test_frame_count--; test_frame_count--;
clutter_frame_clock_notify_presented (frame_clock, g_get_monotonic_time ()); init_frame_info (&frame_info, g_get_monotonic_time ());
clutter_frame_clock_notify_presented (frame_clock, &frame_info);
g_idle_add (schedule_update_idle, frame_clock); g_idle_add (schedule_update_idle, frame_clock);
return CLUTTER_FRAME_RESULT_PENDING_PRESENTED; return CLUTTER_FRAME_RESULT_PENDING_PRESENTED;
@ -480,12 +494,14 @@ before_frame_frame_clock_frame (ClutterFrameClock *frame_clock,
gpointer user_data) gpointer user_data)
{ {
int64_t *expected_frame_count = user_data; int64_t *expected_frame_count = user_data;
ClutterFrameInfo frame_info;
g_assert_cmpint (*expected_frame_count, ==, frame_count); g_assert_cmpint (*expected_frame_count, ==, frame_count);
(*expected_frame_count)++; (*expected_frame_count)++;
clutter_frame_clock_notify_presented (frame_clock, g_get_monotonic_time ()); init_frame_info (&frame_info, g_get_monotonic_time ());
clutter_frame_clock_notify_presented (frame_clock, &frame_info);
clutter_frame_clock_schedule_update (frame_clock); clutter_frame_clock_schedule_update (frame_clock);
return CLUTTER_FRAME_RESULT_PENDING_PRESENTED; return CLUTTER_FRAME_RESULT_PENDING_PRESENTED;
@ -547,12 +563,14 @@ inhibit_frame_clock_frame (ClutterFrameClock *frame_clock,
gpointer user_data) gpointer user_data)
{ {
InhibitTest *test = user_data; InhibitTest *test = user_data;
ClutterFrameInfo frame_info;
g_assert_cmpint (frame_count, ==, test->frame_count); g_assert_cmpint (frame_count, ==, test->frame_count);
test->frame_count++; test->frame_count++;
clutter_frame_clock_notify_presented (frame_clock, g_get_monotonic_time ()); init_frame_info (&frame_info, g_get_monotonic_time ());
clutter_frame_clock_notify_presented (frame_clock, &frame_info);
clutter_frame_clock_schedule_update (frame_clock); clutter_frame_clock_schedule_update (frame_clock);
if (test->pending_inhibit) if (test->pending_inhibit)