mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtspclientsink: Wait until OPEN has been scheduled

Browse source 
Make sure that the sink thread has started opening connection
to the server before continuing.

https://bugzilla.gnome.org/show_bug.cgi?id=790412
This commit is contained in:
Patricia Muscalu 2017-12-16 21:01:43 +01:00 committed by Edward Hervey
parent b4ab386e87
commit 96cfed48bf
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/rtsp-sink/gstrtspclientsink.c
View file

@ -3025,6 +3025,12 @@ gst_rtsp_client_sink_open (GstRTSPClientSink * sink, gboolean async)
sink->methods = sink->methods =
GST_RTSP_SETUP | GST_RTSP_RECORD | GST_RTSP_PAUSE | GST_RTSP_TEARDOWN; GST_RTSP_SETUP | GST_RTSP_RECORD | GST_RTSP_PAUSE | GST_RTSP_TEARDOWN;
g_mutex_lock (&sink->open_conn_lock);
sink->open_conn_start = TRUE;
g_cond_broadcast (&sink->open_conn_cond);
GST_DEBUG_OBJECT (sink, "connection to server started");
g_mutex_unlock (&sink->open_conn_lock);
if ((ret = gst_rtsp_client_sink_connect_to_server (sink, async)) < 0) if ((ret = gst_rtsp_client_sink_connect_to_server (sink, async)) < 0)
goto open_failed; goto open_failed;
@ -4569,6 +4575,18 @@ gst_rtsp_client_sink_change_state (GstElement * element,
ret = GST_STATE_CHANGE_ASYNC; ret = GST_STATE_CHANGE_ASYNC;
g_mutex_unlock (&rtsp_client_sink->preroll_lock); g_mutex_unlock (&rtsp_client_sink->preroll_lock);
gst_rtsp_client_sink_loop_send_cmd (rtsp_client_sink, CMD_OPEN, 0); gst_rtsp_client_sink_loop_send_cmd (rtsp_client_sink, CMD_OPEN, 0);
/* CMD_OPEN has been scheduled. Wait until the sink thread starts
* opening connection to the server */
g_mutex_lock (&rtsp_client_sink->open_conn_lock);
while (!rtsp_client_sink->open_conn_start) {
GST_DEBUG_OBJECT (rtsp_client_sink,
"wait for connection to be started");
g_cond_wait (&rtsp_client_sink->open_conn_cond,
&rtsp_client_sink->open_conn_lock);
}
rtsp_client_sink->open_conn_start = FALSE;
g_mutex_unlock (&rtsp_client_sink->open_conn_lock);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:{ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:{
GST_DEBUG_OBJECT (rtsp_client_sink, GST_DEBUG_OBJECT (rtsp_client_sink,

5
gst/rtsp-sink/gstrtspclientsink.h
View file

@ -230,6 +230,11 @@ struct _GstRTSPClientSink {
GMutex preroll_lock; GMutex preroll_lock;
GCond preroll_cond; GCond preroll_cond;
/* TRUE if connection to server has been scheduled */
gboolean open_conn_start;
GMutex open_conn_lock;
GCond open_conn_cond;
GstClockTime rtx_time; GstClockTime rtx_time;
GstRTSPProfile profiles; GstRTSPProfile profiles;