mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

srtp: drop use of GSlice

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
This commit is contained in:
Tim-Philipp Müller 2023-01-08 18:08:05 +00:00 committed by GStreamer Marge Bot
parent 4994c730c8
commit c095a1d620
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-bad/ext/srtp/gstsrtp.c
View file

@ -73,7 +73,7 @@ struct GstSrtpEventReporterData
static void static void
free_reporter_data (gpointer data) free_reporter_data (gpointer data)
{ {
g_slice_free (struct GstSrtpEventReporterData, data); g_free (data);
} }
@ -101,7 +101,7 @@ gst_srtp_init_event_reporter (void)
struct GstSrtpEventReporterData *dat = g_private_get (&current_callback); struct GstSrtpEventReporterData *dat = g_private_get (&current_callback);
if (!dat) { if (!dat) {
dat = g_slice_new (struct GstSrtpEventReporterData); dat = g_new (struct GstSrtpEventReporterData, 1);
g_private_set (&current_callback, dat); g_private_set (&current_callback, dat);
} }

8
subprojects/gst-plugins-bad/ext/srtp/gstsrtpdec.c
View file

@ -561,7 +561,7 @@ get_stream_from_caps (GstSrtpDec * filter, GstCaps * caps, guint32 ssrc)
const gchar *rtp_cipher, *rtp_auth, *rtcp_cipher, *rtcp_auth; const gchar *rtp_cipher, *rtp_auth, *rtcp_cipher, *rtcp_auth;
/* Create new stream structure and set default values */ /* Create new stream structure and set default values */
stream = g_slice_new0 (GstSrtpDecSsrcStream); stream = g_new0 (GstSrtpDecSsrcStream, 1);
stream->ssrc = ssrc; stream->ssrc = ssrc;
stream->key = NULL; stream->key = NULL;
@ -671,7 +671,7 @@ get_stream_from_caps (GstSrtpDec * filter, GstCaps * caps, guint32 ssrc)
return stream; return stream;
error: error:
g_slice_free (GstSrtpDecSsrcStream, stream); g_free (stream);
return NULL; return NULL;
} }
@ -848,7 +848,7 @@ free_stream (GstSrtpDecSsrcStream * stream)
gst_buffer_unref (stream->key); gst_buffer_unref (stream->key);
if (stream->keys) if (stream->keys)
g_array_free (stream->keys, TRUE); g_array_free (stream->keys, TRUE);
g_slice_free (GstSrtpDecSsrcStream, stream); g_free (stream);
} }
static gboolean static gboolean
@ -949,7 +949,7 @@ update_session_stream_from_caps (GstSrtpDec * filter, guint32 ssrc,
GST_WARNING_OBJECT (filter, "Failed to create the stream (err: %d)", err); GST_WARNING_OBJECT (filter, "Failed to create the stream (err: %d)", err);
if (stream->key) if (stream->key)
gst_buffer_unref (stream->key); gst_buffer_unref (stream->key);
g_slice_free (GstSrtpDecSsrcStream, stream); g_free (stream);
stream = NULL; stream = NULL;
} }
} }