mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-28 18:18:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

flv: 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:27:38 +00:00 committed by GStreamer Marge Bot
parent 9f4c514c52
commit 172c6ca1dc
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-good/gst/flv/gstflvmux.c
View file

@ -219,7 +219,7 @@ typedef struct
static void static void
gst_flv_mux_index_entry_free (GstFlvMuxIndexEntry * entry) gst_flv_mux_index_entry_free (GstFlvMuxIndexEntry * entry)
{ {
g_slice_free (GstFlvMuxIndexEntry, entry); g_free (entry);
} }
static GstBuffer * static GstBuffer *
@ -1644,7 +1644,7 @@ gst_flv_mux_update_index (GstFlvMux * mux, GstBuffer * buffer,
return; return;
if (GST_BUFFER_PTS_IS_VALID (buffer)) { if (GST_BUFFER_PTS_IS_VALID (buffer)) {
GstFlvMuxIndexEntry *entry = g_slice_new (GstFlvMuxIndexEntry); GstFlvMuxIndexEntry *entry = g_new (GstFlvMuxIndexEntry, 1);
GstClockTime pts = GstClockTime pts =
gst_flv_mux_segment_to_running_time (&GST_AGGREGATOR_PAD gst_flv_mux_segment_to_running_time (&GST_AGGREGATOR_PAD
(pad)->segment, GST_BUFFER_PTS (buffer)); (pad)->segment, GST_BUFFER_PTS (buffer));

16
subprojects/gst-plugins-good/gst/flv/gstindex.c
View file

@ -283,7 +283,7 @@ gst_index_get_property (GObject * object, guint prop_id,
static GstIndexGroup * static GstIndexGroup *
gst_index_group_new (guint groupnum) gst_index_group_new (guint groupnum)
{ {
GstIndexGroup *indexgroup = g_slice_new (GstIndexGroup); GstIndexGroup *indexgroup = g_new (GstIndexGroup, 1);
indexgroup->groupnum = groupnum; indexgroup->groupnum = groupnum;
indexgroup->entries = NULL; indexgroup->entries = NULL;
@ -298,7 +298,7 @@ gst_index_group_new (guint groupnum)
static void static void
gst_index_group_free (GstIndexGroup * group) gst_index_group_free (GstIndexGroup * group)
{ {
g_slice_free (GstIndexGroup, group); g_free (group);
} }
/* do not resurrect this, add a derived dummy index class instead */ /* do not resurrect this, add a derived dummy index class instead */
@ -542,7 +542,7 @@ gst_index_set_resolver_full (GstIndex * index, GstIndexResolver resolver,
GstIndexEntry * GstIndexEntry *
gst_index_entry_copy (GstIndexEntry * entry) gst_index_entry_copy (GstIndexEntry * entry)
{ {
GstIndexEntry *new_entry = g_slice_new (GstIndexEntry); GstIndexEntry *new_entry = g_new (GstIndexEntry, 1);
memcpy (new_entry, entry, sizeof (GstIndexEntry)); memcpy (new_entry, entry, sizeof (GstIndexEntry));
return new_entry; return new_entry;
@ -576,7 +576,7 @@ gst_index_entry_free (GstIndexEntry * entry)
break; break;
} }
g_slice_free (GstIndexEntry, entry); g_free (entry);
} }
#if 0 #if 0
@ -606,7 +606,7 @@ gst_index_add_format (GstIndex * index, gint id, GstFormat format)
if (!GST_INDEX_IS_WRITABLE (index) || id == -1) if (!GST_INDEX_IS_WRITABLE (index) || id == -1)
return NULL; return NULL;
entry = g_slice_new (GstIndexEntry); entry = g_new (GstIndexEntry, 1);
entry->type = GST_INDEX_ENTRY_FORMAT; entry->type = GST_INDEX_ENTRY_FORMAT;
entry->id = id; entry->id = id;
entry->data.format.format = format; entry->data.format.format = format;
@ -641,7 +641,7 @@ gst_index_add_id (GstIndex * index, gint id, gchar * description)
if (!GST_INDEX_IS_WRITABLE (index) || id == -1) if (!GST_INDEX_IS_WRITABLE (index) || id == -1)
return NULL; return NULL;
entry = g_slice_new (GstIndexEntry); entry = g_new (GstIndexEntry, 1);
entry->type = GST_INDEX_ENTRY_ID; entry->type = GST_INDEX_ENTRY_ID;
entry->id = id; entry->id = id;
entry->data.id.description = description; entry->data.id.description = description;
@ -756,7 +756,7 @@ gst_index_get_writer_id (GstIndex * index, GstObject * writer, gint * id)
if (!entry) { if (!entry) {
/* index is probably not writable, make an entry anyway /* index is probably not writable, make an entry anyway
* to keep it in our cache */ * to keep it in our cache */
entry = g_slice_new (GstIndexEntry); entry = g_new (GstIndexEntry, 1);
entry->type = GST_INDEX_ENTRY_ID; entry->type = GST_INDEX_ENTRY_ID;
entry->id = *id; entry->id = *id;
entry->data.id.description = writer_string; entry->data.id.description = writer_string;
@ -808,7 +808,7 @@ gst_index_add_associationv (GstIndex * index, gint id,
if (!GST_INDEX_IS_WRITABLE (index) || id == -1) if (!GST_INDEX_IS_WRITABLE (index) || id == -1)
return NULL; return NULL;
entry = g_slice_new (GstIndexEntry); entry = g_new (GstIndexEntry, 1);
entry->type = GST_INDEX_ENTRY_ASSOCIATION; entry->type = GST_INDEX_ENTRY_ASSOCIATION;
entry->id = id; entry->id = id;

8
subprojects/gst-plugins-good/gst/flv/gstmemindex.c
View file

@ -142,7 +142,7 @@ gst_mem_index_free_format (gpointer key, gpointer value, gpointer user_data)
g_tree_destroy (index->tree); g_tree_destroy (index->tree);
} }
g_slice_free (GstMemIndexFormatIndex, index); g_free (index);
} }
static void static void
@ -157,7 +157,7 @@ gst_mem_index_free_id (gpointer key, gpointer value, gpointer user_data)
id_index->format_index = NULL; id_index->format_index = NULL;
} }
g_slice_free (GstMemIndexId, id_index); g_free (id_index);
} }
static void static void
@ -191,7 +191,7 @@ gst_mem_index_add_id (GstIndex * index, GstIndexEntry * entry)
id_index = g_hash_table_lookup (memindex->id_index, &entry->id); id_index = g_hash_table_lookup (memindex->id_index, &entry->id);
if (!id_index) { if (!id_index) {
id_index = g_slice_new0 (GstMemIndexId); id_index = g_new0 (GstMemIndexId, 1);
id_index->id = entry->id; id_index->id = entry->id;
id_index->format_index = g_hash_table_new (g_int_hash, g_int_equal); id_index->format_index = g_hash_table_new (g_int_hash, g_int_equal);
@ -226,7 +226,7 @@ gst_mem_index_index_format (GstMemIndexId * id_index, GstIndexEntry * entry,
index = g_hash_table_lookup (id_index->format_index, format); index = g_hash_table_lookup (id_index->format_index, format);
if (!index) { if (!index) {
index = g_slice_new0 (GstMemIndexFormatIndex); index = g_new0 (GstMemIndexFormatIndex, 1);
index->format = *format; index->format = *format;
index->offset = assoc; index->offset = assoc;