[FFmpeg-devel] [PATCH 3/3] Selftest coverage for libavutil/fifo.c

Thomas Turner thomastdt at googlemail.com
Tue Oct 11 06:56:53 EEST 2016


Fixed trailing whitespace in fifo2.c selftest and fifo2 reference file that
prevented the patch from being applied cleanly to git master

---
 libavutil/tests/fifo2.c | 17 +++++++++--------
 tests/ref/fate/fifo2    |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/libavutil/tests/fifo2.c b/libavutil/tests/fifo2.c
index e40b8cd..11050c6 100644
--- a/libavutil/tests/fifo2.c
+++ b/libavutil/tests/fifo2.c
@@ -30,12 +30,13 @@ int main(void)
     int32_t elem[] = {0, 2, 4, 6, 8, 10, 12};
     AVFifoBuffer* fifo;
 
-    data_size = sizeof(elem[0]);
-    fifo = av_fifo_alloc(sizeof(elem));
-
     /*fill fifo buffer*/
 
-    if (av_fifo_generic_write(fifo, (void*)elem, av_fifo_space(fifo), NULL) != 
+    data_size = sizeof(elem[0]);
+    fifo = av_fifo_alloc(sizeof(elem));
+    space_size = av_fifo_space(fifo);
+    
+    if (av_fifo_generic_write(fifo, (void*)elem, space_size, NULL) !=
         sizeof(elem)) {
 
         fprintf(stderr, "written incorrect number of bytes\n");
@@ -50,13 +51,13 @@ int main(void)
 
     (void) av_fifo_generic_peek(fifo, data_arr, fifo_size, NULL);
 
-    printf("fifo->buffer: ");
+    printf("fifo->buffer\t\t\t:");
     for(offset = 0; offset < fifo_size/data_size; ++offset){
-        printf("%" PRId32 ", ", data_arr[offset]);
+        printf(" %" PRId32 ",", data_arr[offset]);
     }
 
     space_size = av_fifo_space(fifo);
-    printf("\nspace before av_fifo_grow\t:%" PRId16 "\n", space_size);
+    printf("\nspace before av_fifo_grow\t: %" PRId16 "\n", space_size);
 
     /* grow AVFifoBuffer */
 
@@ -66,7 +67,7 @@ int main(void)
 
 
     space_size = av_fifo_space(fifo);
-    printf("space after av_fifo_grow\t:%" PRId16 "\n", space_size);
+    printf("space after av_fifo_grow\t: %" PRId16 "\n", space_size);
 
     
     /* free AVFifoBuffer and data_arr */
diff --git a/tests/ref/fate/fifo2 b/tests/ref/fate/fifo2
index 8df9243..b697c03 100644
--- a/tests/ref/fate/fifo2
+++ b/tests/ref/fate/fifo2
@@ -1,3 +1,3 @@
-fifo->buffer: 0, 2, 4, 6, 8, 10, 12, 
-space before av_fifo_grow	:0
-space after av_fifo_grow	:28
+fifo->buffer                : 0, 2, 4, 6, 8, 10, 12,
+space before av_fifo_grow	: 0
+space after av_fifo_grow	: 28
-- 
1.9.1



More information about the ffmpeg-devel mailing list