mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-03 16:09:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

flvparse: Make script tag parsing more flexible.

Browse source 
* The nb_elements for arrays is just an indication, we can therefore ignore
  it and carry on parsing metadata items until we reach the end marker.
* If type == 3, then the script tag contains a list of object followed
  by the end marker.

Refactor code slightly to handle both cases

https://bugzilla.gnome.org/show_bug.cgi?id=610447
This commit is contained in:
Edward Hervey 2010-02-19 13:39:04 +01:00
parent a18164d56e
commit 95d087ed77
1 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gst/flv/gstflvparse.c
View file

@ -433,32 +433,49 @@ gst_flv_parse_tag_script (GstFLVDemux * demux, GstBuffer * buffer)
GST_LOG_OBJECT (demux, "function name is %s", GST_STR_NULL (function_name));
if (function_name != NULL && strcmp (function_name, "onMetaData") == 0) {
guint32 nb_elems = 0;
gboolean end_marker = FALSE;
GST_DEBUG_OBJECT (demux, "we have a metadata script object");
/* Next type must be a ECMA array */
if (!gst_byte_reader_get_uint8 (&reader, &type) || type != 8) {
if (!gst_byte_reader_get_uint8 (&reader, &type)) {
g_free (function_name);
return GST_FLOW_OK;
}
if (!gst_byte_reader_get_uint32_be (&reader, &nb_elems)) {
g_free (function_name);
return GST_FLOW_OK;
}
switch (type) {
case 8:
{
guint32 nb_elems = 0;
GST_DEBUG_OBJECT (demux, "there are approx. %d elements in the array",
nb_elems);
/* ECMA array */
if (!gst_byte_reader_get_uint32_be (&reader, &nb_elems)) {
g_free (function_name);
return GST_FLOW_OK;
}
while (nb_elems-- && !end_marker) {
gboolean ok = gst_flv_parse_metadata_item (demux, &reader, &end_marker);
if (G_UNLIKELY (!ok)) {
GST_WARNING_OBJECT (demux, "failed reading a tag, skipping");
break;
/* The number of elements is just a hint, some files have
nb_elements == 0 and actually contain items. */
GST_DEBUG_OBJECT (demux, "there are approx. %d elements in the array",
nb_elems);
}
/* fallthrough to read data */
case 3:
{
/* Object */
while (!end_marker) {
gboolean ok =
gst_flv_parse_metadata_item (demux, &reader, &end_marker);
if (G_UNLIKELY (!ok)) {
GST_WARNING_OBJECT (demux, "failed reading a tag, skipping");
break;
}
}
}
break;
default:
GST_DEBUG_OBJECT (demux, "Unhandled script data type : %d", type);
g_free (function_name);
return GST_FLOW_OK;
}
demux->push_tags = TRUE;