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

simplify

Browse Source 
Originally committed as revision 7569 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-01-17 19:30:23 +00:00
parent f81b99b82b
commit 870a12d1c2
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavutil/fifo.c
View File

@ -90,10 +90,8 @@ void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) {
void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size) void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size)
{ {
int len;
while (size > 0) { while (size > 0) {
len = FFMIN(f->end - f->wptr, size); int len = FFMIN(f->end - f->wptr, size);
memcpy(f->wptr, buf, len); memcpy(f->wptr, buf, len);
f->wptr += len; f->wptr += len;
if (f->wptr >= f->end) if (f->wptr >= f->end)
@ -107,15 +105,12 @@ void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size)
/* get data from the fifo (return -1 if not enough data) */ /* get data from the fifo (return -1 if not enough data) */
int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest) int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest)
{ {
int len; int size = av_fifo_size(f);
int size = f->wptr - f->rptr;
if (size < 0)
size += f->end - f->buffer;
if (size < buf_size) if (size < buf_size)
return -1; return -1;
while (buf_size > 0) { while (buf_size > 0) {
len = FFMIN(f->end - f->rptr, buf_size); int len = FFMIN(f->end - f->rptr, buf_size);
func(dest, f->rptr, len); func(dest, f->rptr, len);
f->rptr += len; f->rptr += len;
if (f->rptr >= f->end) if (f->rptr >= f->end)