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

queue/multiqueue: Don't special-case CAPS events in the event handlers

Browse source 
For CAPS events we will never ever have a FALSE return value here, so just
remove the dead code instead of causing future confusion.
This commit is contained in:
Sebastian Dröge 2015-12-14 11:20:43 +01:00
parent 0636fe1391
commit 33ded76ab8
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/elements/gstmultiqueue.c
View file

@ -2049,7 +2049,7 @@ gst_multi_queue_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
"SingleQueue %d : Enqueuing event %p of type %s with id %d",
sq->id, event, GST_EVENT_TYPE_NAME (event), curid);
if (!(res = gst_data_queue_push (sq->queue, (GstDataQueueItem *) item)))
if (!gst_data_queue_push (sq->queue, (GstDataQueueItem *) item))
goto flushing;
/* mark EOS when we received one, we must do that after putting the
@ -2099,12 +2099,8 @@ gst_multi_queue_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
}
done:
if (res == FALSE) {
if (GST_EVENT_TYPE (event) == GST_EVENT_CAPS)
flowret = GST_FLOW_NOT_NEGOTIATED;
else
flowret = GST_FLOW_ERROR;
}
if (res == FALSE)
flowret = GST_FLOW_ERROR;
GST_DEBUG_OBJECT (mq, "SingleQueue %d : returning %s", sq->id,
gst_flow_get_name (flowret));
return flowret;
@ -2122,7 +2118,6 @@ was_eos:
{
GST_DEBUG_OBJECT (mq, "we are EOS, dropping event, return GST_FLOW_EOS");
gst_event_unref (event);
res = FALSE;
return GST_FLOW_EOS;
}
}

5
plugins/elements/gstqueue.c
View file

@ -985,11 +985,8 @@ gst_queue_handle_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
}
break;
}
if (ret == FALSE) {
if (GST_EVENT_TYPE (event) == GST_EVENT_CAPS)
return GST_FLOW_NOT_NEGOTIATED;
if (ret == FALSE)
return GST_FLOW_ERROR;
}
return GST_FLOW_OK;
/* ERRORS */