mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 20:46:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "splitmuxsink: Use GstBin async-handling instead of our own."

Browse source 
This reverts commit fa008f271a.

async-handling in GstBin causes the pipeline to spin at 100%
CPU as the top-level pipeline tries to change that state
to PLAYING constantly. This is a workaround for a core
problem, essentially, but an improvement in this case for now.
This commit is contained in:
Jan Schmidt 2016-08-08 02:53:48 +10:00
parent 89af379ff0
commit 5a71334fb0
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/multifile/gstsplitmuxsink.c
View file

@ -248,7 +248,6 @@ gst_splitmux_sink_init (GstSplitMuxSink * splitmux)
splitmux->max_files = DEFAULT_MAX_FILES; splitmux->max_files = DEFAULT_MAX_FILES;
GST_OBJECT_FLAG_SET (splitmux, GST_ELEMENT_FLAG_SINK); GST_OBJECT_FLAG_SET (splitmux, GST_ELEMENT_FLAG_SINK);
g_object_set (splitmux, "async-handling", TRUE, NULL);
} }
static void static void
@ -776,6 +775,8 @@ static void
start_next_fragment (GstSplitMuxSink * splitmux) start_next_fragment (GstSplitMuxSink * splitmux)
{ {
/* 1 change to new file */ /* 1 change to new file */
splitmux->switching_fragment = TRUE;
gst_element_set_locked_state (splitmux->muxer, TRUE); gst_element_set_locked_state (splitmux->muxer, TRUE);
gst_element_set_locked_state (splitmux->active_sink, TRUE); gst_element_set_locked_state (splitmux->active_sink, TRUE);
gst_element_set_state (splitmux->muxer, GST_STATE_NULL); gst_element_set_state (splitmux->muxer, GST_STATE_NULL);
@ -788,6 +789,8 @@ start_next_fragment (GstSplitMuxSink * splitmux)
gst_element_set_locked_state (splitmux->muxer, FALSE); gst_element_set_locked_state (splitmux->muxer, FALSE);
gst_element_set_locked_state (splitmux->active_sink, FALSE); gst_element_set_locked_state (splitmux->active_sink, FALSE);
splitmux->switching_fragment = FALSE;
g_list_foreach (splitmux->contexts, (GFunc) restart_context, splitmux); g_list_foreach (splitmux->contexts, (GFunc) restart_context, splitmux);
/* Switch state and go back to processing */ /* Switch state and go back to processing */
@ -839,6 +842,20 @@ bus_handler (GstBin * bin, GstMessage * message)
} }
GST_SPLITMUX_UNLOCK (splitmux); GST_SPLITMUX_UNLOCK (splitmux);
break; break;
case GST_MESSAGE_ASYNC_START:
case GST_MESSAGE_ASYNC_DONE:
/* Ignore state changes from our children while switching */
if (splitmux->switching_fragment) {
if (GST_MESSAGE_SRC (message) == (GstObject *) splitmux->active_sink ||
GST_MESSAGE_SRC (message) == (GstObject *) splitmux->muxer) {
GST_LOG_OBJECT (splitmux,
"Ignoring state change from child %" GST_PTR_FORMAT
" while switching", GST_MESSAGE_SRC (message));
gst_message_unref (message);
return;
}
}
break;
default: default:
break; break;
} }

1
gst/multifile/gstsplitmuxsink.h
View file

@ -125,6 +125,7 @@ struct _GstSplitMuxSink {
gsize mux_start_bytes; gsize mux_start_bytes;
gboolean opening_first_fragment; gboolean opening_first_fragment;
gboolean switching_fragment;
}; };
struct _GstSplitMuxSinkClass { struct _GstSplitMuxSinkClass {