v4l2: videodec: Detect flushes while setting up the capture
authorNicolas Dufresne <nicolas.dufresne@collabora.com>
Fri, 21 Apr 2023 17:33:11 +0000 (13:33 -0400)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Tue, 2 May 2023 14:42:43 +0000 (14:42 +0000)
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>

subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c

index b780d23..1d95b19 100644 (file)
@@ -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;
     }