inputselector: Wake up streaming thread before PLAYING_TO_PAUSED transition

Also take object lock before iterating the pads.

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1772

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4190>
This commit is contained in:
Vivia Nikolaidou 2023-03-16 12:38:23 +02:00 committed by GStreamer Marge Bot
parent aef4caf3a0
commit e9faf63d2e

View file

@ -2045,6 +2045,10 @@ gst_input_selector_change_state (GstElement * element,
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:{ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:{
GList *walk; GList *walk;
GST_INPUT_SELECTOR_LOCK (self);
self->playing = FALSE;
GST_INPUT_SELECTOR_BROADCAST (self);
GST_OBJECT_LOCK (self);
for (walk = GST_ELEMENT_CAST (self)->sinkpads; walk; for (walk = GST_ELEMENT_CAST (self)->sinkpads; walk;
walk = g_list_next (walk)) { walk = g_list_next (walk)) {
GstSelectorPad *selpad = GST_SELECTOR_PAD_CAST (walk->data); GstSelectorPad *selpad = GST_SELECTOR_PAD_CAST (walk->data);
@ -2053,6 +2057,8 @@ gst_input_selector_change_state (GstElement * element,
gst_clock_id_unschedule (selpad->clock_id); gst_clock_id_unschedule (selpad->clock_id);
} }
} }
GST_OBJECT_UNLOCK (self);
GST_INPUT_SELECTOR_UNLOCK (self);
break; break;
} }
default: default:
@ -2065,10 +2071,6 @@ gst_input_selector_change_state (GstElement * element,
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_input_selector_reset (self); gst_input_selector_reset (self);
break; break;
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
GST_INPUT_SELECTOR_LOCK (self);
self->playing = FALSE;
GST_INPUT_SELECTOR_UNLOCK (self);
default: default:
break; break;
} }