From 3bf994eb3bf068e48a21186be02f292ac5932c20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Cr=C3=AAte?= Date: Tue, 9 Apr 2013 21:31:55 -0400 Subject: [PATCH] srtpdec: Cleaner stream cleanup --- ext/srtp/gstsrtpdec.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ext/srtp/gstsrtpdec.c b/ext/srtp/gstsrtpdec.c index e30d28a..c9d0dc0 100644 --- a/ext/srtp/gstsrtpdec.c +++ b/ext/srtp/gstsrtpdec.c @@ -563,6 +563,12 @@ clear_stream (GstSrtpDecSsrcStream * stream) g_slice_free (GstSrtpDecSsrcStream, stream); } +static gboolean +remove_yes (gpointer key, gpointer value, gpointer user_data) +{ + return TRUE; +} + /* Clear the policy list */ static void @@ -575,10 +581,9 @@ gst_srtp_dec_clear_streams (GstSrtpDec * filter) if (!filter->first_session) srtp_dealloc (filter->session); - nb = g_hash_table_size (filter->streams); - g_hash_table_destroy (filter->streams); + if (filter->streams) + nb = g_hash_table_foreach_remove (filter->streams, remove_yes, NULL); - filter->streams = NULL; filter->first_session = TRUE; GST_OBJECT_UNLOCK (filter); @@ -940,10 +945,6 @@ gst_srtp_dec_change_state (GstElement * element, GstStateChange transition) GST_OBJECT_LOCK (filter); switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - if (!filter->first_session) - gst_srtp_dec_clear_streams (filter); - break; case GST_STATE_CHANGE_READY_TO_PAUSED: filter->streams = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) clear_stream); @@ -966,6 +967,8 @@ gst_srtp_dec_change_state (GstElement * element, GstStateChange transition) gst_srtp_dec_clear_streams (filter); break; case GST_STATE_CHANGE_READY_TO_NULL: + g_hash_table_unref (filter->streams); + filter->streams = NULL; break; default: break; -- 2.7.4