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

queue2: Post errors if we receive EOS after downstream reported an error

Browse source 
There will be no further data flow that would allow us to propagate the
error upstream, causing nobody at all to post an error message.
This commit is contained in:
Sebastian Dröge 2014-08-13 12:20:51 +03:00
parent 6a261b1fc2
commit ee662efdd1
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
plugins/elements/gstqueue2.c
View file

@ -2286,6 +2286,25 @@ gst_queue2_handle_sink_event (GstPad * pad, GstObject * parent,
if (GST_EVENT_IS_SERIALIZED (event)) {
/* serialized events go in the queue */
GST_QUEUE2_MUTEX_LOCK_CHECK (queue, queue->sinkresult, out_flushing);
if (queue->srcresult != GST_FLOW_OK) {
/* Errors in sticky event pushing are no problem and ignored here
* as they will cause more meaningful errors during data flow.
* For EOS events, that are not followed by data flow, we still
* return FALSE here though and report an error.
*/
if (!GST_EVENT_IS_STICKY (event)) {
goto out_flow_error;
} else if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) {
if (queue->srcresult == GST_FLOW_NOT_LINKED
|| queue->srcresult < GST_FLOW_EOS) {
GST_ELEMENT_ERROR (queue, STREAM, FAILED,
(_("Internal data flow error.")),
("streaming task paused, reason %s (%d)",
gst_flow_get_name (queue->srcresult), queue->srcresult));
}
goto out_flow_error;
}
}
/* refuse more events on EOS */
if (queue->is_eos)
goto out_eos;
@ -2314,6 +2333,15 @@ out_eos:
gst_event_unref (event);
return FALSE;
}
out_flow_error:
{
GST_LOG_OBJECT (queue,
"refusing event, we have a downstream flow error: %s",
gst_flow_get_name (queue->srcresult));
GST_QUEUE2_MUTEX_UNLOCK (queue);
gst_event_unref (event);
return FALSE;
}
}
static gboolean