From fc9713910336d23ed5117fcebf09edbf65c39295 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 24 Mar 2008 16:40:08 +0000 Subject: [PATCH] gst-libs/gst/rtsp/gstrtspconnection.c: Don't error when poll_wait returns EAGAIN. Original commit message from CVS: * gst-libs/gst/rtsp/gstrtspconnection.c: (gst_rtsp_connection_connect), (gst_rtsp_connection_write), (gst_rtsp_connection_read_internal), (gst_rtsp_connection_poll): Don't error when poll_wait returns EAGAIN. --- ChangeLog | 7 +++++++ gst-libs/gst/rtsp/gstrtspconnection.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0311124..0d10905 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-03-24 Wim Taymans + * gst-libs/gst/rtsp/gstrtspconnection.c: + (gst_rtsp_connection_connect), (gst_rtsp_connection_write), + (gst_rtsp_connection_read_internal), (gst_rtsp_connection_poll): + Don't error when poll_wait returns EAGAIN. + +2008-03-24 Wim Taymans + * gst/playback/gstqueue2.c: (gst_queue_is_filled): The queue is never filled when there are no buffers in the queue at all. Fixes #523993. diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c index 1530371..cd70c8f 100644 --- a/gst-libs/gst/rtsp/gstrtspconnection.c +++ b/gst-libs/gst/rtsp/gstrtspconnection.c @@ -275,7 +275,7 @@ gst_rtsp_connection_connect (GstRTSPConnection * conn, GTimeVal * timeout) do { retval = gst_poll_wait (conn->fdset, to); - } while (retval == -1 && errno == EINTR); + } while (retval == -1 && (errno == EINTR || errno == EAGAIN)); if (retval == 0) goto timeout; @@ -408,7 +408,7 @@ gst_rtsp_connection_write (GstRTSPConnection * conn, const guint8 * data, do { retval = gst_poll_wait (conn->fdset, to); - } while (retval == -1 && errno == EINTR); + } while (retval == -1 && (errno == EINTR || errno == EAGAIN)); if (retval == 0) goto timeout; @@ -819,7 +819,7 @@ gst_rtsp_connection_read_internal (GstRTSPConnection * conn, guint8 * data, do { retval = gst_poll_wait (conn->fdset, to); - } while (retval == -1 && errno == EINTR); + } while (retval == -1 && (errno == EINTR || errno == EAGAIN)); if (retval == -1) { if (errno == EBUSY) @@ -1191,7 +1191,7 @@ gst_rtsp_connection_poll (GstRTSPConnection * conn, GstRTSPEvent events, do { retval = gst_poll_wait (conn->fdset, to); - } while (retval == -1 && errno == EINTR); + } while (retval == -1 && (errno == EINTR || errno == EAGAIN)); if (retval == 0) goto select_timeout; -- 2.7.4