|
 |
e82d74 |
From b32ae04c122f4f76ffad296c15ba00a13800db57 Mon Sep 17 00:00:00 2001
|
|
|
e82d74 |
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
|
e82d74 |
Date: Tue, 2 Jun 2020 16:33:05 +0000
|
|
|
e82d74 |
Subject: [PATCH 1/2] screen-cast-src: Destroy hash dmabuf table after stream
|
|
|
e82d74 |
|
|
|
e82d74 |
The stream will clean up the buffers, so let it do that before we
|
|
|
e82d74 |
destroy them under its feet. Note that it'll only do this after the
|
|
|
e82d74 |
following PipeWire commit:
|
|
|
e82d74 |
|
|
|
e82d74 |
commit fbaa4ddedd84afdffca16f090dcc4b0db8ccfc29
|
|
|
e82d74 |
Author: Wim Taymans <wtaymans@redhat.com>
|
|
|
e82d74 |
Date: Mon Jun 1 15:36:09 2020 +0200
|
|
|
e82d74 |
|
|
|
e82d74 |
stream: allow NULL param and 0 buffers in disconnect
|
|
|
e82d74 |
|
|
|
e82d74 |
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1283
|
|
|
e82d74 |
|
|
|
e82d74 |
|
|
|
e82d74 |
(cherry picked from commit 97175f8fa14171606ecb95d0bf107ef8b2d71b74)
|
|
|
e82d74 |
---
|
|
|
e82d74 |
src/backends/meta-screen-cast-stream-src.c | 2 +-
|
|
|
e82d74 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
e82d74 |
|
|
|
e82d74 |
diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c
|
|
|
e82d74 |
index 0500bfec5..ff4af440c 100644
|
|
|
e82d74 |
--- a/src/backends/meta-screen-cast-stream-src.c
|
|
|
e82d74 |
+++ b/src/backends/meta-screen-cast-stream-src.c
|
|
|
e82d74 |
@@ -988,8 +988,8 @@ meta_screen_cast_stream_src_finalize (GObject *object)
|
|
|
e82d74 |
if (meta_screen_cast_stream_src_is_enabled (src))
|
|
|
e82d74 |
meta_screen_cast_stream_src_disable (src);
|
|
|
e82d74 |
|
|
|
e82d74 |
- g_clear_pointer (&priv->dmabuf_handles, g_hash_table_destroy);
|
|
|
e82d74 |
g_clear_pointer (&priv->pipewire_stream, pw_stream_destroy);
|
|
|
e82d74 |
+ g_clear_pointer (&priv->dmabuf_handles, g_hash_table_destroy);
|
|
|
e82d74 |
g_clear_pointer (&priv->pipewire_core, pw_core_disconnect);
|
|
|
e82d74 |
g_clear_pointer (&priv->pipewire_context, pw_context_destroy);
|
|
|
e82d74 |
g_source_destroy (&priv->pipewire_source->base);
|
|
|
e82d74 |
--
|
|
|
e82d74 |
2.26.2
|
|
|
e82d74 |
|