mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 17:22:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegdesc: Don't allocate/free GstMPEGDescriptor

Browse source 
Just use static variables
This commit is contained in:
Edward Hervey 2012-06-08 15:12:30 +02:00 committed by Sebastian Dröge
parent a3fc64d153
commit 94c68115ef
3 changed files with 84 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst/mpegtsdemux/gstmpegdesc.c
View file

@ -34,14 +34,6 @@
GST_DEBUG_CATEGORY (gstmpegtsdesc_debug); GST_DEBUG_CATEGORY (gstmpegtsdesc_debug);
#define GST_CAT_DEFAULT (gstmpegtsdesc_debug) #define GST_CAT_DEFAULT (gstmpegtsdesc_debug)
void
gst_mpeg_descriptor_free (GstMPEGDescriptor * desc)
{
g_return_if_fail (desc != NULL);
g_free (desc);
}
static guint static guint
gst_mpeg_descriptor_parse_1 (guint8 * data, guint size) gst_mpeg_descriptor_parse_1 (guint8 * data, guint size)
{ {
@ -66,18 +58,19 @@ gst_mpeg_descriptor_parse_1 (guint8 * data, guint size)
return length + 2; return length + 2;
} }
GstMPEGDescriptor * gboolean
gst_mpeg_descriptor_parse (guint8 * data, guint size) gst_mpeg_descriptor_parse (GstMPEGDescriptor * result, guint8 * data,
guint size)
{ {
guint8 *current; guint8 *current;
guint consumed, total, n_desc; guint consumed, total, n_desc;
GstMPEGDescriptor *result;
g_return_val_if_fail (data != NULL, NULL); g_return_val_if_fail (data != NULL, FALSE);
current = data; current = data;
total = 0; total = 0;
n_desc = 0; n_desc = 0;
result->n_desc = 0;
do { do {
consumed = gst_mpeg_descriptor_parse_1 (current, size); consumed = gst_mpeg_descriptor_parse_1 (current, size);
@ -94,16 +87,13 @@ gst_mpeg_descriptor_parse (guint8 * data, guint size)
GST_DEBUG ("parsed %d descriptors", n_desc); GST_DEBUG ("parsed %d descriptors", n_desc);
if (total == 0) if (total == 0)
return NULL; return FALSE;
result = g_malloc (sizeof (GstMPEGDescriptor) + total);
result->n_desc = n_desc; result->n_desc = n_desc;
result->data_length = total; result->data_length = total;
result->data = ((guint8 *) result) + sizeof (GstMPEGDescriptor); result->data = data;
memcpy (result->data, data, total); return TRUE;
return result;
} }
guint guint

3
gst/mpegtsdemux/gstmpegdesc.h
View file

@ -349,8 +349,7 @@ typedef struct
} GstMPEGDescriptor; } GstMPEGDescriptor;
void gst_mpegtsdesc_init_debug (void); void gst_mpegtsdesc_init_debug (void);
GstMPEGDescriptor *gst_mpeg_descriptor_parse (guint8 * data, guint size); gboolean gst_mpeg_descriptor_parse (GstMPEGDescriptor *result, guint8 * data, guint size);
void gst_mpeg_descriptor_free (GstMPEGDescriptor * desc);
guint gst_mpeg_descriptor_n_desc (GstMPEGDescriptor * desc); guint gst_mpeg_descriptor_n_desc (GstMPEGDescriptor * desc);
guint8 *gst_mpeg_descriptor_find (GstMPEGDescriptor * desc, gint tag); guint8 *gst_mpeg_descriptor_find (GstMPEGDescriptor * desc, gint tag);

103
gst/mpegtsdemux/mpegtspacketizer.c
View file

