mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-19 00:01:23 +00:00
queue2: fix refactoring of draining-on-eos, munge flow return to FLOW_OK
This commit is contained in:
parent
2a3e7c4feb
commit
3b28af5171
1 changed files with 6 additions and 0 deletions
|
@ -2448,6 +2448,9 @@ next:
|
|||
data = gst_queue2_dequeue_on_unexpected (queue, &item_type);
|
||||
if (data != NULL)
|
||||
goto next;
|
||||
/* Since we will still accept EOS and NEWSEGMENT we return _FLOW_OK
|
||||
* to the caller so that the task function does not shut down */
|
||||
result = GST_FLOW_OK;
|
||||
}
|
||||
} else if (item_type == GST_QUEUE2_ITEM_TYPE_EVENT) {
|
||||
GstEvent *event = GST_EVENT_CAST (data);
|
||||
|
@ -2486,6 +2489,9 @@ next:
|
|||
data = gst_queue2_dequeue_on_unexpected (queue, &item_type);
|
||||
if (data != NULL)
|
||||
goto next;
|
||||
/* Since we will still accept EOS and NEWSEGMENT we return _FLOW_OK
|
||||
* to the caller so that the task function does not shut down */
|
||||
result = GST_FLOW_OK;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
|
Loading…
Reference in a new issue