RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/rtsp: reuse POLLING_TIME and remove POLL_TIMEOUT_MS 

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2020-10-10 21:50:08 +08:00
parent 92c40ef882
commit 784ce1c294
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/rtsp.c
View File

@ -51,9 +51,7 @@
#include "rtpenc.h"
#include "mpegts.h"
/* Timeout values for socket poll, in ms,
* and read_packet(), in seconds */
#define POLL_TIMEOUT_MS 100
/* Default timeout values for read packet in seconds */
#define READ_PACKET_TIMEOUT_S 10
#define SDP_MAX_SIZE 16384
#define RECVBUF_SIZE 10 * RTP_MAX_PACKET_LENGTH
@ -1990,7 +1988,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
int n, i, ret;
struct pollfd *p = rt->p;
int *fds = NULL, fdsnum, fdsidx;
int runs = rt->initial_timeout * 1000LL / POLL_TIMEOUT_MS;
int runs = rt->initial_timeout * 1000LL / POLLING_TIME;
if (!p) {
p = rt->p = av_malloc_array(2 * rt->nb_rtsp_streams + 1, sizeof(struct pollfd));
@ -2028,7 +2026,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
return AVERROR_EXIT;
if (wait_end && wait_end - av_gettime_relative() < 0)
return AVERROR(EAGAIN);
n = poll(p, rt->max_p, POLL_TIMEOUT_MS);
n = poll(p, rt->max_p, POLLING_TIME);
if (n > 0) {
int j = rt->rtsp_hd ? 1 : 0;
for (i = 0; i < rt->nb_rtsp_streams; i++) {