lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions

os: replace select with poll

Browse source 
Select has limitations on the fd values it could accept and silently
breaks when it is reached.
(cherry picked from commit a8475bbdb6)
This commit is contained in:
Luca Barbato 2011-01-28 03:12:21 +01:00 • committed by Michael Niedermayer
parent b5f83debf5
commit d0eb91ad04
8 changed files with 73 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libavformat/sapdec.c
View file

@ -25,8 +25,8 @@
#include "network.h"
#include "os_support.h"
#include "internal.h"
#if HAVE_SYS_SELECT_H
#include <sys/select.h>
#if HAVE_POLL_H
#include <poll.h>
#endif
#include <sys/time.h>
@ -183,19 +183,15 @@ static int sap_fetch_packet(AVFormatContext *s, AVPacket *pkt)
struct SAPState *sap = s->priv_data;
int fd = url_get_file_handle(sap->ann_fd);
int n, ret;
fd_set rfds;
struct timeval tv;
struct pollfd p = {fd, POLLIN, 0};
uint8_t recvbuf[1500];
if (sap->eof)
return AVERROR_EOF;
while (1) {
FD_ZERO(&rfds);
FD_SET(fd, &rfds);
tv.tv_sec = tv.tv_usec = 0;
n = select(fd + 1, &rfds, NULL, NULL, &tv);
if (n <= 0 || !FD_ISSET(fd, &rfds))
n = poll(&p, 1, 0);
if (n <= 0 || !(p.revents & POLLIN))
break;
ret = url_read(sap->ann_fd, recvbuf, sizeof(recvbuf));
if (ret >= 8) {