[FFmpeg-cvslog] r17865 - in trunk/libavutil: fifo.c fifo.h
michael
subversion
Sat Mar 7 22:02:09 CET 2009
Author: michael
Date: Sat Mar 7 22:02:08 2009
New Revision: 17865
Log:
Try to fix the 1 byte cant be used issue.
Modified:
trunk/libavutil/fifo.c
trunk/libavutil/fifo.h
Modified: trunk/libavutil/fifo.c
==============================================================================
--- trunk/libavutil/fifo.c Sat Mar 7 20:56:21 2009 (r17864)
+++ trunk/libavutil/fifo.c Sat Mar 7 22:02:08 2009 (r17865)
@@ -24,10 +24,10 @@
int av_fifo_init(AVFifoBuffer *f, unsigned int size)
{
- size= FFMAX(size, size+1);
f->wptr = f->rptr =
f->buffer = av_malloc(size);
f->end = f->buffer + size;
+ f->rndx = f->wndx = 0;
if (!f->buffer)
return -1;
return 0;
@@ -40,10 +40,7 @@ void av_fifo_free(AVFifoBuffer *f)
int av_fifo_size(AVFifoBuffer *f)
{
- int size = f->wptr - f->rptr;
- if (size < 0)
- size += f->end - f->buffer;
- return size;
+ return (uint32_t)(f->wndx - f->rndx);
}
int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size)
@@ -60,7 +57,7 @@ void av_fifo_realloc(AVFifoBuffer *f, un
int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
unsigned int old_size= f->end - f->buffer;
- if(old_size <= new_size){
+ if(old_size < new_size){
int len= av_fifo_size(f);
AVFifoBuffer f2;
@@ -68,6 +65,7 @@ int av_fifo_realloc2(AVFifoBuffer *f, un
return -1;
av_fifo_read(f, f2.buffer, len);
f2.wptr += len;
+ f2.wndx += len;
av_free(f->buffer);
*f= f2;
}
@@ -96,6 +94,7 @@ int av_fifo_generic_write(AVFifoBuffer *
f->wptr += len;
if (f->wptr >= f->end)
f->wptr = f->buffer;
+ f->wndx += len;
size -= len;
} while (size > 0);
return total - size;
@@ -123,4 +122,5 @@ void av_fifo_drain(AVFifoBuffer *f, int
f->rptr += size;
if (f->rptr >= f->end)
f->rptr -= f->end - f->buffer;
+ f->rndx += size;
}
Modified: trunk/libavutil/fifo.h
==============================================================================
--- trunk/libavutil/fifo.h Sat Mar 7 20:56:21 2009 (r17864)
+++ trunk/libavutil/fifo.h Sat Mar 7 22:02:08 2009 (r17865)
@@ -31,6 +31,7 @@
typedef struct AVFifoBuffer {
uint8_t *buffer;
uint8_t *rptr, *wptr, *end;
+ uint32_t rndx, wndx;
} AVFifoBuffer;
/**
More information about the ffmpeg-cvslog
mailing list