mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-28 06:42:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: sdp: 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 17:02:27 +00:00 committed by GStreamer Marge Bot
parent 8bf59703a1
commit 58722ba48e
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
subprojects/gst-plugins-base/gst-libs/gst/sdp/gstmikey.c
View file

@ -136,7 +136,8 @@ static GstMIKEYPayloadKEMAC *
gst_mikey_payload_kemac_copy (const GstMIKEYPayloadKEMAC * payload) gst_mikey_payload_kemac_copy (const GstMIKEYPayloadKEMAC * payload)
{ {
guint i, len; guint i, len;
GstMIKEYPayloadKEMAC *copy = g_slice_dup (GstMIKEYPayloadKEMAC, payload); GstMIKEYPayloadKEMAC *copy =
g_memdup2 (payload, sizeof (GstMIKEYPayloadKEMAC));
gst_mikey_payload_kemac_set (&copy->pt, payload->enc_alg, payload->mac_alg); gst_mikey_payload_kemac_set (&copy->pt, payload->enc_alg, payload->mac_alg);
len = payload->subpayloads->len; len = payload->subpayloads->len;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
@ -287,7 +288,7 @@ gst_mikey_payload_pke_dispose (GstMIKEYPayloadPKE * payload)
static GstMIKEYPayloadPKE * static GstMIKEYPayloadPKE *
gst_mikey_payload_pke_copy (const GstMIKEYPayloadPKE * payload) gst_mikey_payload_pke_copy (const GstMIKEYPayloadPKE * payload)
{ {
GstMIKEYPayloadPKE *copy = g_slice_dup (GstMIKEYPayloadPKE, payload); GstMIKEYPayloadPKE *copy = g_memdup2 (payload, sizeof (GstMIKEYPayloadPKE));
gst_mikey_payload_pke_set (&copy->pt, payload->C, payload->data_len, gst_mikey_payload_pke_set (&copy->pt, payload->C, payload->data_len,
payload->data); payload->data);
return copy; return copy;
@ -359,7 +360,7 @@ gst_mikey_payload_t_dispose (GstMIKEYPayloadT * payload)
static GstMIKEYPayloadT * static GstMIKEYPayloadT *
gst_mikey_payload_t_copy (const GstMIKEYPayloadT * payload) gst_mikey_payload_t_copy (const GstMIKEYPayloadT * payload)
{ {
GstMIKEYPayloadT *copy = g_slice_dup (GstMIKEYPayloadT, payload); GstMIKEYPayloadT *copy = g_memdup2 (payload, sizeof (GstMIKEYPayloadT));
gst_mikey_payload_t_set (&copy->pt, payload->type, payload->ts_value); gst_mikey_payload_t_set (&copy->pt, payload->type, payload->ts_value);
return copy; return copy;
} }
@ -415,7 +416,7 @@ static GstMIKEYPayloadSP *
gst_mikey_payload_sp_copy (const GstMIKEYPayloadSP * payload) gst_mikey_payload_sp_copy (const GstMIKEYPayloadSP * payload)
{ {
guint i, len; guint i, len;
GstMIKEYPayloadSP *copy = g_slice_dup (GstMIKEYPayloadSP, payload); GstMIKEYPayloadSP *copy = g_memdup2 (payload, sizeof (GstMIKEYPayloadSP));
gst_mikey_payload_sp_set (&copy->pt, payload->policy, payload->proto); gst_mikey_payload_sp_set (&copy->pt, payload->policy, payload->proto);
len = payload->params->len; len = payload->params->len;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
@ -574,7 +575,7 @@ gst_mikey_payload_rand_dispose (GstMIKEYPayloadRAND * payload)
static GstMIKEYPayloadRAND * static GstMIKEYPayloadRAND *
gst_mikey_payload_rand_copy (const GstMIKEYPayloadRAND * payload) gst_mikey_payload_rand_copy (const GstMIKEYPayloadRAND * payload)
{ {
GstMIKEYPayloadRAND *copy = g_slice_dup (GstMIKEYPayloadRAND, payload); GstMIKEYPayloadRAND *copy = g_memdup2 (payload, sizeof (GstMIKEYPayloadRAND));
gst_mikey_payload_rand_set (&copy->pt, payload->len, payload->rand); gst_mikey_payload_rand_set (&copy->pt, payload->len, payload->rand);
return copy; return copy;
} }
@ -730,7 +731,8 @@ gst_mikey_payload_key_data_dispose (GstMIKEYPayloadKeyData * payload)
static GstMIKEYPayloadKeyData * static GstMIKEYPayloadKeyData *
gst_mikey_payload_key_data_copy (const GstMIKEYPayloadKeyData * payload) gst_mikey_payload_key_data_copy (const GstMIKEYPayloadKeyData * payload)
{ {
GstMIKEYPayloadKeyData *copy = g_slice_dup (GstMIKEYPayloadKeyData, payload); GstMIKEYPayloadKeyData *copy =
g_memdup2 (payload, sizeof (GstMIKEYPayloadKeyData));
gst_mikey_payload_key_data_set_key (&copy->pt, payload->key_type, gst_mikey_payload_key_data_set_key (&copy->pt, payload->key_type,
payload->key_len, payload->key_data); payload->key_len, payload->key_data);
gst_mikey_payload_key_data_set_salt (&copy->pt, payload->salt_len, gst_mikey_payload_key_data_set_salt (&copy->pt, payload->salt_len,
@ -753,7 +755,7 @@ gst_mikey_payload_key_data_copy (const GstMIKEYPayloadKeyData * payload)
static void static void
mikey_payload_free (GstMIKEYPayload * payload) mikey_payload_free (GstMIKEYPayload * payload)
{ {
g_slice_free1 (payload->len, payload); g_free (payload);
} }
@ -821,7 +823,7 @@ gst_mikey_payload_new (GstMIKEYPayloadType type)
if (len == 0) if (len == 0)
return NULL; return NULL;
result = g_slice_alloc0 (len); result = g_malloc0 (len);
gst_mini_object_init (GST_MINI_OBJECT_CAST (result), gst_mini_object_init (GST_MINI_OBJECT_CAST (result),
0, GST_TYPE_MIKEY_PAYLOAD, copy, clear, 0, GST_TYPE_MIKEY_PAYLOAD, copy, clear,
(GstMiniObjectFreeFunction) mikey_payload_free); (GstMiniObjectFreeFunction) mikey_payload_free);
@ -862,7 +864,7 @@ mikey_message_free (GstMIKEYMessage * msg)
FREE_ARRAY (msg->map_info); FREE_ARRAY (msg->map_info);
FREE_ARRAY (msg->payloads); FREE_ARRAY (msg->payloads);
g_slice_free (GstMIKEYMessage, msg); g_free (msg);
} }
/** /**
@ -879,7 +881,7 @@ gst_mikey_message_new (void)
{ {
GstMIKEYMessage *result; GstMIKEYMessage *result;
result = g_slice_new0 (GstMIKEYMessage); result = g_new0 (GstMIKEYMessage, 1);
gst_mini_object_init (GST_MINI_OBJECT_CAST (result), gst_mini_object_init (GST_MINI_OBJECT_CAST (result),
0, GST_TYPE_MIKEY_MESSAGE, 0, GST_TYPE_MIKEY_MESSAGE,
(GstMiniObjectCopyFunction) mikey_message_copy, NULL, (GstMiniObjectCopyFunction) mikey_message_copy, NULL,