Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / fifo.c

diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index f79131a9db7a9d2a2aea59fbf2c83afd95d29eca..3ebd5f9b202f15f330eb5b461fbcadd95292ccc5 100644 (file)
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -68,7 +68,7 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size)
         AVFifoBuffer *f2 = av_fifo_alloc(new_size);
 
         if (!f2)
-            return -1;
+            return AVERROR(ENOMEM);
         av_fifo_generic_read(f, f2->buffer, len, NULL);
         f2->wptr += len;
         f2->wndx += len;
@@ -128,3 +128,39 @@ void av_fifo_drain(AVFifoBuffer *f, int size)
         f->rptr -= f->end - f->buffer;
     f->rndx += size;
 }
+
+#ifdef TEST
+
+#undef printf
+
+int main(void)
+{
+    /* create a FIFO buffer */
+    AVFifoBuffer *fifo = av_fifo_alloc(13 * sizeof(int));
+    int i, j, n;
+
+    /* fill data */
+    for (i = 0; av_fifo_space(fifo) >= sizeof(int); i++)
+        av_fifo_generic_write(fifo, &i, sizeof(int), NULL);
+
+    /* peek at FIFO */
+    n = av_fifo_size(fifo)/sizeof(int);
+    for (i = -n+1; i < n; i++) {
+        int *v = (int *)av_fifo_peek2(fifo, i*sizeof(int));
+        printf("%d: %d\n", i, *v);
+    }
+    printf("\n");
+
+    /* read data */
+    for (i = 0; av_fifo_size(fifo) >= sizeof(int); i++) {
+        av_fifo_generic_read(fifo, &j, sizeof(int), NULL);
+        printf("%d ", j);
+    }
+    printf("\n");
+
+    av_fifo_free(fifo);
+
+    return 0;
+}
+
+#endif