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

tagdemux: refactor the tag find function

Browse source 
Move the code to find the tags and to typefind the data into a separate
function. Call this function from the loop function.
This commit is contained in:
Wim Taymans 2012-02-15 12:29:12 +01:00
parent 8dd93b897f
commit fbf0b4b6cc
1 changed files with 41 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
gst-libs/gst/tag/gsttagdemux.c
View file

@ -1095,8 +1095,8 @@ done:
* 3. if we didn't find any caps, fail. * 3. if we didn't find any caps, fail.
* 4. set caps on srcpad * 4. set caps on srcpad
*/ */
static void static GstFlowReturn
gst_tag_demux_element_loop (GstTagDemux * demux) gst_tag_demux_element_find (GstTagDemux * demux)
{ {
GstTagDemuxClass *klass; GstTagDemuxClass *klass;
GstTypeFindProbability probability = 0; GstTypeFindProbability probability = 0;
@ -1164,29 +1164,24 @@ gst_tag_demux_element_loop (GstTagDemux * demux)
* the chain function if we end up in push mode */ * the chain function if we end up in push mode */
demux->priv->state = GST_TAG_DEMUX_STREAMING; demux->priv->state = GST_TAG_DEMUX_STREAMING;
/* 6 Set the srcpad caps now we know them */ /* 6 Set the srcpad caps now that we know them */
gst_tag_demux_set_src_caps (demux, caps); gst_tag_demux_set_src_caps (demux, caps);
if (caps)
gst_caps_unref (caps); gst_caps_unref (caps);
/* now we pause */ return ret;
goto pause;
/* ERRORS */ /* ERRORS */
no_size: no_size:
{ {
GST_ELEMENT_ERROR (demux, STREAM, TYPE_NOT_FOUND, GST_ELEMENT_ERROR (demux, STREAM, TYPE_NOT_FOUND,
("Could not get stream size"), (NULL)); ("Could not get stream size"), (NULL));
ret = GST_FLOW_ERROR; return GST_FLOW_ERROR;
goto pause;
} }
no_tags: no_tags:
{ {
GST_ELEMENT_ERROR (demux, STREAM, TYPE_NOT_FOUND, GST_ELEMENT_ERROR (demux, STREAM, TYPE_NOT_FOUND,
("Could not get start and/or end tag"), (NULL)); ("Could not get start and/or end tag"), (NULL));
ret = GST_FLOW_ERROR; return GST_FLOW_ERROR;
goto pause;
} }
no_data: no_data:
{ {
@ -1194,16 +1189,46 @@ no_data:
/* so we don't know about type either */ /* so we don't know about type either */
GST_ELEMENT_ERROR (demux, STREAM, TYPE_NOT_FOUND, ("No data in file"), GST_ELEMENT_ERROR (demux, STREAM, TYPE_NOT_FOUND, ("No data in file"),
(NULL)); (NULL));
ret = GST_FLOW_ERROR; return GST_FLOW_ERROR;
goto pause;
} }
no_caps: no_caps:
{ {
GST_ELEMENT_ERROR (demux, STREAM, TYPE_NOT_FOUND, GST_ELEMENT_ERROR (demux, STREAM, TYPE_NOT_FOUND,
("Could not detect type of contents"), (NULL)); ("Could not detect type of contents"), (NULL));
ret = GST_FLOW_ERROR; return GST_FLOW_ERROR;
goto pause;
} }
}
/* This function operates similarly to gst_type_find_element_loop
* in the typefind element
* 1. try to read tags in pull mode
* 2. typefind the contents
* 3. if we didn't find any caps, fail.
* 4. set caps on srcpad
*/
static void
gst_tag_demux_element_loop (GstTagDemux * demux)
{
GstFlowReturn ret;
switch (demux->priv->state) {
case GST_TAG_DEMUX_READ_START_TAG:
case GST_TAG_DEMUX_TYPEFINDING:
ret = gst_tag_demux_element_find (demux);
break;
case GST_TAG_DEMUX_STREAMING:
ret = GST_FLOW_ERROR;
break;
default:
ret = GST_FLOW_ERROR;
break;
}
if (ret != GST_FLOW_OK)
goto pause;
return;
/* ERRORS */
pause: pause:
{ {
const gchar *reason = gst_flow_get_name (ret); const gchar *reason = gst_flow_get_name (ret);