opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 21:08:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add a timeout to the select() call. Patch by Sam Gerstein <sgerstein bluefinlab

Browse Source 
com>.

Originally committed as revision 22718 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Sam Gerstein
2010-03-29 17:36:08 +00:00
committed by Ronald S. Bultje
parent a0d5f3d39a
commit 9cba6f5f40
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/rtsp.c
View File

@ -46,6 +46,12 @@
int rtsp_default_protocols = (1 << RTSP_LOWER_TRANSPORT_UDP); int rtsp_default_protocols = (1 << RTSP_LOWER_TRANSPORT_UDP);
#endif #endif
/* Timout values for socket select, in ms,
* and read_packet(), in seconds */
#define SELECT_TIMEOUT_MS 100
#define READ_PACKET_TIMEOUT_S 10
#define MAX_TIMEOUTS READ_PACKET_TIMEOUT_S * 1000 / SELECT_TIMEOUT_MS
#define SPACE_CHARS " \t\r\n" #define SPACE_CHARS " \t\r\n"
/* we use memchr() instead of strchr() here because strchr() will return /* we use memchr() instead of strchr() here because strchr() will return
* the terminating '\0' of SPACE_CHARS instead of NULL if c is '\0'. */ * the terminating '\0' of SPACE_CHARS instead of NULL if c is '\0'. */
@ -1634,7 +1640,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
RTSPStream *rtsp_st; RTSPStream *rtsp_st;
fd_set rfds; fd_set rfds;
int fd, fd_max, n, i, ret, tcp_fd; int fd, fd_max, n, i, ret, tcp_fd, timeout_cnt = 0;
struct timeval tv; struct timeval tv;
for (;;) { for (;;) {
@ -1660,9 +1666,10 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
} }
} }
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 100 * 1000; tv.tv_usec = SELECT_TIMEOUT_MS * 1000;
n = select(fd_max + 1, &rfds, NULL, NULL, &tv); n = select(fd_max + 1, &rfds, NULL, NULL, &tv);
if (n > 0) { if (n > 0) {
timeout_cnt = 0;
for (i = 0; i < rt->nb_rtsp_streams; i++) { for (i = 0; i < rt->nb_rtsp_streams; i++) {
rtsp_st = rt->rtsp_streams[i]; rtsp_st = rt->rtsp_streams[i];
if (rtsp_st->rtp_handle) { if (rtsp_st->rtp_handle) {
@ -1688,7 +1695,10 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
return 0; return 0;
} }
#endif #endif
} } else if (n == 0 && ++timeout_cnt >= MAX_TIMEOUTS) {
return AVERROR(ETIME);
} else if (n < 0 && errno != EINTR)
return AVERROR(errno);
} }
} }