summaryrefslogtreecommitdiff
path: root/src/input/librtsp
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-02-05 00:08:55 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-02-05 00:08:55 +0000
commit4e0331fac2b197b5d6b20a987f2e54cff2f67ad4 (patch)
tree78ab654be8f591eb92f8cefa60bbaefdf306b678 /src/input/librtsp
parent9cb0f1dd7c89891c6c80614ad13f4643ba00d566 (diff)
downloadxine-lib-4e0331fac2b197b5d6b20a987f2e54cff2f67ad4.tar.gz
xine-lib-4e0331fac2b197b5d6b20a987f2e54cff2f67ad4.tar.bz2
try to have the same behaviour reading from network on http/mms/pnm/rtsp.
select() is useful to avoid burning cpu cicles, otoh, we should not call it after end of stream since it will hang xine for 30sec. idea: do select() only on EAGAIN. todo: unify these functions (?) CVS patchset: 4105 CVS date: 2003/02/05 00:08:55
Diffstat (limited to 'src/input/librtsp')
-rw-r--r--src/input/librtsp/rtsp.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c
index 06d0a9a70..c82439364 100644
--- a/src/input/librtsp/rtsp.c
+++ b/src/input/librtsp/rtsp.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: rtsp.c,v 1.6 2003/01/29 10:49:24 miguelfreitas Exp $
+ * $Id: rtsp.c,v 1.7 2003/02/05 00:08:55 miguelfreitas Exp $
*
* a minimalistic implementation of rtsp protocol,
* *not* RFC 2326 compilant yet.
@@ -175,26 +175,24 @@ static ssize_t read_stream(int fd, void *buf, size_t count) {
while (total < count) {
-#if 0
- fd_set rset;
- struct timeval timeout;
-
- FD_ZERO (&rset);
- FD_SET (fd, &rset);
-
- timeout.tv_sec = 30;
- timeout.tv_usec = 0;
-
- if (select (fd+1, &rset, NULL, NULL, &timeout) <= 0) {
- return -1;
- }
-#endif
-
ret=read (fd, ((uint8_t*)buf)+total, count-total);
if (ret<0) {
- if(errno == EAGAIN)
+ if(errno == EAGAIN) {
+ fd_set rset;
+ struct timeval timeout;
+
+ FD_ZERO (&rset);
+ FD_SET (fd, &rset);
+
+ timeout.tv_sec = 30;
+ timeout.tv_usec = 0;
+
+ if (select (fd+1, &rset, NULL, NULL, &timeout) <= 0) {
+ return -1;
+ }
continue;
+ }
printf ("rtsp: read error.\n");
return ret;