highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udp: call av_fifo_space directly as needed.

Browse Source 
The comment seemed to indicate that left was used
to limit the size of the recv, but it was not so.
This commit is contained in:
Nicolas George 2012-03-15 13:11:06 +01:00
parent 63afc4f638
commit 5deb5ccbbb
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/udp.c
View File

@ -332,13 +332,8 @@ static void *circular_buffer_task( void *_URLContext)
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate);
ff_socket_nonblock(s->udp_fd, 0); ff_socket_nonblock(s->udp_fd, 0);
while(1) { while(1) {
int left;
int len; int len;
/* How much do we have left to the end of the buffer */
/* Whats the minimum we can read so that we dont comletely fill the buffer */
left = av_fifo_space(s->fifo);
/* Blocking operations are always cancellation points; /* Blocking operations are always cancellation points;
see "General Information" / "Thread Cancelation Overview" see "General Information" / "Thread Cancelation Overview"
in Single Unix. */ in Single Unix. */
@ -353,7 +348,8 @@ static void *circular_buffer_task( void *_URLContext)
continue; continue;
} }
AV_WL32(s->tmp, len); AV_WL32(s->tmp, len);
if(left < len + 4) {
if(av_fifo_space(s->fifo) < len + 4) {
/* No Space left */ /* No Space left */
if (s->overrun_nonfatal) { if (s->overrun_nonfatal) {
av_log(h, AV_LOG_WARNING, "Circular buffer overrun. " av_log(h, AV_LOG_WARNING, "Circular buffer overrun. "