X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Ffifo.c;h=518fba24c6f225a4a601ddd410efa1f62ac747e0;hb=b1cb73aa1589bda105859221198d55a97c3eddee;hp=77461829d272e32a2838940691adf89aeca14a25;hpb=f5a478f65d7262dbe194641d384f24fbbc03ed85;p=ffmpeg

diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 77461829d27..518fba24c6f 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -3,30 +3,33 @@
  * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
  * Copyright (c) 2006 Roman Shaposhnik
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #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;
     if (!f->buffer)
         return -1;
-    f->end = f->buffer + size;
-    f->wptr = f->rptr = f->buffer;
     return 0;
 }
 
@@ -43,90 +46,76 @@ int av_fifo_size(AVFifoBuffer *f)
     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)
 {
-    int len;
-    int size = f->wptr - f->rptr;
-    if (size < 0)
-        size += f->end - f->buffer;
-
-    if (size < buf_size)
-        return -1;
-    while (buf_size > 0) {
-        len = FFMIN(f->end - f->rptr, buf_size);
-        memcpy(buf, f->rptr, len);
-        buf += len;
-        f->rptr += len;
-        if (f->rptr >= f->end)
-            f->rptr = f->buffer;
-        buf_size -= len;
-    }
-    return 0;
+    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) {
-    unsigned int old_size= f->end - f->buffer;
-
-    if(old_size < new_size){
-        uint8_t *old= f->buffer;
+    av_fifo_realloc2(f, new_size);
+}
+#endif
 
-        f->buffer= av_realloc(f->buffer, new_size);
+int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
+    unsigned int old_size= f->end - f->buffer;
 
-        f->rptr += f->buffer - old;
-        f->wptr += f->buffer - old;
+    if(old_size <= new_size){
+        int len= av_fifo_size(f);
+        AVFifoBuffer f2;
 
-        if(f->wptr < f->rptr){
-            memmove(f->rptr + new_size - old_size, f->rptr, f->buffer + old_size - f->rptr);
-            f->rptr += new_size - old_size;
-        }
-        f->end= f->buffer + 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)
 {
-    int len;
+    av_fifo_generic_write(f, (void *)buf, size, NULL);
+}
 
-    while (size > 0) {
-        len = FFMIN(f->end - f->wptr, size);
-        memcpy(f->wptr, buf, len);
+int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int))
+{
+    int total = size;
+    do {
+        int len = FFMIN(f->end - f->wptr, size);
+        if(func) {
+            if(func(src, f->wptr, len) <= 0)
+                break;
+        } else {
+            memcpy(f->wptr, src, len);
+            src = (uint8_t*)src + len;
+        }
         f->wptr += len;
         if (f->wptr >= f->end)
             f->wptr = f->buffer;
-        buf += len;
         size -= len;
-    }
+    } while (size > 0);
+    return total - 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 len;
-    int size = f->wptr - f->rptr;
-    if (size < 0)
-        size += f->end - f->buffer;
-
-    if (size < buf_size)
-        return -1;
-    while (buf_size > 0) {
-        len = FFMIN(f->end - f->rptr, buf_size);
-        func(dest, f->rptr, len);
-        f->rptr += len;
-        if (f->rptr >= f->end)
-            f->rptr = f->buffer;
+    do {
+        int len = FFMIN(f->end - f->rptr, buf_size);
+        if(func) func(dest, f->rptr, len);
+        else{
+            memcpy(dest, f->rptr, len);
+            dest = (uint8_t*)dest + len;
+        }
+        av_fifo_drain(f, len);
         buf_size -= len;
-    }
+    } while (buf_size > 0);
     return 0;
 }
 
-/* discard data from the fifo */
+/** discard data from the fifo */
 void av_fifo_drain(AVFifoBuffer *f, int size)
 {
     f->rptr += size;