[FFmpeg-devel] [PATCH] Added a selftest to libavutil/display.c

Petru Rares Sincraian psincraian at outlook.com
Sun Mar 20 10:29:04 CET 2016


    - Check if av_display_rotation_get() gets the correct degrees
    - Check if av_display_rotation_set() sets the correct matrix
    - Check if av_display_matrix_flip() changes correct the matrix
---
 libavutil/Makefile       |  1 +
 libavutil/display.c      | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 libavutil/display.h      |  1 +
 tests/fate/libavutil.mak |  4 ++++
 4 files changed, 53 insertions(+)

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 58df75a..43fcf75 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -198,6 +198,7 @@ TESTPROGS = adler32                                                     \
             parseutils                                                  \
             pixdesc                                                     \
             pixelutils                                                  \
+            display                                                     \
             random_seed                                                 \
             rational                                                    \
             ripemd                                                      \
diff --git a/libavutil/display.c b/libavutil/display.c
index a0076e0..001ae21 100644
--- a/libavutil/display.c
+++ b/libavutil/display.c
@@ -71,3 +71,50 @@ void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip)
         for (i = 0; i < 9; i++)
             matrix[i] *= flip[i % 3];
 }
+
+#ifdef TEST
+
+// Convert 2.30 fixed-point to double
+#define CONV_FP30(x) ((double) (x)) / (1 << 30)
+
+static void print_matrix(int32_t matrix[9])
+{
+    int i, j;
+
+    for (i = 0; i < 3; ++i)
+    {
+        for (j = 0; j < 3 - 1; ++j)
+            printf("%f ", CONV_FP(matrix[i*3 + j]));
+
+        printf("%f\n", CONV_FP30(matrix[i*3 + j]));
+    }
+}
+
+int main(void)
+{
+    int32_t matrix[9];
+
+    // Set the matrix to 90 degrees
+    av_display_rotation_set(matrix, 90);
+    print_matrix(matrix);
+    printf("degrees: %f\n", av_display_rotation_get(matrix));
+
+    // Set the matrix to -45 degrees
+    av_display_rotation_set(matrix, -45);
+    print_matrix(matrix);
+    printf("degrees: %f\n", av_display_rotation_get(matrix));
+
+    // flip horizontal
+    av_display_matrix_flip(matrix, 1, 0);
+    print_matrix(matrix);
+    printf("degrees: %f\n", av_display_rotation_get(matrix));
+
+    // flip vertical
+    av_display_matrix_flip(matrix, 0, 1);
+    print_matrix(matrix);
+    printf("degrees: %f\n", av_display_rotation_get(matrix));
+
+    return 0;
+
+}
+#endif
diff --git a/libavutil/display.h b/libavutil/display.h
index c0cfee3..39c15ee 100644
--- a/libavutil/display.h
+++ b/libavutil/display.h
@@ -22,6 +22,7 @@
 #define AVUTIL_DISPLAY_H
 
 #include <stdint.h>
+#include "common.h"
 
 /**
  * The display transformation matrix specifies an affine transformation that
diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak
index 5d8e0e2..7f4fb7a 100644
--- a/tests/fate/libavutil.mak
+++ b/tests/fate/libavutil.mak
@@ -99,6 +99,10 @@ FATE_LIBAVUTIL-$(CONFIG_PIXELUTILS) += fate-pixelutils
 fate-pixelutils: libavutil/pixelutils-test$(EXESUF)
 fate-pixelutils: CMD = run libavutil/pixelutils-test
 
+FATE_LIBAVUTIL += fate-display
+fate-display: libavutil/display-test$(EXESUF)
+fate-display: CMD = run libavutil/display-test
+
 FATE_LIBAVUTIL += fate-random_seed
 fate-random_seed: libavutil/random_seed-test$(EXESUF)
 fate-random_seed: CMD = run libavutil/random_seed-test
-- 
1.9.1



More information about the ffmpeg-devel mailing list