Mercurial > libavformat.hg

changeset 5750:0f9c0db923e5 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check url_interrupt_cb in rtp_read, wait in select for max 100 ms before rechecking url_interrupt_cb
author mstorsjo
date Thu, 04 Mar 2010 15:08:54 +0000
parents dfbaca29e6fd
children 4d38b2c2bc59
files rtpproto.c
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rtpproto.c	Thu Mar 04 13:27:53 2010 +0000
+++ b/rtpproto.c	Thu Mar 04 15:08:54 2010 +0000
@@ -193,6 +193,7 @@
     socklen_t from_len;
     int len, fd_max, n;
     fd_set rfds;
+    struct timeval tv;
 #if 0
     for(;;) {
         from_len = sizeof(from);
@@ -208,6 +209,8 @@
     }
 #else
     for(;;) {
+        if (url_interrupt_cb())
+            return AVERROR(EINTR);
         /* build fdset to listen to RTP and RTCP packets */
         FD_ZERO(&rfds);
         fd_max = s->rtp_fd;
@@ -215,7 +218,9 @@
         if (s->rtcp_fd > fd_max)
             fd_max = s->rtcp_fd;
         FD_SET(s->rtcp_fd, &rfds);
-        n = select(fd_max + 1, &rfds, NULL, NULL, NULL);
+        tv.tv_sec = 0;
+        tv.tv_usec = 100 * 1000;
+        n = select(fd_max + 1, &rfds, NULL, NULL, &tv);
         if (n > 0) {
             /* first try RTCP */
             if (FD_ISSET(s->rtcp_fd, &rfds)) {