X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Ffifo.c;h=840b73a57bf7f1d0476c0b076aeccb2cf0f72e45;hb=16c2e21488b0da96b445ea4b098b389ca4ef0943;hp=4bc8be07ff13f5c951e509191f215e6bc2c1abdd;hpb=0a71e78ce4947ccf553442dcc59578c1a20d169b;p=ffmpeg

diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 4bc8be07ff1..840b73a57bf 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -22,63 +22,62 @@
 #include "common.h"
 #include "fifo.h"
 
-int av_fifo_init(AVFifoBuffer *f, unsigned int size)
+AVFifoBuffer *av_fifo_alloc(unsigned int size)
 {
-    f->wptr = f->rptr =
+    AVFifoBuffer *f= av_mallocz(sizeof(AVFifoBuffer));
+    if(!f)
+        return NULL;
     f->buffer = av_malloc(size);
     f->end = f->buffer + size;
-    f->rndx = f->wndx = 0;
+    av_fifo_reset(f);
     if (!f->buffer)
-        return -1;
-    return 0;
+        av_freep(&f);
+    return f;
 }
 
 void av_fifo_free(AVFifoBuffer *f)
 {
-    av_free(f->buffer);
+    if(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;
 
     if(old_size < new_size){
         int len= av_fifo_size(f);
-        AVFifoBuffer f2;
+        AVFifoBuffer *f2= av_fifo_alloc(new_size);
 
-        if (av_fifo_init(&f2, new_size) < 0)
+        if (!f2)
             return -1;
-        av_fifo_read(f, f2.buffer, len);
-        f2.wptr += len;
-        f2.wndx += len;
+        av_fifo_generic_read(f, f2->buffer, len, NULL);
+        f2->wptr += len;
+        f2->wndx += len;
         av_free(f->buffer);
-        *f= f2;
+        *f= *f2;
+        av_free(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))
 {
     int total = size;
@@ -91,6 +90,7 @@ int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void
             memcpy(f->wptr, src, len);
             src = (uint8_t*)src + len;
         }
+// Write memory barrier needed for SMP here in theory
         f->wptr += len;
         if (f->wptr >= f->end)
             f->wptr = f->buffer;
@@ -101,8 +101,9 @@ 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 {
         int len = FFMIN(f->end - f->rptr, buf_size);
         if(func) func(dest, f->rptr, len);
@@ -110,6 +111,7 @@ int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void
             memcpy(dest, f->rptr, len);
             dest = (uint8_t*)dest + len;
         }
+// memory barrier needed for SMP here in theory
         av_fifo_drain(f, len);
         buf_size -= len;
     } while (buf_size > 0);