mirror of
https://github.com/brl/mutter.git
synced 2024-11-25 09:30:45 -05:00
screen-cast/src: Record follow up frame after timeout
During animation or other things that cause multiple frames in a row being painted, we might skip recording frames if the max framerate is reached. Doing so means we might end up skipping the last frame in a series, ending with the last frame we sent was not the last one, making things appear to get stuck sometimes. Handle this by creating a timeout if we ever throttle, and at the time the timeout callback is triggered, make sure we eventually send an up to date frame. This is handle differently depending on the source type. A monitor source type reports 1x1 pixel damage on each view its monitor overlaps, while a window source type simply records a frame from the surface directly, except without recording a timestamp, so that timestamps always refer to when damage actually happened. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1361
This commit is contained in:
parent
7adc24d3a6
commit
9bab8e8751
@ -469,6 +469,19 @@ meta_screen_cast_area_stream_src_record_to_framebuffer (MetaScreenCastStreamSrc
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_screen_cast_area_stream_record_follow_up (MetaScreenCastStreamSrc *src)
|
||||||
|
{
|
||||||
|
MetaScreenCastAreaStreamSrc *area_src =
|
||||||
|
META_SCREEN_CAST_AREA_STREAM_SRC (src);
|
||||||
|
MetaScreenCastRecordFlag flags;
|
||||||
|
|
||||||
|
g_clear_handle_id (&area_src->maybe_record_idle_id, g_source_remove);
|
||||||
|
|
||||||
|
flags = META_SCREEN_CAST_RECORD_FLAG_NONE;
|
||||||
|
meta_screen_cast_stream_src_maybe_record_frame (src, flags);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_screen_cast_area_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *src,
|
meta_screen_cast_area_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *src,
|
||||||
struct spa_meta_cursor *spa_meta_cursor)
|
struct spa_meta_cursor *spa_meta_cursor)
|
||||||
@ -584,6 +597,8 @@ meta_screen_cast_area_stream_src_class_init (MetaScreenCastAreaStreamSrcClass *k
|
|||||||
meta_screen_cast_area_stream_src_record_to_buffer;
|
meta_screen_cast_area_stream_src_record_to_buffer;
|
||||||
src_class->record_to_framebuffer =
|
src_class->record_to_framebuffer =
|
||||||
meta_screen_cast_area_stream_src_record_to_framebuffer;
|
meta_screen_cast_area_stream_src_record_to_framebuffer;
|
||||||
|
src_class->record_follow_up =
|
||||||
|
meta_screen_cast_area_stream_record_follow_up;
|
||||||
src_class->set_cursor_metadata =
|
src_class->set_cursor_metadata =
|
||||||
meta_screen_cast_area_stream_src_set_cursor_metadata;
|
meta_screen_cast_area_stream_src_set_cursor_metadata;
|
||||||
}
|
}
|
||||||
|
@ -212,6 +212,9 @@ sync_cursor_state (MetaScreenCastMonitorStreamSrc *monitor_src)
|
|||||||
if (is_redraw_queued (monitor_src))
|
if (is_redraw_queued (monitor_src))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (meta_screen_cast_stream_src_pending_follow_up_frame (src))
|
||||||
|
return;
|
||||||
|
|
||||||
flags = META_SCREEN_CAST_RECORD_FLAG_CURSOR_ONLY;
|
flags = META_SCREEN_CAST_RECORD_FLAG_CURSOR_ONLY;
|
||||||
meta_screen_cast_stream_src_maybe_record_frame (src, flags);
|
meta_screen_cast_stream_src_maybe_record_frame (src, flags);
|
||||||
}
|
}
|
||||||
@ -461,6 +464,44 @@ meta_screen_cast_monitor_stream_src_record_to_framebuffer (MetaScreenCastStreamS
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_screen_cast_monitor_stream_record_follow_up (MetaScreenCastStreamSrc *src)
|
||||||
|
{
|
||||||
|
MetaScreenCastMonitorStreamSrc *monitor_src =
|
||||||
|
META_SCREEN_CAST_MONITOR_STREAM_SRC (src);
|
||||||
|
MetaBackend *backend = get_backend (monitor_src);
|
||||||
|
MetaRenderer *renderer = meta_backend_get_renderer (backend);
|
||||||
|
ClutterStage *stage = get_stage (monitor_src);
|
||||||
|
MetaMonitor *monitor;
|
||||||
|
MetaLogicalMonitor *logical_monitor;
|
||||||
|
MetaRectangle logical_monitor_layout;
|
||||||
|
GList *l;
|
||||||
|
|
||||||
|
monitor = get_monitor (monitor_src);
|
||||||
|
logical_monitor = meta_monitor_get_logical_monitor (monitor);
|
||||||
|
logical_monitor_layout = meta_logical_monitor_get_layout (logical_monitor);
|
||||||
|
|
||||||
|
for (l = meta_renderer_get_views (renderer); l; l = l->next)
|
||||||
|
{
|
||||||
|
MetaRendererView *view = l->data;
|
||||||
|
MetaRectangle view_layout;
|
||||||
|
MetaRectangle damage;
|
||||||
|
|
||||||
|
clutter_stage_view_get_layout (CLUTTER_STAGE_VIEW (view), &view_layout);
|
||||||
|
|
||||||
|
if (!meta_rectangle_overlap (&logical_monitor_layout, &view_layout))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
damage = (cairo_rectangle_int_t) {
|
||||||
|
.x = view_layout.x,
|
||||||
|
.y = view_layout.y,
|
||||||
|
.width = 1,
|
||||||
|
.height = 1,
|
||||||
|
};
|
||||||
|
clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stage), &damage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_screen_cast_monitor_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *src,
|
meta_screen_cast_monitor_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *src,
|
||||||
struct spa_meta_cursor *spa_meta_cursor)
|
struct spa_meta_cursor *spa_meta_cursor)
|
||||||
@ -585,6 +626,8 @@ meta_screen_cast_monitor_stream_src_class_init (MetaScreenCastMonitorStreamSrcCl
|
|||||||
meta_screen_cast_monitor_stream_src_record_to_buffer;
|
meta_screen_cast_monitor_stream_src_record_to_buffer;
|
||||||
src_class->record_to_framebuffer =
|
src_class->record_to_framebuffer =
|
||||||
meta_screen_cast_monitor_stream_src_record_to_framebuffer;
|
meta_screen_cast_monitor_stream_src_record_to_framebuffer;
|
||||||
|
src_class->record_follow_up =
|
||||||
|
meta_screen_cast_monitor_stream_record_follow_up;
|
||||||
src_class->set_cursor_metadata =
|
src_class->set_cursor_metadata =
|
||||||
meta_screen_cast_monitor_stream_src_set_cursor_metadata;
|
meta_screen_cast_monitor_stream_src_set_cursor_metadata;
|
||||||
}
|
}
|
||||||
|
@ -92,6 +92,7 @@ typedef struct _MetaScreenCastStreamSrcPrivate
|
|||||||
int video_stride;
|
int video_stride;
|
||||||
|
|
||||||
int64_t last_frame_timestamp_us;
|
int64_t last_frame_timestamp_us;
|
||||||
|
guint follow_up_frame_source_id;
|
||||||
|
|
||||||
GHashTable *dmabuf_handles;
|
GHashTable *dmabuf_handles;
|
||||||
|
|
||||||
@ -156,6 +157,15 @@ meta_screen_cast_stream_src_record_to_framebuffer (MetaScreenCastStreamSrc *src
|
|||||||
return klass->record_to_framebuffer (src, framebuffer, error);
|
return klass->record_to_framebuffer (src, framebuffer, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_screen_cast_stream_src_record_follow_up (MetaScreenCastStreamSrc *src)
|
||||||
|
{
|
||||||
|
MetaScreenCastStreamSrcClass *klass =
|
||||||
|
META_SCREEN_CAST_STREAM_SRC_GET_CLASS (src);
|
||||||
|
|
||||||
|
klass->record_follow_up (src);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_screen_cast_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *src,
|
meta_screen_cast_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *src,
|
||||||
struct spa_meta_cursor *spa_meta_cursor)
|
struct spa_meta_cursor *spa_meta_cursor)
|
||||||
@ -442,6 +452,43 @@ do_record_frame (MetaScreenCastStreamSrc *src,
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
meta_screen_cast_stream_src_pending_follow_up_frame (MetaScreenCastStreamSrc *src)
|
||||||
|
{
|
||||||
|
MetaScreenCastStreamSrcPrivate *priv =
|
||||||
|
meta_screen_cast_stream_src_get_instance_private (src);
|
||||||
|
|
||||||
|
return priv->follow_up_frame_source_id != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
follow_up_frame_cb (gpointer user_data)
|
||||||
|
{
|
||||||
|
MetaScreenCastStreamSrc *src = user_data;
|
||||||
|
MetaScreenCastStreamSrcPrivate *priv =
|
||||||
|
meta_screen_cast_stream_src_get_instance_private (src);
|
||||||
|
|
||||||
|
priv->follow_up_frame_source_id = 0;
|
||||||
|
meta_screen_cast_stream_src_record_follow_up (src);
|
||||||
|
|
||||||
|
return G_SOURCE_REMOVE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
maybe_schedule_follow_up_frame (MetaScreenCastStreamSrc *src,
|
||||||
|
int64_t timeout_us)
|
||||||
|
{
|
||||||
|
MetaScreenCastStreamSrcPrivate *priv =
|
||||||
|
meta_screen_cast_stream_src_get_instance_private (src);
|
||||||
|
|
||||||
|
if (priv->follow_up_frame_source_id)
|
||||||
|
return;
|
||||||
|
|
||||||
|
priv->follow_up_frame_source_id = g_timeout_add (us2ms (timeout_us),
|
||||||
|
follow_up_frame_cb,
|
||||||
|
src);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src,
|
meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src,
|
||||||
MetaScreenCastRecordFlag flags)
|
MetaScreenCastRecordFlag flags)
|
||||||
@ -457,11 +504,24 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src,
|
|||||||
|
|
||||||
now_us = g_get_monotonic_time ();
|
now_us = g_get_monotonic_time ();
|
||||||
if (priv->video_format.max_framerate.num > 0 &&
|
if (priv->video_format.max_framerate.num > 0 &&
|
||||||
priv->last_frame_timestamp_us != 0 &&
|
priv->last_frame_timestamp_us != 0)
|
||||||
(now_us - priv->last_frame_timestamp_us <
|
{
|
||||||
((1000000 * priv->video_format.max_framerate.denom) /
|
int64_t min_interval_us;
|
||||||
priv->video_format.max_framerate.num)))
|
int64_t time_since_last_frame_us;
|
||||||
|
|
||||||
|
min_interval_us = ((1000000 * priv->video_format.max_framerate.denom) /
|
||||||
|
priv->video_format.max_framerate.num);
|
||||||
|
|
||||||
|
time_since_last_frame_us = now_us - priv->last_frame_timestamp_us;
|
||||||
|
if (time_since_last_frame_us < min_interval_us)
|
||||||
|
{
|
||||||
|
int64_t timeout_us;
|
||||||
|
|
||||||
|
timeout_us = min_interval_us - time_since_last_frame_us;
|
||||||
|
maybe_schedule_follow_up_frame (src, timeout_us);
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!priv->pipewire_stream)
|
if (!priv->pipewire_stream)
|
||||||
return;
|
return;
|
||||||
@ -481,6 +541,7 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src,
|
|||||||
|
|
||||||
if (!(flags & META_SCREEN_CAST_RECORD_FLAG_CURSOR_ONLY))
|
if (!(flags & META_SCREEN_CAST_RECORD_FLAG_CURSOR_ONLY))
|
||||||
{
|
{
|
||||||
|
g_clear_handle_id (&priv->follow_up_frame_source_id, g_source_remove);
|
||||||
if (do_record_frame (src, spa_buffer, data, &error))
|
if (do_record_frame (src, spa_buffer, data, &error))
|
||||||
{
|
{
|
||||||
struct spa_meta_region *spa_meta_video_crop;
|
struct spa_meta_region *spa_meta_video_crop;
|
||||||
|
@ -65,6 +65,8 @@ struct _MetaScreenCastStreamSrcClass
|
|||||||
gboolean (* record_to_framebuffer) (MetaScreenCastStreamSrc *src,
|
gboolean (* record_to_framebuffer) (MetaScreenCastStreamSrc *src,
|
||||||
CoglFramebuffer *framebuffer,
|
CoglFramebuffer *framebuffer,
|
||||||
GError **error);
|
GError **error);
|
||||||
|
void (* record_follow_up) (MetaScreenCastStreamSrc *src);
|
||||||
|
|
||||||
gboolean (* get_videocrop) (MetaScreenCastStreamSrc *src,
|
gboolean (* get_videocrop) (MetaScreenCastStreamSrc *src,
|
||||||
MetaRectangle *crop_rect);
|
MetaRectangle *crop_rect);
|
||||||
void (* set_cursor_metadata) (MetaScreenCastStreamSrc *src,
|
void (* set_cursor_metadata) (MetaScreenCastStreamSrc *src,
|
||||||
@ -74,6 +76,8 @@ struct _MetaScreenCastStreamSrcClass
|
|||||||
void meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src,
|
void meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src,
|
||||||
MetaScreenCastRecordFlag flags);
|
MetaScreenCastRecordFlag flags);
|
||||||
|
|
||||||
|
gboolean meta_screen_cast_stream_src_pending_follow_up_frame (MetaScreenCastStreamSrc *src);
|
||||||
|
|
||||||
int meta_screen_cast_stream_src_get_stride (MetaScreenCastStreamSrc *src);
|
int meta_screen_cast_stream_src_get_stride (MetaScreenCastStreamSrc *src);
|
||||||
|
|
||||||
MetaScreenCastStream * meta_screen_cast_stream_src_get_stream (MetaScreenCastStreamSrc *src);
|
MetaScreenCastStream * meta_screen_cast_stream_src_get_stream (MetaScreenCastStreamSrc *src);
|
||||||
|
@ -509,6 +509,15 @@ meta_screen_cast_window_stream_src_record_to_framebuffer (MetaScreenCastStreamSr
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_screen_cast_window_stream_record_follow_up (MetaScreenCastStreamSrc *src)
|
||||||
|
{
|
||||||
|
MetaScreenCastRecordFlag flags;
|
||||||
|
|
||||||
|
flags = META_SCREEN_CAST_RECORD_FLAG_NONE;
|
||||||
|
meta_screen_cast_stream_src_maybe_record_frame (src, flags);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_screen_cast_window_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *src,
|
meta_screen_cast_window_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *src,
|
||||||
struct spa_meta_cursor *spa_meta_cursor)
|
struct spa_meta_cursor *spa_meta_cursor)
|
||||||
@ -596,6 +605,8 @@ meta_screen_cast_window_stream_src_class_init (MetaScreenCastWindowStreamSrcClas
|
|||||||
meta_screen_cast_window_stream_src_record_to_buffer;
|
meta_screen_cast_window_stream_src_record_to_buffer;
|
||||||
src_class->record_to_framebuffer =
|
src_class->record_to_framebuffer =
|
||||||
meta_screen_cast_window_stream_src_record_to_framebuffer;
|
meta_screen_cast_window_stream_src_record_to_framebuffer;
|
||||||
|
src_class->record_follow_up =
|
||||||
|
meta_screen_cast_window_stream_record_follow_up;
|
||||||
src_class->get_videocrop = meta_screen_cast_window_stream_src_get_videocrop;
|
src_class->get_videocrop = meta_screen_cast_window_stream_src_get_videocrop;
|
||||||
src_class->set_cursor_metadata = meta_screen_cast_window_stream_src_set_cursor_metadata;
|
src_class->set_cursor_metadata = meta_screen_cast_window_stream_src_set_cursor_metadata;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user