From 63afc4f6384c4e3b37173e52782cc110406f573f Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Thu, 15 Mar 2012 13:07:10 +0100 Subject: udp: use non-blocking read instead of select. --- libavformat/udp.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'libavformat') diff --git a/libavformat/udp.c b/libavformat/udp.c index 0a831e8ea5..dad79ffc41 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -327,33 +327,14 @@ static void *circular_buffer_task( void *_URLContext) { URLContext *h = _URLContext; UDPContext *s = h->priv_data; - fd_set rfds; - struct timeval tv; int old_cancelstate; pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate); + ff_socket_nonblock(s->udp_fd, 0); while(1) { int left; - int ret; int len; - FD_ZERO(&rfds); - FD_SET(s->udp_fd, &rfds); - tv.tv_sec = 1; - tv.tv_usec = 0; - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelstate); - ret = select(s->udp_fd + 1, &rfds, NULL, NULL, &tv); - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate); - if (ret < 0) { - if (ff_neterrno() == AVERROR(EINTR)) - continue; - s->circular_buffer_error = AVERROR(EIO); - goto end; - } - - if (!(ret > 0 && FD_ISSET(s->udp_fd, &rfds))) - continue; - /* How much do we have left to the end of the buffer */ /* Whats the minimum we can read so that we dont comletely fill the buffer */ left = av_fifo_space(s->fifo); -- cgit v1.2.3