@ -548,7 +548,7 @@ mpegts_packetizer_parse_cat (MpegTSPacketizer2 * packetizer,
guint8 *data; guint8 *data;
guint8 tmp; guint8 tmp;
GValueArray *descriptors; GValueArray *descriptors;
GstMPEGDescriptor *desc; GstMPEGDescriptor desc;
guint desc_len; guint desc_len;
/* Skip parts already parsed */ /* Skip parts already parsed */
@ -570,10 +570,8 @@ mpegts_packetizer_parse_cat (MpegTSPacketizer2 * packetizer,
/* descriptors */ /* descriptors */
desc_len = section->section_length - 4 - 8; desc_len = section->section_length - 4 - 8;
desc = gst_mpeg_descriptor_parse (data, desc_len); gst_mpeg_descriptor_parse (&desc, data, desc_len);
if (desc) descriptors = g_value_array_new (desc.n_desc);
gst_mpeg_descriptor_free (desc);
descriptors = g_value_array_new (0);
if (!mpegts_packetizer_parse_descriptors (packetizer, &data, data + desc_len, if (!mpegts_packetizer_parse_descriptors (packetizer, &data, data + desc_len,
descriptors)) { descriptors)) {
g_value_array_free (descriptors); g_value_array_free (descriptors);
@ -761,18 +759,19 @@ mpegts_packetizer_parse_pmt (MpegTSPacketizer2 * packetizer,
if (stream_info_length) { if (stream_info_length) {
/* check for AC3 descriptor */ /* check for AC3 descriptor */
GstMPEGDescriptor *desc = GstMPEGDescriptor desc;
gst_mpeg_descriptor_parse (data, stream_info_length);
if (desc != NULL) { if (gst_mpeg_descriptor_parse (&desc, data, stream_info_length)) {
/* DVB AC3 */ /* DVB AC3 */
guint8 *desc_data; guint8 *desc_data;
if (gst_mpeg_descriptor_find (desc, DESC_DVB_AC3)) { if (gst_mpeg_descriptor_find (&desc, DESC_DVB_AC3)) {
gst_structure_set (stream_info, "has-ac3", G_TYPE_BOOLEAN, TRUE, gst_structure_set (stream_info, "has-ac3", G_TYPE_BOOLEAN, TRUE,
NULL); NULL);
} }
/* DATA BROADCAST ID */ /* DATA BROADCAST ID */
desc_data = gst_mpeg_descriptor_find (desc, DESC_DVB_DATA_BROADCAST_ID); desc_data =
gst_mpeg_descriptor_find (&desc, DESC_DVB_DATA_BROADCAST_ID);
if (desc_data) { if (desc_data) {
guint16 data_broadcast_id; guint16 data_broadcast_id;
data_broadcast_id = data_broadcast_id =
@ -782,7 +781,7 @@ mpegts_packetizer_parse_pmt (MpegTSPacketizer2 * packetizer,
} }
/* DATA BROADCAST */ /* DATA BROADCAST */
desc_data = gst_mpeg_descriptor_find (desc, DESC_DVB_DATA_BROADCAST); desc_data = gst_mpeg_descriptor_find (&desc, DESC_DVB_DATA_BROADCAST);
if (desc_data) { if (desc_data) {
GstStructure *databroadcast_info; GstStructure *databroadcast_info;
guint16 data_broadcast_id; guint16 data_broadcast_id;
@ -799,7 +798,7 @@ mpegts_packetizer_parse_pmt (MpegTSPacketizer2 * packetizer,
/* DVB CAROUSEL IDENTIFIER */ /* DVB CAROUSEL IDENTIFIER */
desc_data = desc_data =
gst_mpeg_descriptor_find (desc, DESC_DVB_CAROUSEL_IDENTIFIER); gst_mpeg_descriptor_find (&desc, DESC_DVB_CAROUSEL_IDENTIFIER);
if (desc_data) { if (desc_data) {
guint32 carousel_id; guint32 carousel_id;
carousel_id = DESC_DVB_CAROUSEL_IDENTIFIER_carousel_id (desc_data); carousel_id = DESC_DVB_CAROUSEL_IDENTIFIER_carousel_id (desc_data);
@ -808,7 +807,8 @@ mpegts_packetizer_parse_pmt (MpegTSPacketizer2 * packetizer,
} }
/* DVB STREAM IDENTIFIER */ /* DVB STREAM IDENTIFIER */
desc_data = gst_mpeg_descriptor_find (desc, DESC_DVB_STREAM_IDENTIFIER); desc_data =
gst_mpeg_descriptor_find (&desc, DESC_DVB_STREAM_IDENTIFIER);
if (desc_data) { if (desc_data) {
guint8 component_tag; guint8 component_tag;
component_tag = DESC_DVB_STREAM_IDENTIFIER_component_tag (desc_data); component_tag = DESC_DVB_STREAM_IDENTIFIER_component_tag (desc_data);
@ -817,7 +817,7 @@ mpegts_packetizer_parse_pmt (MpegTSPacketizer2 * packetizer,
} }
/* ISO 639 LANGUAGE */ /* ISO 639 LANGUAGE */
desc_data = gst_mpeg_descriptor_find (desc, DESC_ISO_639_LANGUAGE); desc_data = gst_mpeg_descriptor_find (&desc, DESC_ISO_639_LANGUAGE);
if (desc_data && DESC_ISO_639_LANGUAGE_codes_n (desc_data)) { if (desc_data && DESC_ISO_639_LANGUAGE_codes_n (desc_data)) {
gchar *lang_code; gchar *lang_code;
gchar *language_n = (gchar *) gchar *language_n = (gchar *)
@ -828,10 +828,7 @@ mpegts_packetizer_parse_pmt (MpegTSPacketizer2 * packetizer,
g_free (lang_code); g_free (lang_code);
} }
gst_mpeg_descriptor_free (desc); descriptors = g_value_array_new (desc.n_desc);
}
descriptors = g_value_array_new (0);
if (!mpegts_packetizer_parse_descriptors (packetizer, if (!mpegts_packetizer_parse_descriptors (packetizer,
&data, data + stream_info_length, descriptors)) { &data, data + stream_info_length, descriptors)) {
g_value_unset (&programs); g_value_unset (&programs);
@ -843,7 +840,7 @@ mpegts_packetizer_parse_pmt (MpegTSPacketizer2 * packetizer,
gst_structure_id_set (stream_info, gst_structure_id_set (stream_info,
QUARK_DESCRIPTORS, G_TYPE_VALUE_ARRAY, descriptors, NULL); QUARK_DESCRIPTORS, G_TYPE_VALUE_ARRAY, descriptors, NULL);
g_value_array_free (descriptors); g_value_array_free (descriptors);
}
} }
g_value_init (&stream_value, GST_TYPE_STRUCTURE); g_value_init (&stream_value, GST_TYPE_STRUCTURE);
@ -916,7 +913,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
/* see if the buffer is large enough */ /* see if the buffer is large enough */
if (descriptors_loop_length) { if (descriptors_loop_length) {
guint8 *networkname_descriptor; guint8 *networkname_descriptor;
GstMPEGDescriptor *mpegdescriptor; GstMPEGDescriptor mpegdescriptor;
if (data + descriptors_loop_length > end - 4) { if (data + descriptors_loop_length > end - 4) {
GST_WARNING ("PID %d invalid NIT descriptors loop length %d", GST_WARNING ("PID %d invalid NIT descriptors loop length %d",
@ -924,9 +921,10 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
gst_structure_free (nit); gst_structure_free (nit);
goto error; goto error;
} }
mpegdescriptor = gst_mpeg_descriptor_parse (data, descriptors_loop_length); if (gst_mpeg_descriptor_parse (&mpegdescriptor, data,
descriptors_loop_length)) {
networkname_descriptor = networkname_descriptor =
gst_mpeg_descriptor_find (mpegdescriptor, DESC_DVB_NETWORK_NAME); gst_mpeg_descriptor_find (&mpegdescriptor, DESC_DVB_NETWORK_NAME);
if (networkname_descriptor != NULL) { if (networkname_descriptor != NULL) {
gchar *networkname_tmp; gchar *networkname_tmp;
@ -942,20 +940,19 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
networkname_tmp, NULL); networkname_tmp, NULL);
g_free (networkname_tmp); g_free (networkname_tmp);
} }
gst_mpeg_descriptor_free (mpegdescriptor);
descriptors = g_value_array_new (0); descriptors = g_value_array_new (mpegdescriptor.n_desc);
if (!mpegts_packetizer_parse_descriptors (packetizer, if (!mpegts_packetizer_parse_descriptors (packetizer,
&data, data + descriptors_loop_length, descriptors)) { &data, data + descriptors_loop_length, descriptors)) {
gst_structure_free (nit); gst_structure_free (nit);
g_value_array_free (descriptors); g_value_array_free (descriptors);
goto error; goto error;
} }
gst_structure_id_set (nit, QUARK_DESCRIPTORS, G_TYPE_VALUE_ARRAY, gst_structure_id_set (nit, QUARK_DESCRIPTORS, G_TYPE_VALUE_ARRAY,
descriptors, NULL); descriptors, NULL);
g_value_array_free (descriptors); g_value_array_free (descriptors);
} }
}
transport_stream_loop_length = GST_READ_UINT16_BE (data) & 0x0FFF; transport_stream_loop_length = GST_READ_UINT16_BE (data) & 0x0FFF;
data += 2; data += 2;
@ -991,7 +988,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
QUARK_ORIGINAL_NETWORK_ID, G_TYPE_UINT, original_network_id, NULL); QUARK_ORIGINAL_NETWORK_ID, G_TYPE_UINT, original_network_id, NULL);
if (descriptors_loop_length) { if (descriptors_loop_length) {
GstMPEGDescriptor *mpegdescriptor; GstMPEGDescriptor mpegdescriptor;
guint8 *delivery; guint8 *delivery;
if (data + descriptors_loop_length > end - 4) { if (data + descriptors_loop_length > end - 4) {
@ -1000,11 +997,10 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
gst_structure_free (transport); gst_structure_free (transport);
goto error; goto error;
} }
mpegdescriptor = gst_mpeg_descriptor_parse (&mpegdescriptor, data,
gst_mpeg_descriptor_parse (data, descriptors_loop_length); descriptors_loop_length);
if ((delivery = if ((delivery = gst_mpeg_descriptor_find (&mpegdescriptor,
gst_mpeg_descriptor_find (mpegdescriptor,
DESC_DVB_SATELLITE_DELIVERY_SYSTEM))) { DESC_DVB_SATELLITE_DELIVERY_SYSTEM))) {
guint8 *frequency_bcd = guint8 *frequency_bcd =
@ -1120,8 +1116,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
"inner-fec", G_TYPE_STRING, fec_inner_str, NULL); "inner-fec", G_TYPE_STRING, fec_inner_str, NULL);
gst_structure_set (transport, "delivery", GST_TYPE_STRUCTURE, gst_structure_set (transport, "delivery", GST_TYPE_STRUCTURE,
delivery_structure, NULL); delivery_structure, NULL);
} else if ((delivery = } else if ((delivery = gst_mpeg_descriptor_find (&mpegdescriptor,
gst_mpeg_descriptor_find (mpegdescriptor,
DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM))) { DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM))) {
guint32 frequency = guint32 frequency =
@ -1249,8 +1244,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
"other-frequency", G_TYPE_BOOLEAN, other_frequency, NULL); "other-frequency", G_TYPE_BOOLEAN, other_frequency, NULL);
gst_structure_set (transport, "delivery", GST_TYPE_STRUCTURE, gst_structure_set (transport, "delivery", GST_TYPE_STRUCTURE,
delivery_structure, NULL); delivery_structure, NULL);
} else if ((delivery = } else if ((delivery = gst_mpeg_descriptor_find (&mpegdescriptor,
gst_mpeg_descriptor_find (mpegdescriptor,
DESC_DVB_CABLE_DELIVERY_SYSTEM))) { DESC_DVB_CABLE_DELIVERY_SYSTEM))) {
guint8 *frequency_bcd = guint8 *frequency_bcd =
@ -1345,8 +1339,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
gst_structure_free (delivery_structure); gst_structure_free (delivery_structure);
delivery_structure = NULL; delivery_structure = NULL;
} }
if ((delivery = if ((delivery = gst_mpeg_descriptor_find (&mpegdescriptor,
gst_mpeg_descriptor_find (mpegdescriptor,
DESC_DTG_LOGICAL_CHANNEL))) { DESC_DTG_LOGICAL_CHANNEL))) {
guint8 *current_pos = delivery + 2; guint8 *current_pos = delivery + 2;
GValue channel_numbers = { 0 }; GValue channel_numbers = { 0 };
@ -1373,8 +1366,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
gst_structure_set_value (transport, "channels", &channel_numbers); gst_structure_set_value (transport, "channels", &channel_numbers);
g_value_unset (&channel_numbers); g_value_unset (&channel_numbers);
} }
if ((delivery = if ((delivery = gst_mpeg_descriptor_find (&mpegdescriptor,
gst_mpeg_descriptor_find (mpegdescriptor,
DESC_DVB_FREQUENCY_LIST))) { DESC_DVB_FREQUENCY_LIST))) {
guint8 *current_pos = delivery + 2; guint8 *current_pos = delivery + 2;
GValue frequencies = { 0 }; GValue frequencies = { 0 };
@ -1445,9 +1437,8 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
g_value_unset (&frequencies); g_value_unset (&frequencies);
} }
} }
gst_mpeg_descriptor_free (mpegdescriptor);
descriptors = g_value_array_new (0); descriptors = g_value_array_new (mpegdescriptor.n_desc);
if (!mpegts_packetizer_parse_descriptors (packetizer, if (!mpegts_packetizer_parse_descriptors (packetizer,
&data, data + descriptors_loop_length, descriptors)) { &data, data + descriptors_loop_length, descriptors)) {
gst_structure_free (transport); gst_structure_free (transport);
@ -1581,7 +1572,7 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer2 * packetizer,
if (descriptors_loop_length) { if (descriptors_loop_length) {
guint8 *service_descriptor; guint8 *service_descriptor;
GstMPEGDescriptor *mpegdescriptor; GstMPEGDescriptor mpegdescriptor;
if (data + descriptors_loop_length > end - 4) { if (data + descriptors_loop_length > end - 4) {
GST_WARNING ("PID %d invalid SDT entry %d descriptors loop length %d", GST_WARNING ("PID %d invalid SDT entry %d descriptors loop length %d",
@ -1589,10 +1580,10 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer2 * packetizer,
gst_structure_free (service); gst_structure_free (service);
goto error; goto error;
} }
mpegdescriptor = gst_mpeg_descriptor_parse (&mpegdescriptor, data,
gst_mpeg_descriptor_parse (data, descriptors_loop_length); descriptors_loop_length);
service_descriptor = service_descriptor =
gst_mpeg_descriptor_find (mpegdescriptor, DESC_DVB_SERVICE); gst_mpeg_descriptor_find (&mpegdescriptor, DESC_DVB_SERVICE);
if (service_descriptor != NULL) { if (service_descriptor != NULL) {
gchar *servicename_tmp, *serviceprovider_name_tmp; gchar *servicename_tmp, *serviceprovider_name_tmp;
guint8 serviceprovider_name_length = guint8 serviceprovider_name_length =
@ -1641,9 +1632,8 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer2 * packetizer,
g_free (serviceprovider_name_tmp); g_free (serviceprovider_name_tmp);
} }
} }
gst_mpeg_descriptor_free (mpegdescriptor);
descriptors = g_value_array_new (0); descriptors = g_value_array_new (mpegdescriptor.n_desc);
if (!mpegts_packetizer_parse_descriptors (packetizer, if (!mpegts_packetizer_parse_descriptors (packetizer,
&data, data + descriptors_loop_length, descriptors)) { &data, data + descriptors_loop_length, descriptors)) {
gst_structure_free (service); gst_structure_free (service);
@ -1819,7 +1809,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
guint8 *event_descriptor; guint8 *event_descriptor;
GArray *component_descriptors; GArray *component_descriptors;
GArray *extended_event_descriptors; GArray *extended_event_descriptors;
GstMPEGDescriptor *mpegdescriptor; GstMPEGDescriptor mpegdescriptor;
if (data + descriptors_loop_length > end - 4) { if (data + descriptors_loop_length > end - 4) {
GST_WARNING ("PID %d invalid EIT descriptors loop length %d", GST_WARNING ("PID %d invalid EIT descriptors loop length %d",
@ -1827,10 +1817,10 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
gst_structure_free (event); gst_structure_free (event);
goto error; goto error;
} }
mpegdescriptor = gst_mpeg_descriptor_parse (&mpegdescriptor, data,
gst_mpeg_descriptor_parse (data, descriptors_loop_length); descriptors_loop_length);
event_descriptor = event_descriptor =
gst_mpeg_descriptor_find (mpegdescriptor, DESC_DVB_SHORT_EVENT); gst_mpeg_descriptor_find (&mpegdescriptor, DESC_DVB_SHORT_EVENT);
if (event_descriptor != NULL) { if (event_descriptor != NULL) {
gchar *eventname_tmp, *eventdescription_tmp; gchar *eventname_tmp, *eventdescription_tmp;
guint8 eventname_length = guint8 eventname_length =
@ -1850,14 +1840,14 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
get_encoding_and_convert (eventdescription, get_encoding_and_convert (eventdescription,
eventdescription_length); eventdescription_length);
gst_structure_set (event, "name", G_TYPE_STRING, eventname_tmp, NULL); gst_structure_set (event, "name", G_TYPE_STRING, eventname_tmp,
gst_structure_set (event, "description", G_TYPE_STRING, "description", G_TYPE_STRING, eventdescription_tmp, NULL);
eventdescription_tmp, NULL);
g_free (eventname_tmp); g_free (eventname_tmp);
g_free (eventdescription_tmp); g_free (eventdescription_tmp);
} }
} }
extended_event_descriptors = gst_mpeg_descriptor_find_all (mpegdescriptor, extended_event_descriptors =
gst_mpeg_descriptor_find_all (&mpegdescriptor,
DESC_DVB_EXTENDED_EVENT); DESC_DVB_EXTENDED_EVENT);
if (extended_event_descriptors) { if (extended_event_descriptors) {
int i; int i;
@ -1930,7 +1920,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
g_array_free (extended_event_descriptors, TRUE); g_array_free (extended_event_descriptors, TRUE);
} }
component_descriptors = gst_mpeg_descriptor_find_all (mpegdescriptor, component_descriptors = gst_mpeg_descriptor_find_all (&mpegdescriptor,
DESC_DVB_COMPONENT); DESC_DVB_COMPONENT);
if (component_descriptors) { if (component_descriptors) {
int i; int i;
@ -2132,9 +2122,8 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
g_value_unset (&components); g_value_unset (&components);
g_array_free (component_descriptors, TRUE); g_array_free (component_descriptors, TRUE);
} }
gst_mpeg_descriptor_free (mpegdescriptor);
descriptors = g_value_array_new (0); descriptors = g_value_array_new (mpegdescriptor.n_desc);
if (!mpegts_packetizer_parse_descriptors (packetizer, if (!mpegts_packetizer_parse_descriptors (packetizer,
&data, data + descriptors_loop_length, descriptors)) { &data, data + descriptors_loop_length, descriptors)) {
gst_structure_free (event); gst_structure_free (event);