mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
avformat/libsrt: use listen_timeout for listening
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
parent
7cc7680a80
commit
449e984192
@ -227,14 +227,9 @@ static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t
|
|||||||
if (ret)
|
if (ret)
|
||||||
return libsrt_neterrno(h);
|
return libsrt_neterrno(h);
|
||||||
|
|
||||||
while ((ret = libsrt_network_wait_fd_timeout(h, eid, fd, 1, timeout, &h->interrupt_callback))) {
|
ret = libsrt_network_wait_fd_timeout(h, eid, fd, 1, timeout, &h->interrupt_callback);
|
||||||
switch (ret) {
|
if (ret < 0)
|
||||||
case AVERROR(ETIMEDOUT):
|
return ret;
|
||||||
continue;
|
|
||||||
default:
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = srt_accept(fd, NULL, NULL);
|
ret = srt_accept(fd, NULL, NULL);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
@ -434,7 +429,7 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags)
|
|||||||
|
|
||||||
if (s->mode == SRT_MODE_LISTENER) {
|
if (s->mode == SRT_MODE_LISTENER) {
|
||||||
// multi-client
|
// multi-client
|
||||||
if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, open_timeout)) < 0)
|
if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, s->listen_timeout)) < 0)
|
||||||
goto fail1;
|
goto fail1;
|
||||||
fd = ret;
|
fd = ret;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user