[mutter] screen-cast: Move cursor metadata setting to generic source
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] screen-cast: Move cursor metadata setting to generic source
- Date: Tue, 26 Feb 2019 13:51:38 +0000 (UTC)
commit 9be189daa728cac44d8ae14c887239d1f922bed2
Author: Jonas Ådahl <jadahl gmail com>
Date: Mon Jan 21 14:32:05 2019 +0100
screen-cast: Move cursor metadata setting to generic source
Make the monitor implementation do things strictly related to its own
source type, leaving the Spa related logic and cursor read back in the
generic layer, later to be reused by the window source type
implementation.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/413
src/backends/meta-screen-cast-monitor-stream-src.c | 162 +++--------------
src/backends/meta-screen-cast-stream-src.c | 196 +++++++++++++++++++++
src/backends/meta-screen-cast-stream-src.h | 20 +++
3 files changed, 241 insertions(+), 137 deletions(-)
---
diff --git a/src/backends/meta-screen-cast-monitor-stream-src.c
b/src/backends/meta-screen-cast-monitor-stream-src.c
index 036c573a5..cb9823148 100644
--- a/src/backends/meta-screen-cast-monitor-stream-src.c
+++ b/src/backends/meta-screen-cast-monitor-stream-src.c
@@ -344,64 +344,6 @@ meta_screen_cast_monitor_stream_src_record_frame (MetaScreenCastStreamSrc *src,
return TRUE;
}
-static gboolean
-draw_cursor_sprite_via_offscreen (MetaScreenCastMonitorStreamSrc *monitor_src,
- CoglTexture *cursor_texture,
- int bitmap_width,
- int bitmap_height,
- uint32_t *bitmap_data,
- GError **error)
-{
- MetaBackend *backend = get_backend (monitor_src);
- ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);
- CoglContext *cogl_context =
- clutter_backend_get_cogl_context (clutter_backend);
- CoglTexture2D *bitmap_texture;
- CoglOffscreen *offscreen;
- CoglFramebuffer *fb;
- CoglPipeline *pipeline;
- CoglColor clear_color;
-
- bitmap_texture = cogl_texture_2d_new_with_size (cogl_context,
- bitmap_width, bitmap_height);
- cogl_primitive_texture_set_auto_mipmap (COGL_PRIMITIVE_TEXTURE (bitmap_texture),
- FALSE);
- if (!cogl_texture_allocate (COGL_TEXTURE (bitmap_texture), error))
- {
- cogl_object_unref (bitmap_texture);
- return FALSE;
- }
-
- offscreen = cogl_offscreen_new_with_texture (COGL_TEXTURE (bitmap_texture));
- fb = COGL_FRAMEBUFFER (offscreen);
- cogl_object_unref (bitmap_texture);
- if (!cogl_framebuffer_allocate (fb, error))
- {
- cogl_object_unref (fb);
- return FALSE;
- }
-
- pipeline = cogl_pipeline_new (cogl_context);
- cogl_pipeline_set_layer_texture (pipeline, 0, cursor_texture);
- cogl_pipeline_set_layer_filters (pipeline, 0,
- COGL_PIPELINE_FILTER_LINEAR,
- COGL_PIPELINE_FILTER_LINEAR);
- cogl_color_init_from_4ub (&clear_color, 0, 0, 0, 0);
- cogl_framebuffer_clear (fb, COGL_BUFFER_BIT_COLOR, &clear_color);
- cogl_framebuffer_draw_rectangle (fb, pipeline,
- -1, 1, 1, -1);
- cogl_object_unref (pipeline);
-
- cogl_framebuffer_read_pixels (fb,
- 0, 0,
- bitmap_width, bitmap_height,
- COGL_PIXEL_FORMAT_RGBA_8888_PRE,
- (uint8_t *) bitmap_data);
- cogl_object_unref (fb);
-
- return TRUE;
-}
-
static void
meta_screen_cast_monitor_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *src,
struct spa_meta_cursor *spa_meta_cursor)
@@ -412,10 +354,7 @@ meta_screen_cast_monitor_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc
MetaCursorRenderer *cursor_renderer =
meta_backend_get_cursor_renderer (backend);
MetaRenderer *renderer = meta_backend_get_renderer (backend);
- MetaSpaType *spa_type = meta_screen_cast_stream_src_get_spa_type (src);
- GError *error = NULL;
MetaCursorSprite *cursor_sprite;
- CoglTexture *cursor_texture;
MetaMonitor *monitor;
MetaLogicalMonitor *logical_monitor;
MetaRectangle logical_monitor_layout;
@@ -423,17 +362,14 @@ meta_screen_cast_monitor_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc
MetaRendererView *view;
float view_scale;
ClutterPoint cursor_position;
- struct spa_meta_bitmap *spa_meta_bitmap;
+ int x, y;
cursor_sprite = meta_cursor_renderer_get_cursor (cursor_renderer);
- if (cursor_sprite)
- cursor_texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
- else
- cursor_texture = NULL;
if (!is_cursor_in_stream (monitor_src))
{
- spa_meta_cursor->id = 0;
+ meta_screen_cast_stream_src_unset_cursor_metadata (src,
+ spa_meta_cursor);
return;
}
@@ -456,86 +392,38 @@ meta_screen_cast_monitor_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc
cursor_position.x *= view_scale;
cursor_position.y *= view_scale;
- spa_meta_cursor->id = 1;
- spa_meta_cursor->position.x = (int32_t) roundf (cursor_position.x);
- spa_meta_cursor->position.y = (int32_t) roundf (cursor_position.y);
+ x = (int) roundf (cursor_position.x);
+ y = (int) roundf (cursor_position.y);
- if (!monitor_src->cursor_bitmap_invalid)
+ if (monitor_src->cursor_bitmap_invalid)
{
- spa_meta_cursor->hotspot.x = 0;
- spa_meta_cursor->hotspot.y = 0;
- spa_meta_cursor->bitmap_offset = 0;
- return;
- }
- monitor_src->cursor_bitmap_invalid = FALSE;
-
- spa_meta_cursor->bitmap_offset = sizeof (struct spa_meta_cursor);
-
- spa_meta_bitmap = SPA_MEMBER (spa_meta_cursor,
- spa_meta_cursor->bitmap_offset,
- struct spa_meta_bitmap);
- spa_meta_bitmap->format = spa_type->video_format.RGBA;
- spa_meta_bitmap->offset = sizeof (struct spa_meta_bitmap);
-
- if (cursor_texture)
- {
- float cursor_scale;
- float bitmap_scale;
- int hotspot_x, hotspot_y;
- int texture_width, texture_height;
- int bitmap_width, bitmap_height;
- uint32_t *bitmap_data;
-
- cursor_scale = meta_cursor_sprite_get_texture_scale (cursor_sprite);
- bitmap_scale = view_scale * cursor_scale;
-
- meta_cursor_sprite_get_hotspot (cursor_sprite, &hotspot_x, &hotspot_y);
- spa_meta_cursor->hotspot.x = (int32_t) roundf (hotspot_x * bitmap_scale);
- spa_meta_cursor->hotspot.y = (int32_t) roundf (hotspot_y * bitmap_scale);
-
- texture_width = cogl_texture_get_width (cursor_texture);
- texture_height = cogl_texture_get_height (cursor_texture);
- bitmap_width = texture_width * bitmap_scale;
- bitmap_height = texture_height * bitmap_scale;
-
- spa_meta_bitmap->size.width = bitmap_width;
- spa_meta_bitmap->size.height = bitmap_height;
- spa_meta_bitmap->stride = bitmap_width * 4;
-
- bitmap_data = SPA_MEMBER (spa_meta_bitmap,
- spa_meta_bitmap->offset,
- uint32_t);
-
- if (texture_width == bitmap_width &&
- texture_height == bitmap_height)
+ if (cursor_sprite)
{
- cogl_texture_get_data (cursor_texture,
- COGL_PIXEL_FORMAT_RGBA_8888_PRE,
- texture_width * 4,
- (uint8_t *) bitmap_data);
+ float cursor_scale;
+ float scale;
+
+ cursor_scale = meta_cursor_sprite_get_texture_scale (cursor_sprite);
+ scale = view_scale * cursor_scale;
+ meta_screen_cast_stream_src_set_cursor_sprite_metadata (src,
+ spa_meta_cursor,
+ cursor_sprite,
+ x, y,
+ scale);
}
else
{
- if (!draw_cursor_sprite_via_offscreen (monitor_src,
- cursor_texture,
- bitmap_width,
- bitmap_height,
- bitmap_data,
- &error))
- {
- g_warning ("Failed to draw cursor via offscreen: %s",
- error->message);
- g_error_free (error);
- spa_meta_cursor->id = 0;
- }
+ meta_screen_cast_stream_src_set_empty_cursor_sprite_metadata (src,
+ spa_meta_cursor,
+ x, y);
}
+
+ monitor_src->cursor_bitmap_invalid = FALSE;
}
else
{
- spa_meta_cursor->hotspot.x = 0;
- spa_meta_cursor->hotspot.y = 0;
-
- *spa_meta_bitmap = (struct spa_meta_bitmap) { 0 };
+ meta_screen_cast_stream_src_set_cursor_position_metadata (src,
+ spa_meta_cursor,
+ x, y);
}
}
diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c
index 7e11bd067..ba800debf 100644
--- a/src/backends/meta-screen-cast-stream-src.c
+++ b/src/backends/meta-screen-cast-stream-src.c
@@ -32,6 +32,7 @@
#include <stdint.h>
#include <sys/mman.h>
+#include "backends/meta-screen-cast-session.h"
#include "backends/meta-screen-cast-stream.h"
#include "clutter/clutter-mutter.h"
#include "core/meta-fraction.h"
@@ -159,6 +160,201 @@ meta_screen_cast_stream_src_get_spa_type (MetaScreenCastStreamSrc *src)
return &priv->spa_type;
}
+static gboolean
+draw_cursor_sprite_via_offscreen (MetaScreenCastStreamSrc *src,
+ CoglTexture *cursor_texture,
+ int bitmap_width,
+ int bitmap_height,
+ uint32_t *bitmap_data,
+ GError **error)
+{
+ MetaScreenCastStream *stream = meta_screen_cast_stream_src_get_stream (src);
+ MetaScreenCastSession *session = meta_screen_cast_stream_get_session (stream);
+ MetaScreenCast *screen_cast =
+ meta_screen_cast_session_get_screen_cast (session);
+ MetaBackend *backend = meta_screen_cast_get_backend (screen_cast);
+ ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);
+ CoglContext *cogl_context =
+ clutter_backend_get_cogl_context (clutter_backend);
+ CoglTexture2D *bitmap_texture;
+ CoglOffscreen *offscreen;
+ CoglFramebuffer *fb;
+ CoglPipeline *pipeline;
+ CoglColor clear_color;
+
+ bitmap_texture = cogl_texture_2d_new_with_size (cogl_context,
+ bitmap_width, bitmap_height);
+ cogl_primitive_texture_set_auto_mipmap (COGL_PRIMITIVE_TEXTURE (bitmap_texture),
+ FALSE);
+ if (!cogl_texture_allocate (COGL_TEXTURE (bitmap_texture), error))
+ {
+ cogl_object_unref (bitmap_texture);
+ return FALSE;
+ }
+
+ offscreen = cogl_offscreen_new_with_texture (COGL_TEXTURE (bitmap_texture));
+ fb = COGL_FRAMEBUFFER (offscreen);
+ cogl_object_unref (bitmap_texture);
+ if (!cogl_framebuffer_allocate (fb, error))
+ {
+ cogl_object_unref (fb);
+ return FALSE;
+ }
+
+ pipeline = cogl_pipeline_new (cogl_context);
+ cogl_pipeline_set_layer_texture (pipeline, 0, cursor_texture);
+ cogl_pipeline_set_layer_filters (pipeline, 0,
+ COGL_PIPELINE_FILTER_LINEAR,
+ COGL_PIPELINE_FILTER_LINEAR);
+ cogl_color_init_from_4ub (&clear_color, 0, 0, 0, 0);
+ cogl_framebuffer_clear (fb, COGL_BUFFER_BIT_COLOR, &clear_color);
+ cogl_framebuffer_draw_rectangle (fb, pipeline,
+ -1, 1, 1, -1);
+ cogl_object_unref (pipeline);
+
+ cogl_framebuffer_read_pixels (fb,
+ 0, 0,
+ bitmap_width, bitmap_height,
+ COGL_PIXEL_FORMAT_RGBA_8888_PRE,
+ (uint8_t *) bitmap_data);
+ cogl_object_unref (fb);
+
+ return TRUE;
+}
+
+void
+meta_screen_cast_stream_src_unset_cursor_metadata (MetaScreenCastStreamSrc *src,
+ struct spa_meta_cursor *spa_meta_cursor)
+{
+ spa_meta_cursor->id = 1;
+}
+
+void
+meta_screen_cast_stream_src_set_cursor_position_metadata (MetaScreenCastStreamSrc *src,
+ struct spa_meta_cursor *spa_meta_cursor,
+ int x,
+ int y)
+{
+ spa_meta_cursor->id = 1;
+ spa_meta_cursor->position.x = x;
+ spa_meta_cursor->position.y = y;
+ spa_meta_cursor->hotspot.x = 0;
+ spa_meta_cursor->hotspot.y = 0;
+ spa_meta_cursor->bitmap_offset = 0;
+}
+
+void
+meta_screen_cast_stream_src_set_empty_cursor_sprite_metadata (MetaScreenCastStreamSrc *src,
+ struct spa_meta_cursor *spa_meta_cursor,
+ int x,
+ int y)
+{
+ MetaScreenCastStreamSrcPrivate *priv =
+ meta_screen_cast_stream_src_get_instance_private (src);
+ MetaSpaType *spa_type = &priv->spa_type;
+ struct spa_meta_bitmap *spa_meta_bitmap;
+
+ spa_meta_cursor->id = 1;
+ spa_meta_cursor->position.x = x;
+ spa_meta_cursor->position.y = y;
+
+ spa_meta_cursor->bitmap_offset = sizeof (struct spa_meta_cursor);
+
+ spa_meta_bitmap = SPA_MEMBER (spa_meta_cursor,
+ spa_meta_cursor->bitmap_offset,
+ struct spa_meta_bitmap);
+ spa_meta_bitmap->format = spa_type->video_format.RGBA;
+ spa_meta_bitmap->offset = sizeof (struct spa_meta_bitmap);
+
+ spa_meta_cursor->hotspot.x = 0;
+ spa_meta_cursor->hotspot.y = 0;
+
+ *spa_meta_bitmap = (struct spa_meta_bitmap) { 0 };
+}
+
+void
+meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStreamSrc *src,
+ struct spa_meta_cursor *spa_meta_cursor,
+ MetaCursorSprite *cursor_sprite,
+ int x,
+ int y,
+ float scale)
+{
+ MetaScreenCastStreamSrcPrivate *priv =
+ meta_screen_cast_stream_src_get_instance_private (src);
+ MetaSpaType *spa_type = &priv->spa_type;
+ CoglTexture *cursor_texture;
+ struct spa_meta_bitmap *spa_meta_bitmap;
+ int hotspot_x, hotspot_y;
+ int texture_width, texture_height;
+ int bitmap_width, bitmap_height;
+ uint32_t *bitmap_data;
+
+ cursor_texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
+ if (!cursor_texture)
+ {
+ meta_screen_cast_stream_src_set_empty_cursor_sprite_metadata (src,
+ spa_meta_cursor,
+ x, y);
+ return;
+ }
+
+ spa_meta_cursor->id = 1;
+ spa_meta_cursor->position.x = x;
+ spa_meta_cursor->position.y = y;
+
+ spa_meta_cursor->bitmap_offset = sizeof (struct spa_meta_cursor);
+
+ spa_meta_bitmap = SPA_MEMBER (spa_meta_cursor,
+ spa_meta_cursor->bitmap_offset,
+ struct spa_meta_bitmap);
+ spa_meta_bitmap->format = spa_type->video_format.RGBA;
+ spa_meta_bitmap->offset = sizeof (struct spa_meta_bitmap);
+
+ meta_cursor_sprite_get_hotspot (cursor_sprite, &hotspot_x, &hotspot_y);
+ spa_meta_cursor->hotspot.x = (int32_t) roundf (hotspot_x * scale);
+ spa_meta_cursor->hotspot.y = (int32_t) roundf (hotspot_y * scale);
+
+ texture_width = cogl_texture_get_width (cursor_texture);
+ texture_height = cogl_texture_get_height (cursor_texture);
+ bitmap_width = texture_width * scale;
+ bitmap_height = texture_height * scale;
+
+ spa_meta_bitmap->size.width = bitmap_width;
+ spa_meta_bitmap->size.height = bitmap_height;
+ spa_meta_bitmap->stride = bitmap_width * 4;
+
+ bitmap_data = SPA_MEMBER (spa_meta_bitmap,
+ spa_meta_bitmap->offset,
+ uint32_t);
+
+ if (texture_width == bitmap_width &&
+ texture_height == bitmap_height)
+ {
+ cogl_texture_get_data (cursor_texture,
+ COGL_PIXEL_FORMAT_RGBA_8888_PRE,
+ texture_width * 4,
+ (uint8_t *) bitmap_data);
+ }
+ else
+ {
+ GError *error = NULL;
+
+ if (!draw_cursor_sprite_via_offscreen (src,
+ cursor_texture,
+ bitmap_width,
+ bitmap_height,
+ bitmap_data,
+ &error))
+ {
+ g_warning ("Failed to draw cursor via offscreen: %s",
+ error->message);
+ g_error_free (error);
+ spa_meta_cursor->id = 0;
+ }
+ }
+}
+
static void
add_cursor_metadata (MetaScreenCastStreamSrc *src,
struct spa_buffer *spa_buffer)
diff --git a/src/backends/meta-screen-cast-stream-src.h b/src/backends/meta-screen-cast-stream-src.h
index f2f96f213..108582893 100644
--- a/src/backends/meta-screen-cast-stream-src.h
+++ b/src/backends/meta-screen-cast-stream-src.h
@@ -76,4 +76,24 @@ MetaScreenCastStream * meta_screen_cast_stream_src_get_stream (MetaScreenCastStr
MetaSpaType * meta_screen_cast_stream_src_get_spa_type (MetaScreenCastStreamSrc *src);
+void meta_screen_cast_stream_src_unset_cursor_metadata (MetaScreenCastStreamSrc *src,
+ struct spa_meta_cursor *spa_meta_cursor);
+
+void meta_screen_cast_stream_src_set_cursor_position_metadata (MetaScreenCastStreamSrc *src,
+ struct spa_meta_cursor *spa_meta_cursor,
+ int x,
+ int y);
+
+void meta_screen_cast_stream_src_set_empty_cursor_sprite_metadata (MetaScreenCastStreamSrc *src,
+ struct spa_meta_cursor *spa_meta_cursor,
+ int x,
+ int y);
+
+void meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStreamSrc *src,
+ struct spa_meta_cursor *spa_meta_cursor,
+ MetaCursorSprite *cursor_sprite,
+ int x,
+ int y,
+ float scale);
+
#endif /* META_SCREEN_CAST_STREAM_SRC_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
