generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough

Browse Source 
which can happen easily in linux

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
rogerdpack
2014-03-21 17:37:42 -06:00
committed by Michael Niedermayer
parent cd5cf395f6
commit 0b4c5c99bc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/udp.c
View File

@@ -695,8 +695,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
goto fail; goto fail;
} }
} else { } else {
/* set udp recv buffer size to the largest possible udp packet size to /* set udp recv buffer size to the requested value (default 64K) */
* avoid losing data on OSes that set this too low by default. */
tmp = s->buffer_size; tmp = s->buffer_size;
if (setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp)) < 0) { if (setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp)) < 0) {
log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_RECVBUF)"); log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_RECVBUF)");
@@ -704,8 +703,11 @@ static int udp_open(URLContext *h, const char *uri, int flags)
len = sizeof(tmp); len = sizeof(tmp);
if (getsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, &len) < 0) { if (getsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, &len) < 0) {
log_net_error(h, AV_LOG_WARNING, "getsockopt(SO_RCVBUF)"); log_net_error(h, AV_LOG_WARNING, "getsockopt(SO_RCVBUF)");
} else } else {
av_log(h, AV_LOG_DEBUG, "end receive buffer size reported is %d\n", tmp); av_log(h, AV_LOG_DEBUG, "end receive buffer size reported is %d\n", tmp);
if(tmp < s->buffer_size)
av_log(h, AV_LOG_WARNING, "attempted to set receive buffer to size %d but it only ended up set as %d", s->buffer_size, tmp);
}
/* make the socket non-blocking */ /* make the socket non-blocking */
ff_socket_nonblock(udp_fd, 1); ff_socket_nonblock(udp_fd, 1);