virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

udp: use FFMAX&FFMIN.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-05-13 16:31:05 +02:00
parent 4275602183
commit 593bb98d61
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/udp.c
View File

@ -67,9 +67,6 @@ typedef struct {
sem_t circular_buffer_semaphore; sem_t circular_buffer_semaphore;
} UDPContext; } UDPContext;
#define min(X,Y) ((X)<(Y) ? (X):(Y))
#define max(X,Y) ((X)>(Y) ? (X):(Y))
#define UDP_TX_BUF_SIZE 32768 #define UDP_TX_BUF_SIZE 32768
#define UDP_MAX_PKT_SIZE 65536 #define UDP_MAX_PKT_SIZE 65536
@ -351,7 +348,7 @@ static void *circular_buffer_task( void *_URLContext)
left = s->circular_buffer_size-s->circular_buffer_head; left = s->circular_buffer_size-s->circular_buffer_head;
/* Whats the minimum we can read so that we dont comletely fill the buffer */ /* Whats the minimum we can read so that we dont comletely fill the buffer */
sem_wait( &s->circular_buffer_semaphore); sem_wait( &s->circular_buffer_semaphore);
left = min( left, s->circular_buffer_size-s->circular_buffer_available); left = FFMIN( left, s->circular_buffer_size-s->circular_buffer_available);
sem_post( &s->circular_buffer_semaphore ); sem_post( &s->circular_buffer_semaphore );
/* No Space left, error, what do we do now */ /* No Space left, error, what do we do now */
if( !left) { if( !left) {
@ -369,7 +366,7 @@ static void *circular_buffer_task( void *_URLContext)
s->circular_buffer_head += len; s->circular_buffer_head += len;
sem_wait( &s->circular_buffer_semaphore); sem_wait( &s->circular_buffer_semaphore);
s->circular_buffer_available += len; s->circular_buffer_available += len;
s->circular_buffer_available_max = max( s->circular_buffer_available_max, s->circular_buffer_available); s->circular_buffer_available_max = FFMAX( s->circular_buffer_available_max, s->circular_buffer_available);
sem_post( &s->circular_buffer_semaphore ); sem_post( &s->circular_buffer_semaphore );
if( s->circular_buffer_head>=s->circular_buffer_size) if( s->circular_buffer_head>=s->circular_buffer_size)
s->circular_buffer_head -= s->circular_buffer_size; s->circular_buffer_head -= s->circular_buffer_size;
@ -560,11 +557,11 @@ static int udp_read(URLContext *h, uint8_t *buf, int size)
if (avail) { // >=size) { if (avail) { // >=size) {
// Maximum amount available // Maximum amount available
size = min( avail, size); size = FFMIN( avail, size);
// Whats left till the end of the circular buffer // Whats left till the end of the circular buffer
left = s->circular_buffer_size-s->circular_buffer_tail; left = s->circular_buffer_size-s->circular_buffer_tail;
// How much do we need, all? // How much do we need, all?
left = min( left, size); left = FFMIN( left, size);
// Get the first block // Get the first block
memcpy( buf, s->circular_buffer+s->circular_buffer_tail, left); memcpy( buf, s->circular_buffer+s->circular_buffer_tail, left);
// Have we any more, this will be from the start of the buffer // Have we any more, this will be from the start of the buffer