/*
- * A very simple circular buffer FIFO implementation
+ * a very simple circular buffer FIFO implementation
* Copyright (c) 2000, 2001, 2002 Fabrice Bellard
* Copyright (c) 2006 Roman Shaposhnik
*
#include "common.h"
#include "fifo.h"
-int av_fifo_init(AVFifoBuffer *f, int size)
+int av_fifo_init(AVFifoBuffer *f, unsigned int size)
{
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;
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)
return av_fifo_generic_read(f, buf_size, NULL, buf);
}
-/**
- * Resizes a FIFO.
- */
+#if LIBAVUTIL_VERSION_MAJOR < 50
void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) {
+ av_fifo_realloc2(f, new_size);
+}
+#endif
+
+int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
unsigned int old_size= f->end - f->buffer;
if(old_size < new_size){
int len= av_fifo_size(f);
AVFifoBuffer f2;
- av_fifo_init(&f2, new_size);
+ if (av_fifo_init(&f2, new_size) < 0)
+ return -1;
av_fifo_read(f, f2.buffer, len);
f2.wptr += len;
+ f2.wndx += len;
av_free(f->buffer);
*f= f2;
}
+ return 0;
}
+#if LIBAVUTIL_VERSION_MAJOR < 50
void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size)
{
av_fifo_generic_write(f, (void *)buf, size, NULL);
}
+#endif
int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int))
{
f->wptr += len;
if (f->wptr >= f->end)
f->wptr = f->buffer;
+ f->wndx += len;
size -= len;
} while (size > 0);
return total - size;
return 0;
}
-/** discard data from the fifo */
+/** Discard data from the FIFO. */
void av_fifo_drain(AVFifoBuffer *f, int size)
{
f->rptr += size;
if (f->rptr >= f->end)
f->rptr -= f->end - f->buffer;
+ f->rndx += size;
}