mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

splitmuxsink: Avoid deadlock when releasing a pad from a running muxer

Browse source 
Might not drain correctly

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/838>
This commit is contained in:
Vivia Nikolaidou 2020-12-10 14:27:49 +02:00 committed by GStreamer Merge Bot
parent ff1dd307f2
commit 81d2f67ba5
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/multifile/gstsplitmuxsink.c
View file

@ -2768,7 +2768,12 @@ handle_mq_input (GstPad * pad, GstPadProbeInfo * info, MqStreamCtx * ctx)
switch (splitmux->input_state) {
case SPLITMUX_INPUT_STATE_COLLECTING_GOP_START:
if (ctx->is_reference) {
if (ctx->is_releasing) {
/* The pad belonging to this context is being released */
GST_WARNING_OBJECT (pad, "Pad is being released while the muxer is "
"running. Data might not drain correctly");
loop_again = FALSE;
} else if (ctx->is_reference) {
/* This is the reference context. If it's a keyframe,
* it marks the start of a new GOP and we should wait in
* check_completed_gop before continuing, but either way
@ -3232,6 +3237,9 @@ gst_splitmux_sink_release_pad (GstElement * element, GstPad * pad)
GST_SPLITMUX_LOCK (splitmux);
ctx->is_releasing = TRUE;
GST_SPLITMUX_BROADCAST_INPUT (splitmux);
/* Can release the context now */
mq_stream_ctx_free (ctx);
if (ctx == splitmux->reference_ctx)
@ -3254,6 +3262,10 @@ gst_splitmux_sink_release_pad (GstElement * element, GstPad * pad)
if (splitmux->contexts == NULL)
gst_splitmux_reset_elements (splitmux);
/* Wake up other input streams to check if the completion conditions have
* changed */
GST_SPLITMUX_BROADCAST_INPUT (splitmux);
fail:
GST_SPLITMUX_UNLOCK (splitmux);
}

1
gst/multifile/gstsplitmuxsink.h
View file

@ -85,6 +85,7 @@ typedef struct _MqStreamCtx
gboolean out_eos_async_done;
gboolean need_unblock;
gboolean caps_change;
gboolean is_releasing;
GstSegment in_segment;
GstSegment out_segment;