commit 1fe0bf12a6a7ee85ad7576cf339a6f125c7b3051
author Sebastian Dröge <sebastian@centricular.com> Wed May 02 18:35:23 2018 +0300
committer Sebastian Dröge <sebastian@centricular.com> Mon May 14 16:56:06 2018 +0300
tree fe9b5d9330cd493d68a91179dc2c064f1b5d067a
parent ea08187036c64b47550d3e4707dfe07daae4c9ed

appsink: Make sure to also handle unlock when waiting for EOS to be handled

Otherwise shutting down during EOS waiting will cause a deadlock.

https://bugzilla.gnome.org/show_bug.cgi?id=795551

gst-libs/gst/app/gstappsink.c

diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c
index 6e65528..a51b179 100644
--- a/gst-libs/gst/app/gstappsink.c
+++ b/gst-libs/gst/app/gstappsink.c
@@ -719,6 +719,20 @@
        * consumed, which is a bit confusing for the application
        */
       while (priv->num_buffers > 0 && !priv->flushing && priv->wait_on_eos) {
+        if (priv->unlock) {
+          /* we are asked to unlock, call the wait_preroll method */
+          g_mutex_unlock (&priv->mutex);
+          if (gst_base_sink_wait_preroll (sink) != GST_FLOW_OK) {
+            /* Directly go out of here */
+            gst_event_unref (event);
+            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;