diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2023-05-12 09:50:04 +0300 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2023-05-13 12:55:40 +0100 |
| commit | 8209ae476fd73f1e7733de7caa105771f249d040 (patch) | |
| tree | 723947701f77c6f3ddd526eed330a73ba15e198b | |
| parent | ff533b679dad9f548d50962cd6d37315ef3c30ae (diff) | |
| download | gstreamer-8209ae476fd73f1e7733de7caa105771f249d040.tar.gz | |
avviddec: Temporarily unlock stream lock while flushing buffers
This can call into the decoder again from other threads and try to take
the stream lock from there, which would cause a deadlock.
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2558
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4625>
| -rw-r--r-- | subprojects/gst-libav/ext/libav/gstavviddec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/subprojects/gst-libav/ext/libav/gstavviddec.c b/subprojects/gst-libav/ext/libav/gstavviddec.c index ff3874224b..1c10bb28ce 100644 --- a/subprojects/gst-libav/ext/libav/gstavviddec.c +++ b/subprojects/gst-libav/ext/libav/gstavviddec.c @@ -2052,7 +2052,10 @@ gst_ffmpegviddec_drain (GstVideoDecoder * decoder) do { got_frame = gst_ffmpegviddec_frame (ffmpegdec, NULL, &ret); } while (got_frame && ret == GST_FLOW_OK); + + GST_VIDEO_DECODER_STREAM_UNLOCK (ffmpegdec); avcodec_flush_buffers (ffmpegdec->context); + GST_VIDEO_DECODER_STREAM_LOCK (ffmpegdec); /* FFMpeg will return AVERROR_EOF if it's internal was fully drained * then we are translating it to GST_FLOW_EOS. However, because this behavior @@ -2265,7 +2268,9 @@ gst_ffmpegviddec_flush (GstVideoDecoder * decoder) if (ffmpegdec->opened) { GST_LOG_OBJECT (decoder, "flushing buffers"); + GST_VIDEO_DECODER_STREAM_UNLOCK (ffmpegdec); avcodec_flush_buffers (ffmpegdec->context); + GST_VIDEO_DECODER_STREAM_LOCK (ffmpegdec); } return TRUE; |