appsink: Handle unlock in drain query handling too
And also handle flushing, we might otherwise wait here forever when
flushing too.
diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c
index a51b179..b070d80 100644
--- a/gst-libs/gst/app/gstappsink.c
+++ b/gst-libs/gst/app/gstappsink.c
@@ -1009,9 +1009,25 @@
g_mutex_lock (&priv->mutex);
GST_DEBUG_OBJECT (appsink, "waiting buffers to be consumed");
while (priv->num_buffers > 0 || priv->preroll_buffer) {
+ if (priv->unlock) {
+ /* we are asked to unlock, call the wait_preroll method */
+ g_mutex_unlock (&priv->mutex);
+ if (gst_base_sink_wait_preroll (bsink) != GST_FLOW_OK) {
+ /* Directly go out of here */
+ return FALSE;
+ }
+
+ /* we are allowed to continue now */
+ g_mutex_lock (&priv->mutex);
+ continue;
+ }
+
priv->wait_status |= STREAM_WAITING;
g_cond_wait (&priv->cond, &priv->mutex);
priv->wait_status &= ~STREAM_WAITING;
+
+ if (priv->flushing)
+ break;
}
g_mutex_unlock (&priv->mutex);
ret = GST_BASE_SINK_CLASS (parent_class)->query (bsink, query);