mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin3: high cpu usage after eos

Browse source 
After eos, decodebin3 enters a loop sending eos events which causes high cpu usage.

https://bugzilla.gnome.org/show_bug.cgi?id=792693
This commit is contained in:
François Laignel 2018-01-19 18:40:53 +01:00 committed by Edward Hervey
parent 1f792ab89d
commit ec7d81f67c
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/playback/gstdecodebin3.c
View file

@ -1585,7 +1585,10 @@ check_all_slot_for_eos (GstDecodebin3 * dbin)
/* Send EOS to all slots */ /* Send EOS to all slots */
if (peer) { if (peer) {
GstEvent *stream_start = GstStructure *s;
GstEvent *stream_start, *eos;
stream_start =
gst_pad_get_sticky_event (input->srcpad, GST_EVENT_STREAM_START, 0); gst_pad_get_sticky_event (input->srcpad, GST_EVENT_STREAM_START, 0);
/* First forward a custom STREAM_START event to reset the EOS status (if any) */ /* First forward a custom STREAM_START event to reset the EOS status (if any) */
@ -1598,7 +1601,12 @@ check_all_slot_for_eos (GstDecodebin3 * dbin)
G_TYPE_BOOLEAN, TRUE, NULL); G_TYPE_BOOLEAN, TRUE, NULL);
gst_pad_send_event (peer, custom_stream_start); gst_pad_send_event (peer, custom_stream_start);
} }
gst_pad_send_event (peer, gst_event_new_eos ());
eos = gst_event_new_eos ();
s = gst_event_writable_structure (eos);
gst_structure_set (s, "decodebin3-custom-final-eos", G_TYPE_BOOLEAN,
TRUE, NULL);
gst_pad_send_event (peer, eos);
gst_object_unref (peer); gst_object_unref (peer);
} else } else
GST_DEBUG_OBJECT (dbin, "no output"); GST_DEBUG_OBJECT (dbin, "no output");
@ -1754,8 +1762,14 @@ multiqueue_src_probe (GstPad * pad, GstPadProbeInfo * info,
free_multiqueue_slot_async (dbin, slot); free_multiqueue_slot_async (dbin, slot);
ret = GST_PAD_PROBE_REMOVE; ret = GST_PAD_PROBE_REMOVE;
} else if (!was_drained) { } else if (s
GST_DEBUG_OBJECT (pad, "What happens with event ?"); && gst_structure_has_field (s, "decodebin3-custom-final-eos")) {
GST_DEBUG_OBJECT (pad, "Got final eos, propagating downstream");
} else {
GST_DEBUG_OBJECT (pad, "Got regular eos (all_inputs_are_eos)");
/* drop current event as eos will be sent in check_all_slot_for_eos
* when all output streams are also eos */
ret = GST_PAD_PROBE_DROP;
SELECTION_LOCK (dbin); SELECTION_LOCK (dbin);
check_all_slot_for_eos (dbin); check_all_slot_for_eos (dbin);
SELECTION_UNLOCK (dbin); SELECTION_UNLOCK (dbin);