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

uridecodebin3: Don't hold lock when posting messages or signals

Browse source 
There's a very good chance that the receiver might react on those synchronously
and call back into uridecodebin3 (ex: for setting the next URI).

Make sure we release the lock if we need to do that.

Fixes #3400

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6402>
This commit is contained in:
Edward Hervey 2024-03-19 09:32:39 +01:00
parent bc858976db
commit 42e24c32e5
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c
View file

@ -1099,6 +1099,8 @@ switch_and_activate_input_locked (GstURIDecodeBin3 * uridecodebin,
GList *to_activate = NULL; GList *to_activate = NULL;
GList *iternew, *iterold; GList *iternew, *iterold;
gboolean inactive_previous_item = old_pads == NULL; gboolean inactive_previous_item = old_pads == NULL;
GstMessage *pending_buffering_msg = NULL;
gboolean pending_about_to_finish = FALSE;
/* Deactivate old urisourcebins first ? Problem is they might remove the pads */ /* Deactivate old urisourcebins first ? Problem is they might remove the pads */
@ -1214,19 +1216,30 @@ switch_and_activate_input_locked (GstURIDecodeBin3 * uridecodebin,
/* and set new one as input item */ /* and set new one as input item */
uridecodebin->input_item = new_item; uridecodebin->input_item = new_item;
/* If the new source is already drained, propagate about-to-finish */ pending_about_to_finish = new_item->pending_about_to_finish;
if (new_item->pending_about_to_finish) { if (new_item->main_item->handler->pending_buffering_msg) {
emit_and_handle_about_to_finish (uridecodebin, new_item); pending_buffering_msg = new_item->main_item->handler->pending_buffering_msg;
new_item->main_item->handler->pending_buffering_msg = NULL;
} }
/* Finally propagate pending buffering message */ /* If we have to post message or emit signals, it might trigger some
if (new_item->main_item->handler->pending_buffering_msg) { * re-entring actions (like setting the next URI). Make sure we release the
GstMessage *msg = new_item->main_item->handler->pending_buffering_msg; * lock when posting/emitting */
new_item->main_item->handler->pending_buffering_msg = NULL; if (pending_buffering_msg || pending_about_to_finish) {
GST_DEBUG_OBJECT (uridecodebin,
"Posting pending buffering message %" GST_PTR_FORMAT, msg);
PLAY_ITEMS_UNLOCK (uridecodebin); PLAY_ITEMS_UNLOCK (uridecodebin);
GST_BIN_CLASS (parent_class)->handle_message ((GstBin *) uridecodebin, msg); /* If the new source is already drained, propagate about-to-finish */
if (pending_about_to_finish) {
emit_and_handle_about_to_finish (uridecodebin, new_item);
}
/* Finally propagate pending buffering message */
if (pending_buffering_msg) {
GST_DEBUG_OBJECT (uridecodebin,
"Posting pending buffering message %" GST_PTR_FORMAT,
pending_buffering_msg);
GST_BIN_CLASS (parent_class)->handle_message ((GstBin *) uridecodebin,
pending_buffering_msg);
}
PLAY_ITEMS_LOCK (uridecodebin); PLAY_ITEMS_LOCK (uridecodebin);
} }
} }