mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsdescriptor: Add API for creating extended descriptors and fix writing them

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=757049
This commit is contained in:
Sebastian Dröge 2015-10-25 18:09:24 +02:00
parent af27ee3aa7
commit ce61a754d8
2 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gst-libs/gst/mpegts/gstmpegtsdescriptor.c
View file

@ -635,7 +635,6 @@ void
_packetize_descriptor_array (GPtrArray * array, guint8 ** out_data) _packetize_descriptor_array (GPtrArray * array, guint8 ** out_data)
{ {
guint i; guint i;
guint8 header_size;
GstMpegtsDescriptor *descriptor; GstMpegtsDescriptor *descriptor;
g_return_if_fail (out_data != NULL); g_return_if_fail (out_data != NULL);
@ -647,13 +646,8 @@ _packetize_descriptor_array (GPtrArray * array, guint8 ** out_data)
for (i = 0; i < array->len; i++) { for (i = 0; i < array->len; i++) {
descriptor = g_ptr_array_index (array, i); descriptor = g_ptr_array_index (array, i);
if (descriptor->tag == GST_MTS_DESC_DVB_EXTENSION) memcpy (*out_data, descriptor->data, descriptor->length + 2);
header_size = 3; *out_data += descriptor->length + 2;
else
header_size = 2;
memcpy (*out_data, descriptor->data, descriptor->length + header_size);
*out_data += descriptor->length + header_size;
} }
} }
@ -689,15 +683,15 @@ _new_descriptor_with_extension (guint8 tag, guint8 tag_extension, guint8 length)
descriptor->tag = tag; descriptor->tag = tag;
descriptor->tag_extension = tag_extension; descriptor->tag_extension = tag_extension;
descriptor->length = length; descriptor->length = length + 1;
descriptor->data = g_malloc (length + 3); descriptor->data = g_malloc (length + 3);
data = descriptor->data; data = descriptor->data;
*data++ = descriptor->tag; *data++ = descriptor->tag;
*data++ = descriptor->tag_extension; *data++ = descriptor->length;
*data = descriptor->length; *data = descriptor->tag_extension;
return descriptor; return descriptor;
} }
@ -1105,3 +1099,28 @@ gst_mpegts_descriptor_from_custom (guint8 tag, const guint8 * data,
return descriptor; return descriptor;
} }
/**
* gst_mpegts_descriptor_from_custom_with_extension:
* @tag: descriptor tag
* @tag_extension: descriptor tag extension
* @data: (transfer none): descriptor data (after tag and length field)
* @length: length of @data
*
* Creates a #GstMpegtsDescriptor with custom @tag, @tag_extension and @data
*
* Returns: #GstMpegtsDescriptor
*/
GstMpegtsDescriptor *
gst_mpegts_descriptor_from_custom_with_extension (guint8 tag,
guint8 tag_extension, const guint8 * data, gsize length)
{
GstMpegtsDescriptor *descriptor;
descriptor = _new_descriptor_with_extension (tag, tag_extension, length);
if (data && (length > 0))
memcpy (descriptor->data + 3, data, length);
return descriptor;
}

2
gst-libs/gst/mpegts/gstmpegtsdescriptor.h
View file

@ -341,6 +341,8 @@ gst_mpegts_descriptor_parse_logical_channel (const GstMpegtsDescriptor *descript
GstMpegtsDescriptor * GstMpegtsDescriptor *
gst_mpegts_descriptor_from_custom (guint8 tag, const guint8 *data, gsize length); gst_mpegts_descriptor_from_custom (guint8 tag, const guint8 *data, gsize length);
GstMpegtsDescriptor *
gst_mpegts_descriptor_from_custom_with_extension (guint8 tag, guint8 tag_extension, const guint8 *data, gsize length);
G_END_DECLS G_END_DECLS