diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2024-08-15 11:42:47 +0300 |
---|---|---|
committer | Backport Bot <gitlab-backport-bot@gstreamer-foundation.org> | 2024-08-16 11:57:36 +0100 |
commit | dd11178f81a0437f9a2b4ff6f9c035a26fd587bc (patch) | |
tree | 0dfed8a3d6b0e47478016e2d49e3c9772cdeee43 | |
parent | 68913e0a56148e5b84eecb06e3d3ba34b563bfca (diff) |
avdemux: Fix deadlock when serialized events are received from upstream while opening
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3657
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7367>
-rw-r--r-- | subprojects/gst-libav/ext/libav/gstavdemux.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/subprojects/gst-libav/ext/libav/gstavdemux.c b/subprojects/gst-libav/ext/libav/gstavdemux.c index 2c68d622f1..d55b89ee12 100644 --- a/subprojects/gst-libav/ext/libav/gstavdemux.c +++ b/subprojects/gst-libav/ext/libav/gstavdemux.c @@ -67,6 +67,8 @@ struct _GstFFMpegDemux guint group_id; AVFormatContext *context; + /* set while avformat_open_input() is called */ + gboolean opening; GstFFStream *streams[MAX_STREAMS]; @@ -463,7 +465,7 @@ gst_ffmpegdemux_do_seek (GstFFMpegDemux * demux, GstSegment * segment) GST_LOG_OBJECT (demux, "do seek to time %" GST_TIME_FORMAT, GST_TIME_ARGS (target)); - /* if we need to land on a keyframe, try to do so, we don't try to do a + /* if we need to land on a keyframe, try to do so, we don't try to do a * keyframe seek if we are not absolutely sure we have an index.*/ if (segment->flags & GST_SEEK_FLAG_KEY_UNIT) { gint keyframeidx; @@ -1261,7 +1263,9 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux) demux->context = avformat_alloc_context (); demux->context->pb = iocontext; + demux->opening = TRUE; res = avformat_open_input (&demux->context, uri, oclass->in_plugin, NULL); + demux->opening = FALSE; g_free (uri); @@ -1724,10 +1728,12 @@ gst_ffmpegdemux_sink_event (GstPad * sinkpad, GstObject * parent, /* for a serialized event, wait until an earlier data is gone, * though this is no guarantee as to when task is done with it. * - * If the demuxer isn't opened, push straight away, since we'll - * be waiting against a cond that will never be signalled. */ + * If the demuxer isn't opened yet, i.e. this is called as part of opening + * the demuxer, queue up the events for sending them at a later time since + * we'll otherwise be waiting against a cond that will never be signalled. + */ if (GST_EVENT_IS_SERIALIZED (event)) { - if (demux->context) { + if (demux->context && !demux->opening) { GST_FFMPEG_PIPE_MUTEX_LOCK (ffpipe); while (!ffpipe->needed) GST_FFMPEG_PIPE_WAIT (ffpipe); |