From 83985ae1fabeec91086c86f0e9eec657cb291374 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Tue, 14 Mar 2023 14:27:39 -0400 Subject: [PATCH] avviddec: Drop decoder stream lock when calling send_packet This is already done for every other calls to send_packet. The deadlock occures since FFMPeg 6.0. The decoder tries to get a buffer from a thread during the draining process, and blocks trying to get the video decoder stream lock already heald by the drain function. Fixes #2383 Part-of: --- subprojects/gst-libav/ext/libav/gstavviddec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/subprojects/gst-libav/ext/libav/gstavviddec.c b/subprojects/gst-libav/ext/libav/gstavviddec.c index 4737a57345..dbc5fa224b 100644 --- a/subprojects/gst-libav/ext/libav/gstavviddec.c +++ b/subprojects/gst-libav/ext/libav/gstavviddec.c @@ -2042,8 +2042,12 @@ gst_ffmpegviddec_drain (GstVideoDecoder * decoder) if (!ffmpegdec->opened) return GST_FLOW_OK; - if (avcodec_send_packet (ffmpegdec->context, NULL)) + GST_VIDEO_DECODER_STREAM_UNLOCK (ffmpegdec); + if (avcodec_send_packet (ffmpegdec->context, NULL)) { + GST_VIDEO_DECODER_STREAM_LOCK (ffmpegdec); goto send_packet_failed; + } + GST_VIDEO_DECODER_STREAM_LOCK (ffmpegdec); do { got_frame = gst_ffmpegviddec_frame (ffmpegdec, NULL, &ret);