mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-09 13:30:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gst: protect negotiated field with lock

Browse source 
Move the lock around the negotiated field.

See !1287
This commit is contained in:
Wim Taymans 2022-06-21 13:19:32 +02:00
parent a4998e0b87
commit 5363bdcfcb
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/gst/gstpipewiresrc.c
View file

@ -1026,10 +1026,10 @@ gst_pipewire_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
pwsrc = GST_PIPEWIRE_SRC (psrc); pwsrc = GST_PIPEWIRE_SRC (psrc);
pw_thread_loop_lock (pwsrc->core->loop);
if (!pwsrc->negotiated) if (!pwsrc->negotiated)
goto not_negotiated; goto not_negotiated;
pw_thread_loop_lock (pwsrc->core->loop);
while (TRUE) { while (TRUE) {
enum pw_stream_state state; enum pw_stream_state state;
@ -1126,6 +1126,7 @@ gst_pipewire_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
not_negotiated: not_negotiated:
{ {
pw_thread_loop_unlock (pwsrc->core->loop);
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
} }
streaming_eos: streaming_eos:
@ -1348,7 +1349,9 @@ gst_pipewire_src_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
pw_thread_loop_lock (this->core->loop);
this->negotiated = FALSE; this->negotiated = FALSE;
pw_thread_loop_unlock (this->core->loop);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
gst_pipewire_src_close (this); gst_pipewire_src_close (this);