frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / libavutil / fifo.c

diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 515b2d7f59f8ec90cac41294f5ce8c226aa3e28b..840b73a57bf7f1d0476c0b076aeccb2cf0f72e45 100644 (file)
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -27,9 +27,9 @@ AVFifoBuffer *av_fifo_alloc(unsigned int size)
     AVFifoBuffer *f= av_mallocz(sizeof(AVFifoBuffer));
     if(!f)
         return NULL;
-    f->wptr = f->rptr =
     f->buffer = av_malloc(size);
     f->end = f->buffer + size;
+    av_fifo_reset(f);
     if (!f->buffer)
         av_freep(&f);
     return f;
@@ -38,26 +38,26 @@ AVFifoBuffer *av_fifo_alloc(unsigned int size)
 void av_fifo_free(AVFifoBuffer *f)
 {
     if(f){
-    av_free(f->buffer);
-    av_free(f);
+        av_free(f->buffer);
+        av_free(f);
     }
 }
 
-int av_fifo_size(AVFifoBuffer *f)
+void av_fifo_reset(AVFifoBuffer *f)
 {
-    return (uint32_t)(f->wndx - f->rndx);
+    f->wptr = f->rptr = f->buffer;
+    f->wndx = f->rndx = 0;
 }
 
-int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size)
+int av_fifo_size(AVFifoBuffer *f)
 {
-    return av_fifo_generic_read(f, buf_size, NULL, buf);
+    return (uint32_t)(f->wndx - f->rndx);
 }
 
-#if LIBAVUTIL_VERSION_MAJOR < 50
-void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) {
-    av_fifo_realloc2(f, new_size);
+int av_fifo_space(AVFifoBuffer *f)
+{
+    return f->end - f->buffer - av_fifo_size(f);
 }
-#endif
 
 int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
     unsigned int old_size= f->end - f->buffer;
@@ -68,7 +68,7 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
 
         if (!f2)
             return -1;
-        av_fifo_read(f, f2->buffer, len);
+        av_fifo_generic_read(f, f2->buffer, len, NULL);
         f2->wptr += len;
         f2->wndx += len;
         av_free(f->buffer);
@@ -78,13 +78,6 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
     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))
 {
     int total = size;
@@ -108,7 +101,7 @@ int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void
 }
 
 
-int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest)
+int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int))
 {
 // Read memory barrier needed for SMP here in theory
     do {