FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

decodebin2: Don't let thread run after unref

Browse Source 
We have a dedicated one-shot thread to handle cleanup of old groups.

While this is a good idea. It's an even better idea to make sure
that thread is *completed* before the decodebin2 element to which
it is related isn't freed/gone.

* There can only be one cleanup thread happening at any point in time.
  If there is already one, we wait for the previous one to finish.
* When shutting down (NULL=>READY) make sure the thread is finished

https://bugzilla.gnome.org/show_bug.cgi?id=790007
This commit is contained in:
Edward Hervey 2017-11-10 14:54:12 +01:00 committed by Edward Hervey
parent d53ccfd8e5
commit 43b9bcbddb
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gst/playback/gstdecodebin2.c
View File

@ -187,6 +187,12 @@ struct _GstDecodeBin
GList *buffering_status; /* element currently buffering messages */ GList *buffering_status; /* element currently buffering messages */
GMutex buffering_lock; GMutex buffering_lock;
GMutex buffering_post_lock; GMutex buffering_post_lock;
GMutex cleanup_lock; /* Mutex used to protect the cleanup thread */
GThread *cleanup_thread; /* thread used to free chains asynchronously.
* We store it to make sure we end up joining it
* before stopping the element.
* Protected by the object lock */
}; };
struct _GstDecodeBinClass struct _GstDecodeBinClass
@ -1084,6 +1090,9 @@ gst_decode_bin_init (GstDecodeBin * decode_bin)
g_mutex_init (&decode_bin->buffering_lock); g_mutex_init (&decode_bin->buffering_lock);
g_mutex_init (&decode_bin->buffering_post_lock); g_mutex_init (&decode_bin->buffering_post_lock);
g_mutex_init (&decode_bin->cleanup_lock);
decode_bin->cleanup_thread = NULL;
decode_bin->encoding = g_strdup (DEFAULT_SUBTITLE_ENCODING); decode_bin->encoding = g_strdup (DEFAULT_SUBTITLE_ENCODING);
decode_bin->caps = gst_static_caps_get (&default_raw_caps); decode_bin->caps = gst_static_caps_get (&default_raw_caps);
decode_bin->use_buffering = DEFAULT_USE_BUFFERING; decode_bin->use_buffering = DEFAULT_USE_BUFFERING;
@ -1141,6 +1150,7 @@ gst_decode_bin_finalize (GObject * object)
g_mutex_clear (&decode_bin->buffering_lock); g_mutex_clear (&decode_bin->buffering_lock);
g_mutex_clear (&decode_bin->buffering_post_lock); g_mutex_clear (&decode_bin->buffering_post_lock);
g_mutex_clear (&decode_bin->factories_lock); g_mutex_clear (&decode_bin->factories_lock);
g_mutex_clear (&decode_bin->cleanup_lock);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -3664,11 +3674,19 @@ gst_decode_chain_start_free_hidden_groups_thread (GstDecodeChain * chain)
GThread *thread; GThread *thread;
GError *error = NULL; GError *error = NULL;
GList *old_groups; GList *old_groups;
GstDecodeBin *dbin = chain->dbin;
old_groups = chain->old_groups; old_groups = chain->old_groups;
if (!old_groups) if (!old_groups)
return; return;
/* If we already have a thread running, wait for it to finish */
g_mutex_lock (&dbin->cleanup_lock);
if (dbin->cleanup_thread) {
g_thread_join (dbin->cleanup_thread);
dbin->cleanup_thread = NULL;
}
chain->old_groups = NULL; chain->old_groups = NULL;
thread = g_thread_try_new ("free-hidden-groups", thread = g_thread_try_new ("free-hidden-groups",
(GThreadFunc) gst_decode_chain_free_hidden_groups, old_groups, &error); (GThreadFunc) gst_decode_chain_free_hidden_groups, old_groups, &error);
@ -3677,11 +3695,14 @@ gst_decode_chain_start_free_hidden_groups_thread (GstDecodeChain * chain)
error ? error->message : "unknown reason"); error ? error->message : "unknown reason");
g_clear_error (&error); g_clear_error (&error);
chain->old_groups = old_groups; chain->old_groups = old_groups;
g_mutex_unlock (&dbin->cleanup_lock);
return; return;
} }
dbin->cleanup_thread = thread;
g_mutex_unlock (&dbin->cleanup_lock);
GST_DEBUG_OBJECT (chain->dbin, "Started free-hidden-groups thread"); GST_DEBUG_OBJECT (chain->dbin, "Started free-hidden-groups thread");
/* We do not need to wait for it or get any results from it */
g_thread_unref (thread);
} }
static void static void
@ -5373,6 +5394,12 @@ gst_decode_bin_change_state (GstElement * element, GstStateChange transition)
dbin->buffering_status = NULL; dbin->buffering_status = NULL;
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
g_mutex_lock (&dbin->cleanup_lock);
if (dbin->cleanup_thread) {
g_thread_join (dbin->cleanup_thread);
dbin->cleanup_thread = NULL;
}
g_mutex_unlock (&dbin->cleanup_lock);
default: default:
break; break;
} }