mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtspsrc: improve async handling

Browse source 
Simplify the command handling, only continue looping when we have not received
another command or when the previous loop was successfull.
Avoid looping on a disconnected socket.
This commit is contained in:
Wim Taymans 2011-01-10 11:45:03 +01:00 committed by Mark Nauwelaerts
parent 2513207433
commit 6fe680934a
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/rtsp/gstrtspsrc.c
View file

@ -3541,7 +3541,7 @@ gst_rtspsrc_loop_interleaved (GstRTSPSrc * src)
tv_timeout.tv_sec, tv_timeout.tv_usec); tv_timeout.tv_sec, tv_timeout.tv_usec);
GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (src);
if (src->loop_cmd == CMD_LOOP && !src->flushing) { if (!src->flushing) {
src->waiting = TRUE; src->waiting = TRUE;
GST_OBJECT_UNLOCK (src); GST_OBJECT_UNLOCK (src);
@ -3787,7 +3787,7 @@ gst_rtspsrc_loop_udp (GstRTSPSrc * src)
gst_rtsp_message_unset (&message); gst_rtsp_message_unset (&message);
GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (src);
if (src->loop_cmd == CMD_LOOP && !src->flushing) { if (!src->flushing) {
src->waiting = TRUE; src->waiting = TRUE;
GST_OBJECT_UNLOCK (src); GST_OBJECT_UNLOCK (src);
@ -4138,6 +4138,9 @@ gst_rtspsrc_loop (GstRTSPSrc * src)
{ {
GstFlowReturn ret; GstFlowReturn ret;
if (!src->conninfo.connection || !src->conninfo.connected)
goto no_connection;
if (src->interleaved) if (src->interleaved)
ret = gst_rtspsrc_loop_interleaved (src); ret = gst_rtspsrc_loop_interleaved (src);
else else
@ -4149,6 +4152,12 @@ gst_rtspsrc_loop (GstRTSPSrc * src)
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
no_connection:
{
GST_WARNING_OBJECT (src, "we are not connected");
ret = GST_FLOW_WRONG_STATE;
goto pause;
}
pause: pause:
{ {
const gchar *reason = gst_flow_get_name (ret); const gchar *reason = gst_flow_get_name (ret);
@ -6377,8 +6386,7 @@ gst_rtspsrc_thread (GstRTSPSrc * src)
GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (src);
cmd = src->loop_cmd; cmd = src->loop_cmd;
if (cmd != CMD_LOOP || src->flushing) src->loop_cmd = CMD_WAIT;
src->loop_cmd = CMD_WAIT;
GST_DEBUG_OBJECT (src, "got command %d", cmd); GST_DEBUG_OBJECT (src, "got command %d", cmd);
GST_OBJECT_UNLOCK (src); GST_OBJECT_UNLOCK (src);