| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 95cda7fbcf1a81289d9315c801c8e2b3d896f4cb Mon Sep 17 00:00:00 2001 |
| 2 | From: Haihua Hu <b55597@freescale.com> |
| 3 | Date: Mon, 30 Nov 2015 09:36:09 +0800 |
| 4 | Subject: [PATCH 2/5] [glplugin] glwindow: fix memory leak of navigation |
| 5 | thread |
| 6 | |
| 7 | When exit navigation thread, call g_thread_join() to release |
| 8 | the resource hold by it. |
| 9 | |
| 10 | Upstream-Status: Backport [1.7.1] |
| 11 | |
| 12 | bugzilla URL: https://bugzilla.gnome.org/show_bug.cgi?id=758820 |
| 13 | |
| 14 | Signed-off-by: Haihua Hu <b55597@freescale.com> |
| 15 | --- |
| 16 | gst-libs/gst/gl/gstglwindow.c | 3 +++ |
| 17 | 1 file changed, 3 insertions(+) |
| 18 | |
| 19 | diff --git a/gst-libs/gst/gl/gstglwindow.c b/gst-libs/gst/gl/gstglwindow.c |
| 20 | index 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 | -- |
| 34 | 1.7.9.5 |
| 35 | |