brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screen-cast/window: Only record cursor updates if anything changed

Browse Source 
If we're doing a cursor-only update, only actually do it if anything
changed relative to the stream itself.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3803>
This commit is contained in:
Jonas Ådahl 2024-06-11 16:46:07 +02:00 committed by Marge Bot
parent 897c535bd8
commit 9d11cc679e
1 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/backends/meta-screen-cast-window-stream-src.c
View File

@ -40,6 +40,12 @@ struct _MetaScreenCastWindowStreamSrc
gulong prepare_frame_handler_id; gulong prepare_frame_handler_id;
gboolean cursor_bitmap_invalid; gboolean cursor_bitmap_invalid;
struct {
gboolean set;
int x;
int y;
} last_cursor_matadata;
}; };
G_DEFINE_TYPE (MetaScreenCastWindowStreamSrc, G_DEFINE_TYPE (MetaScreenCastWindowStreamSrc,
@ -570,6 +576,51 @@ meta_screen_cast_window_stream_record_follow_up (MetaScreenCastStreamSrc *src)
NULL); NULL);
} }
static gboolean
meta_screen_cast_window_stream_src_is_cursor_metadata_valid (MetaScreenCastStreamSrc *src)
{
MetaScreenCastWindowStreamSrc *window_src =
META_SCREEN_CAST_WINDOW_STREAM_SRC (src);
MetaScreenCastWindow *screen_cast_window = window_src->screen_cast_window;
MetaBackend *backend = get_backend (window_src);
MetaCursorRenderer *cursor_renderer =
meta_backend_get_cursor_renderer (backend);
MetaCursorTracker *cursor_tracker =
meta_backend_get_cursor_tracker (backend);
MetaCursorSprite *cursor_sprite;
graphene_point_t cursor_position;
graphene_point_t relative_cursor_position;
cursor_sprite = meta_cursor_renderer_get_cursor (cursor_renderer);
meta_cursor_tracker_get_pointer (cursor_tracker, &cursor_position, NULL);
if (meta_cursor_tracker_get_pointer_visible (cursor_tracker) &&
meta_screen_cast_window_transform_cursor_position (screen_cast_window,
cursor_sprite,
&cursor_position,
NULL, NULL,
&relative_cursor_position))
{
int x, y;
if (!window_src->last_cursor_matadata.set)
return FALSE;
if (window_src->cursor_bitmap_invalid)
return FALSE;
x = (int) roundf (relative_cursor_position.x);
y = (int) roundf (relative_cursor_position.y);
return (window_src->last_cursor_matadata.x == x &&
window_src->last_cursor_matadata.y == y);
}
else
{
return !window_src->last_cursor_matadata.set;
}
}
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)
@ -600,6 +651,7 @@ meta_screen_cast_window_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc
&transform, &transform,
&relative_cursor_position)) &relative_cursor_position))
{ {
window_src->last_cursor_matadata.set = FALSE;
meta_screen_cast_stream_src_unset_cursor_metadata (src, meta_screen_cast_stream_src_unset_cursor_metadata (src,
spa_meta_cursor); spa_meta_cursor);
return; return;
@ -608,6 +660,10 @@ meta_screen_cast_window_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc
x = (int) roundf (relative_cursor_position.x); x = (int) roundf (relative_cursor_position.x);
y = (int) roundf (relative_cursor_position.y); y = (int) roundf (relative_cursor_position.y);
window_src->last_cursor_matadata.set = TRUE;
window_src->last_cursor_matadata.x = x;
window_src->last_cursor_matadata.y = y;
if (window_src->cursor_bitmap_invalid) if (window_src->cursor_bitmap_invalid)
{ {
if (cursor_sprite) if (cursor_sprite)
@ -672,6 +728,8 @@ meta_screen_cast_window_stream_src_class_init (MetaScreenCastWindowStreamSrcClas
src_class->record_follow_up = src_class->record_follow_up =
meta_screen_cast_window_stream_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->is_cursor_metadata_valid =
meta_screen_cast_window_stream_src_is_cursor_metadata_valid;
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;
src_class->get_preferred_format = src_class->get_preferred_format =
meta_screen_cast_window_stream_src_get_preferred_format; meta_screen_cast_window_stream_src_get_preferred_format;