summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuqing Zhu <b54851@freescale.com>2016-01-28 17:02:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-31 13:29:48 +0000
commit2724908252c844c4540340c3bef48284f5b12d08 (patch)
tree7b0d0fe69f3040433f14d4127a79c95801df990f
parentdb81fc967ae046bbb00f2347377fb521c06bf22b (diff)
downloadpoky-2724908252c844c4540340c3bef48284f5b12d08.tar.gz
gstreamer1.0-plugins-bad: Fix memory leak of navigation thread
When exit navigation thread, call g_thread_join() to release the resource hold by it. (From OE-Core rev: 1be9bfb4f74674268a21089df3db220a4f54f8c5) Signed-off-by: Yuqing Zhu <b54851@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch35
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch
new file mode 100755
index 0000000000..3491a15e65
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch
@@ -0,0 +1,35 @@
1From 95cda7fbcf1a81289d9315c801c8e2b3d896f4cb Mon Sep 17 00:00:00 2001
2From: Haihua Hu <b55597@freescale.com>
3Date: Mon, 30 Nov 2015 09:36:09 +0800
4Subject: [PATCH 2/5] [glplugin] glwindow: fix memory leak of navigation
5 thread
6
7When exit navigation thread, call g_thread_join() to release
8the resource hold by it.
9
10Upstream-Status: Backport [1.7.1]
11
12bugzilla URL: https://bugzilla.gnome.org/show_bug.cgi?id=758820
13
14Signed-off-by: Haihua Hu <b55597@freescale.com>
15---
16 gst-libs/gst/gl/gstglwindow.c | 3 +++
17 1 file changed, 3 insertions(+)
18
19diff --git a/gst-libs/gst/gl/gstglwindow.c b/gst-libs/gst/gl/gstglwindow.c
20index 44b74ca..42ef296 100644
21--- a/gst-libs/gst/gl/gstglwindow.c
22+++ b/gst-libs/gst/gl/gstglwindow.c
23@@ -343,6 +343,9 @@ gst_gl_window_finalize (GObject * object)
24 while (window->nav_alive) {
25 g_cond_wait (&window->nav_destroy_cond, &window->nav_lock);
26 }
27+ /* release resource hold by navigation thread */
28+ g_thread_join(window->priv->navigation_thread);
29+ window->priv->navigation_thread = NULL;
30 g_mutex_unlock (&window->nav_lock);
31 }
32
33--
341.7.9.5
35
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
index 4b9143f2c9..c51a637dce 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
@@ -9,6 +9,7 @@ SRC_URI = " \
9 http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ 9 http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
10 file://configure-allow-to-disable-libssh2.patch \ 10 file://configure-allow-to-disable-libssh2.patch \
11 file://0001-glimagesink-Downrank-to-marginal.patch \ 11 file://0001-glimagesink-Downrank-to-marginal.patch \
12 file://0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch \
12" 13"
13 14
14SRC_URI[md5sum] = "4857adcafe41e4b9b8805cf88303bd55" 15SRC_URI[md5sum] = "4857adcafe41e4b9b8805cf88303bd55"