mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 12:15:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggdemux: 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 15:56:40 +00:00 committed by GStreamer Marge Bot
parent 45aac1e938
commit a9c5a52b25
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-plugins-base/ext/ogg/gstoggdemux.c
View file

@ -84,7 +84,7 @@ GST_DEBUG_CATEGORY (gst_ogg_demux_setup_debug);
static ogg_packet * static ogg_packet *
_ogg_packet_copy (const ogg_packet * packet) _ogg_packet_copy (const ogg_packet * packet)
{ {
ogg_packet *ret = g_slice_new (ogg_packet); ogg_packet *ret = g_new (ogg_packet, 1);
*ret = *packet; *ret = *packet;
ret->packet = g_memdup2 (packet->packet, packet->bytes); ret->packet = g_memdup2 (packet->packet, packet->bytes);
@ -96,13 +96,13 @@ static void
_ogg_packet_free (ogg_packet * packet) _ogg_packet_free (ogg_packet * packet)
{ {
g_free (packet->packet); g_free (packet->packet);
g_slice_free (ogg_packet, packet); g_free (packet);
} }
static ogg_page * static ogg_page *
gst_ogg_page_copy (ogg_page * page) gst_ogg_page_copy (ogg_page * page)
{ {
ogg_page *p = g_slice_new (ogg_page); ogg_page *p = g_new (ogg_page, 1);
/* make a copy of the page */ /* make a copy of the page */
p->header = g_memdup2 (page->header, page->header_len); p->header = g_memdup2 (page->header, page->header_len);
@ -118,7 +118,7 @@ gst_ogg_page_free (ogg_page * page)
{ {
g_free (page->header); g_free (page->header);
g_free (page->body); g_free (page->body);
g_slice_free (ogg_page, page); g_free (page);
} }
static gboolean gst_ogg_demux_collect_chain_info (GstOggDemux * ogg, static gboolean gst_ogg_demux_collect_chain_info (GstOggDemux * ogg,
@ -2125,7 +2125,7 @@ choked:
static GstOggChain * static GstOggChain *
gst_ogg_chain_new (GstOggDemux * ogg) gst_ogg_chain_new (GstOggDemux * ogg)
{ {
GstOggChain *chain = g_slice_new0 (GstOggChain); GstOggChain *chain = g_new0 (GstOggChain, 1);
GST_DEBUG_OBJECT (ogg, "creating new chain %p", chain); GST_DEBUG_OBJECT (ogg, "creating new chain %p", chain);
chain->ogg = ogg; chain->ogg = ogg;
@ -2152,7 +2152,7 @@ gst_ogg_chain_free (GstOggChain * chain)
gst_object_unref (pad); gst_object_unref (pad);
} }
g_array_free (chain->streams, TRUE); g_array_free (chain->streams, TRUE);
g_slice_free (GstOggChain, chain); g_free (chain);
} }
static void static void

4
subprojects/gst-plugins-base/ext/ogg/gstoggparse.c
View file

@ -95,7 +95,7 @@ free_stream (GstOggStream * stream)
g_list_foreach (stream->unknown_pages, (GFunc) gst_mini_object_unref, NULL); g_list_foreach (stream->unknown_pages, (GFunc) gst_mini_object_unref, NULL);
g_list_foreach (stream->stored_buffers, (GFunc) gst_mini_object_unref, NULL); g_list_foreach (stream->stored_buffers, (GFunc) gst_mini_object_unref, NULL);
g_slice_free (GstOggStream, stream); g_free (stream);
} }
static void static void
@ -118,7 +118,7 @@ gst_ogg_parse_new_stream (GstOggParse * parser, ogg_page * page)
GST_DEBUG_OBJECT (parser, "creating new stream %08x", serialno); GST_DEBUG_OBJECT (parser, "creating new stream %08x", serialno);
stream = g_slice_new0 (GstOggStream); stream = g_new0 (GstOggStream, 1);
stream->serialno = serialno; stream->serialno = serialno;
stream->in_headers = 1; stream->in_headers = 1;