v4l2: videodec: Detect flushes while setting up the capture

As we missed the fact we were flushing, we could create and activate
that buffer pool, and wait on it, causing a hang. We detect that we
are flushing by checking the related pad state.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4525>

diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c
index b780d23e129d52e9306a44b6959602f663a8e801..1d95b1959945e4884fc40974f6baac57f6fabeee 100644 (file)
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c
@@ -746,9 +746,17 @@ gst_v4l2_video_dec_loop (GstVideoDecoder * decoder)
       goto beach;
     }
 
+    GST_DEBUG_OBJECT (decoder, "Setup the capture queue");
     ret = gst_v4l2_video_dec_setup_capture (decoder);
+    /* FIXME not super nice ? */
+    if (ret == GST_FLOW_FLUSHING || GST_PAD_IS_FLUSHING (decoder->sinkpad)
+        || GST_PAD_IS_FLUSHING (decoder->srcpad)) {
+      ret = GST_FLOW_FLUSHING;
+      GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
+      goto beach;
+    }
     if (ret != GST_FLOW_OK) {
-      GST_ERROR_OBJECT (decoder, "Failed setup capture queue");
+      GST_ERROR_OBJECT (decoder, "Failed to setup capture queue");
       GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
       goto beach;
     }