#include "common.h"
#include "fifo.h"
-int av_fifo_init(AVFifoBuffer *f, int size)
+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;
return size;
}
-/**
- * Get data from the fifo (returns -1 if not enough data).
- */
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){
+ 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;
av_free(f->buffer);
*f= f2;
}
+ return 0;
}
void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size)
}
-/** 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 size = av_fifo_size(f);
-
- if (size < buf_size)
- return -1;
do {
int len = FFMIN(f->end - f->rptr, buf_size);
if(func) func(dest, f->rptr, len);