mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend-pipewire, libweston: Extract weston_output_arm_frame_timer()

Browse Source 
Extract pipewire_output_arm_timer() into libweston so it can be reused
by the other timer driven backends that use the same delay logic.

Call the shared function weston_output_arm_frame_timer().

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2023-09-18 14:53:39 +02:00 committed by Marius Vlad
parent b51462d001
commit eec50e5aac
3 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libweston/backend-pipewire/pipewire.c
View File

@ -739,24 +739,6 @@ pipewire_submit_buffer(struct pipewire_output *output,
output->seq++;
}
static void
pipewire_output_arm_timer(struct pipewire_output *output)
{
struct weston_compositor *ec = output->base.compositor;
struct timespec now;
struct timespec target;
int refresh_nsec = millihz_to_nsec(output->base.current_mode->refresh);
int64_t delay_nsec;
weston_compositor_read_presentation_clock(ec, &now);
timespec_add_nsec(&target, &output->base.frame_time, refresh_nsec);
delay_nsec = CLIP(timespec_sub_to_nsec(&target, &now), 1, refresh_nsec);
wl_event_source_timer_update(output->finish_frame_timer,
DIV_ROUND_UP(delay_nsec, 1000000));
}
static int
pipewire_output_repaint(struct weston_output *base, pixman_region32_t *damage)
{
@ -787,7 +769,7 @@ pipewire_output_repaint(struct weston_output *base, pixman_region32_t *damage)
out:
pipewire_output_arm_timer(output);
weston_output_arm_frame_timer(base, output->finish_frame_timer);
return 0;
}

4
libweston/backend.h
View File

@ -194,6 +194,10 @@ weston_region_global_to_output(pixman_region32_t *dst,
const struct weston_hdr_metadata_type1 *
weston_output_get_hdr_metadata_type1(const struct weston_output *output);
void
weston_output_arm_frame_timer(struct weston_output *output,
struct wl_event_source *frame_timer);
/* weston_seat */
void

28
libweston/compositor.c
View File

@ -9736,3 +9736,31 @@ weston_renderer_resize_output(struct weston_output *output,
output->name);
}
}
/** Queue a frame timer callback
*
* \param output The output to queue a frame timer callback for.
* \param frame_timer The timer that calls weston_output_finish_frame().
*
* This function calculates the time when the current frame should be completed
* such that frames are spaced out evenly by the specified refresh rate.
*/
WL_EXPORT void
weston_output_arm_frame_timer(struct weston_output *output,
struct wl_event_source *frame_timer)
{
struct weston_compositor *ec = output->compositor;
struct timespec now;
struct timespec target;
int refresh_nsec = millihz_to_nsec(output->current_mode->refresh);
int64_t delay_nsec;
weston_compositor_read_presentation_clock(ec, &now);
timespec_add_nsec(&target, &output->frame_time, refresh_nsec);
delay_nsec = CLIP(timespec_sub_to_nsec(&target, &now), 1, refresh_nsec);
/* The libwayland event source timer API only has msec precision. */
wl_event_source_timer_update(frame_timer,
DIV_ROUND_UP(delay_nsec, 1000000));
}