diff options
| author | Yuqing Zhu <b54851@freescale.com> | 2016-01-28 17:02:47 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-31 13:29:37 +0000 |
| commit | 1be9bfb4f74674268a21089df3db220a4f54f8c5 (patch) | |
| tree | 7147284325732c1e546f7184f08af27665260c61 /meta/recipes-multimedia | |
| parent | 25477874ef737777cedc623a8e1c5aedf2f4bae1 (diff) | |
| download | openembedded-core-1be9bfb4f74674268a21089df3db220a4f54f8c5.tar.gz openembedded-core-1be9bfb4f74674268a21089df3db220a4f54f8c5.tar.bz2 openembedded-core-1be9bfb4f74674268a21089df3db220a4f54f8c5.zip | |
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.
Signed-off-by: Yuqing Zhu <b54851@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
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 @@ +From 95cda7fbcf1a81289d9315c801c8e2b3d896f4cb Mon Sep 17 00:00:00 2001 +From: Haihua Hu <b55597@freescale.com> +Date: Mon, 30 Nov 2015 09:36:09 +0800 +Subject: [PATCH 2/5] [glplugin] glwindow: fix memory leak of navigation + thread + +When exit navigation thread, call g_thread_join() to release +the resource hold by it. + +Upstream-Status: Backport [1.7.1] + +bugzilla URL: https://bugzilla.gnome.org/show_bug.cgi?id=758820 + +Signed-off-by: Haihua Hu <b55597@freescale.com> +--- + gst-libs/gst/gl/gstglwindow.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/gst-libs/gst/gl/gstglwindow.c b/gst-libs/gst/gl/gstglwindow.c +index 44b74ca..42ef296 100644 +--- a/gst-libs/gst/gl/gstglwindow.c ++++ b/gst-libs/gst/gl/gstglwindow.c +@@ -343,6 +343,9 @@ gst_gl_window_finalize (GObject * object) + while (window->nav_alive) { + g_cond_wait (&window->nav_destroy_cond, &window->nav_lock); + } ++ /* release resource hold by navigation thread */ ++ g_thread_join(window->priv->navigation_thread); ++ window->priv->navigation_thread = NULL; + g_mutex_unlock (&window->nav_lock); + } + +-- +1.7.9.5 + 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 = " \ http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ file://configure-allow-to-disable-libssh2.patch \ file://0001-glimagesink-Downrank-to-marginal.patch \ + file://0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch \ " SRC_URI[md5sum] = "4857adcafe41e4b9b8805cf88303bd55" |