mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin3: More SELECTION_LOCK when linking to slot

Browse source 
Since there can be multiple parsebin in a decodebin3,
linking parsebin with MultiQueueSlot should be protected also.

https://bugzilla.gnome.org/show_bug.cgi?id=772855
This commit is contained in:
Seungha Yang 2016-10-13 20:10:09 +09:00 committed by Edward Hervey
parent 8485a8d786
commit 5f2c0c8ea7
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst/playback/gstdecodebin3-parse.c
View file

@ -228,8 +228,10 @@ parse_chain_output_probe (GstPad * pad, GstPadProbeInfo * info,
gst_object_unref (input->active_stream); gst_object_unref (input->active_stream);
input->active_stream = stream; input->active_stream = stream;
/* We have the beginning of a stream, get a multiqueue slot and link to it */ /* We have the beginning of a stream, get a multiqueue slot and link to it */
g_mutex_lock (&input->dbin->selection_lock);
slot = get_slot_for_input (input->dbin, input); slot = get_slot_for_input (input->dbin, input);
link_input_to_slot (input, slot); link_input_to_slot (input, slot);
g_mutex_unlock (&input->dbin->selection_lock);
} else } else
gst_object_unref (stream); gst_object_unref (stream);
} }
@ -252,7 +254,11 @@ parse_chain_output_probe (GstPad * pad, GstPadProbeInfo * info,
check_all_streams_for_eos (input->dbin); check_all_streams_for_eos (input->dbin);
ret = GST_PAD_PROBE_DROP; ret = GST_PAD_PROBE_DROP;
} else { } else {
MultiQueueSlot *slot = get_slot_for_input (input->dbin, input); MultiQueueSlot *slot;
g_mutex_lock (&input->dbin->selection_lock);
slot = get_slot_for_input (input->dbin, input);
g_mutex_unlock (&input->dbin->selection_lock);
slot->drain_eos = input->drain_eos; slot->drain_eos = input->drain_eos;
@ -353,7 +359,9 @@ remove_input_stream (GstDecodebin3 * dbin, DecodebinInputStream * stream)
} }
} }
g_mutex_lock (&dbin->selection_lock);
slot = get_slot_for_input (dbin, stream); slot = get_slot_for_input (dbin, stream);
g_mutex_unlock (&dbin->selection_lock);
if (slot) { if (slot) {
slot->pending_stream = NULL; slot->pending_stream = NULL;
slot->input = NULL; slot->input = NULL;
@ -377,7 +385,7 @@ parsebin_buffer_probe (GstPad * pad, GstPadProbeInfo * info,
DecodebinInput * input) DecodebinInput * input)
{ {
GstDecodebin3 *dbin = input->dbin; GstDecodebin3 *dbin = input->dbin;
GList *tmp; GList *tmp, *unused_slot = NULL;
GST_FIXME_OBJECT (dbin, "Need a lock !"); GST_FIXME_OBJECT (dbin, "Need a lock !");
@ -430,8 +438,12 @@ parsebin_buffer_probe (GstPad * pad, GstPadProbeInfo * info,
input_stream = create_input_stream (dbin, stream, ppad->pad, ppad->input); input_stream = create_input_stream (dbin, stream, ppad->pad, ppad->input);
/* See if we can link it straight away */ /* See if we can link it straight away */
input_stream->active_stream = stream; input_stream->active_stream = stream;
g_mutex_lock (&dbin->selection_lock);
slot = get_slot_for_input (dbin, input_stream); slot = get_slot_for_input (dbin, input_stream);
link_input_to_slot (input_stream, slot); link_input_to_slot (input_stream, slot);
g_mutex_unlock (&dbin->selection_lock);
/* Remove the buffer and event probe */ /* Remove the buffer and event probe */
gst_pad_remove_probe (ppad->pad, ppad->buffer_probe); gst_pad_remove_probe (ppad->pad, ppad->buffer_probe);
gst_pad_remove_probe (ppad->pad, ppad->event_probe); gst_pad_remove_probe (ppad->pad, ppad->event_probe);
@ -443,15 +455,26 @@ parsebin_buffer_probe (GstPad * pad, GstPadProbeInfo * info,
input->pending_pads = NULL; input->pending_pads = NULL;
/* Weed out unused multiqueue slots */ /* Weed out unused multiqueue slots */
g_mutex_lock (&dbin->selection_lock);
for (tmp = dbin->slots; tmp; tmp = tmp->next) { for (tmp = dbin->slots; tmp; tmp = tmp->next) {
MultiQueueSlot *slot = (MultiQueueSlot *) tmp->data; MultiQueueSlot *slot = (MultiQueueSlot *) tmp->data;
GST_LOG_OBJECT (dbin, "Slot %d input:%p drain_eos:%d", GST_LOG_OBJECT (dbin, "Slot %d input:%p drain_eos:%d",
slot->id, slot->input, slot->drain_eos); slot->id, slot->input, slot->drain_eos);
if (slot->input == NULL) { if (slot->input == NULL) {
GST_DEBUG_OBJECT (slot->sink_pad, "Sending EOS to unused slot"); unused_slot =
gst_pad_send_event (slot->sink_pad, gst_event_new_eos ()); g_list_append (unused_slot, gst_object_ref (slot->sink_pad));
} }
} }
g_mutex_unlock (&dbin->selection_lock);
for (tmp = unused_slot; tmp; tmp = tmp->next) {
GstPad *sink_pad = (GstPad *) tmp->data;
GST_DEBUG_OBJECT (sink_pad, "Sending EOS to unused slot");
gst_pad_send_event (sink_pad, gst_event_new_eos ());
}
if (unused_slot)
g_list_free_full (unused_slot, (GDestroyNotify) gst_object_unref);
return GST_PAD_PROBE_OK; return GST_PAD_PROBE_OK;
} }

1
gst/playback/gstdecodebin3.c
View file

@ -1596,6 +1596,7 @@ fail:
} }
} }
/* Must be called with SELECTION_LOCK */
static MultiQueueSlot * static MultiQueueSlot *
get_slot_for_input (GstDecodebin3 * dbin, DecodebinInputStream * input) get_slot_for_input (GstDecodebin3 * dbin, DecodebinInputStream * input)
{ {