virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/libsrt: poll for error conditions as well

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2020-02-14 23:24:29 +01:00
parent aab9133d91
commit c112fae660
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/libsrt.c
View File

@@ -164,16 +164,17 @@ static int libsrt_socket_nonblock(int socket, int enable)
static int libsrt_network_wait_fd(URLContext *h, int eid, int fd, int write) static int libsrt_network_wait_fd(URLContext *h, int eid, int fd, int write)
{ {
int ret, len = 1; int ret, len = 1, errlen = 1;
int modes = write ? SRT_EPOLL_OUT : SRT_EPOLL_IN; int modes = SRT_EPOLL_ERR | (write ? SRT_EPOLL_OUT : SRT_EPOLL_IN);
SRTSOCKET ready[1]; SRTSOCKET ready[1];
SRTSOCKET error[1];
if (srt_epoll_add_usock(eid, fd, &modes) < 0) if (srt_epoll_add_usock(eid, fd, &modes) < 0)
return libsrt_neterrno(h); return libsrt_neterrno(h);
if (write) { if (write) {
ret = srt_epoll_wait(eid, 0, 0, ready, &len, POLLING_TIME, 0, 0, 0, 0); ret = srt_epoll_wait(eid, error, &errlen, ready, &len, POLLING_TIME, 0, 0, 0, 0);
} else { } else {
ret = srt_epoll_wait(eid, ready, &len, 0, 0, POLLING_TIME, 0, 0, 0, 0); ret = srt_epoll_wait(eid, ready, &len, error, &errlen, POLLING_TIME, 0, 0, 0, 0);
} }
if (ret < 0) { if (ret < 0) {
if (srt_getlasterror(NULL) == SRT_ETIMEOUT) if (srt_getlasterror(NULL) == SRT_ETIMEOUT)
@@ -181,7 +182,7 @@ static int libsrt_network_wait_fd(URLContext *h, int eid, int fd, int write)
else else
ret = libsrt_neterrno(h); ret = libsrt_neterrno(h);
} else { } else {
ret = 0; ret = errlen ? AVERROR(EIO) : 0;
} }
if (srt_epoll_remove_usock(eid, fd) < 0) if (srt_epoll_remove_usock(eid, fd) < 0)
return libsrt_neterrno(h); return libsrt_neterrno(h);