mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 19:42:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegts: use glib alloc and free

Browse source 
Signed-off-by: Stefan Ringel <linuxtv@stefanringel.de>

https://bugzilla.gnome.org/show_bug.cgi?id=727159
This commit is contained in:
Stefan Ringel 2014-03-27 13:56:26 +01:00 committed by Edward Hervey
parent 820685409e
commit 2e051cf412
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst-libs/gst/mpegts/gst-dvb-descriptor.c
View file

@ -558,6 +558,13 @@ gst_mpegts_descriptor_from_dvb_subtitling (const gchar * lang,
} }
/* GST_MTS_DESC_DVB_EXTENDED_EVENT (0x4E) */ /* GST_MTS_DESC_DVB_EXTENDED_EVENT (0x4E) */
static void
_gst_mpegts_extended_event_item_free (GstMpegTsExtendedEventItem * item)
{
g_slice_free (GstMpegTsExtendedEventItem, item);
}
/** /**
* gst_mpegts_descriptor_parse_dvb_extended_event: * gst_mpegts_descriptor_parse_dvb_extended_event:
* @descriptor: a %GST_MTS_DESC_DVB_EXTENDED_EVENT #GstMpegTsDescriptor * @descriptor: a %GST_MTS_DESC_DVB_EXTENDED_EVENT #GstMpegTsDescriptor
@ -596,11 +603,12 @@ gst_mpegts_descriptor_parse_dvb_extended_event (const GstMpegTsDescriptor
data += 1; data += 1;
res->nb_items = 0; res->nb_items = 0;
res->items = g_ptr_array_new (); res->items = g_ptr_array_new_with_free_func ((GDestroyNotify)
_gst_mpegts_extended_event_item_free);
for (guint i = 0; i < len_item;) { for (guint i = 0; i < len_item;) {
desc_data = data; desc_data = data;
item = malloc (sizeof (GstMpegTsExtendedEventItem)); item = g_slice_new0 (GstMpegTsExtendedEventItem);
item->item_description = item->item_description =
get_encoding_and_convert ((const gchar *) desc_data + 1, *desc_data); get_encoding_and_convert ((const gchar *) desc_data + 1, *desc_data);
@ -666,6 +674,12 @@ gst_mpegts_descriptor_parse_dvb_component (const GstMpegTsDescriptor
} }
/* GST_MTS_DESC_DVB_CONTENT (0x54) */ /* GST_MTS_DESC_DVB_CONTENT (0x54) */
static void
_gst_mpegts_content_free (GstMpegTsContent * content)
{
g_slice_free (GstMpegTsContent, content);
}
/** /**
* gst_mpegts_descriptor_parse_dvb_content: * gst_mpegts_descriptor_parse_dvb_content:
* @descriptor: a %GST_MTS_DESC_DVB_CONTENT #GstMpegTsDescriptor * @descriptor: a %GST_MTS_DESC_DVB_CONTENT #GstMpegTsDescriptor
@ -688,9 +702,10 @@ gst_mpegts_descriptor_parse_dvb_content (const GstMpegTsDescriptor
data = (guint8 *) descriptor->data + 2; data = (guint8 *) descriptor->data + 2;
len = descriptor->length; len = descriptor->length;
*content = g_ptr_array_new (); *content = g_ptr_array_new_with_free_func ((GDestroyNotify)
_gst_mpegts_content_free);
for (guint8 i = 0; i < len;) { for (guint8 i = 0; i < len;) {
GstMpegTsContent *cont = malloc (sizeof (GstMpegTsContent)); GstMpegTsContent *cont = g_slice_new0 (GstMpegTsContent);
tmp = *data; tmp = *data;
cont->content_nibble_1 = (tmp & 0xf0) >> 4; cont->content_nibble_1 = (tmp & 0xf0) >> 4;
cont->content_nibble_2 = tmp & 0x0f; cont->content_nibble_2 = tmp & 0x0f;