checkasm: hevc: Iterate over features first, then over bitdepths

[ffmpeg] / tests / checkasm / h264pred.c

diff --git a/tests/checkasm/h264pred.c b/tests/checkasm/h264pred.c
index a1ee720fae0616545364c16612db5cef75f26c70..4994947b1b9a227986affbbe7ed1a5224a683b8f 100644 (file)
--- a/tests/checkasm/h264pred.c
+++ b/tests/checkasm/h264pred.c
@@ -29,7 +29,7 @@
 static const int codec_ids[4] = { AV_CODEC_ID_H264, AV_CODEC_ID_VP8, AV_CODEC_ID_RV40, AV_CODEC_ID_SVQ3 };
 
 static const char * const pred4x4_modes[4][15] = {
-    { /* H264 */
+    { /* H.264 */
         [VERT_PRED           ] = "vertical",
         [HOR_PRED            ] = "horizontal",
         [DC_PRED             ] = "dc",
@@ -65,7 +65,7 @@ static const char * const pred4x4_modes[4][15] = {
 };
 
 static const char * const pred8x8_modes[4][11] = {
-    { /* H264 */
+    { /* H.264 */
         [DC_PRED8x8              ] = "dc",
         [HOR_PRED8x8             ] = "horizontal",
         [VERT_PRED8x8            ] = "vertical",
@@ -92,7 +92,7 @@ static const char * const pred8x8_modes[4][11] = {
 };
 
 static const char * const pred16x16_modes[4][9] = {
-    { /* H264 */
+    { /* H.264 */
         [DC_PRED8x8     ] = "dc",
         [HOR_PRED8x8    ] = "horizontal",
         [VERT_PRED8x8   ] = "vertical",
@@ -144,7 +144,7 @@ static void check_pred4x4(H264PredContext *h, uint8_t *buf0, uint8_t *buf1,
     if (chroma_format == 1) {
         uint8_t *topright = buf0 + 2*16;
         int pred_mode;
-        declare_func(void, uint8_t *src, const uint8_t *topright, ptrdiff_t stride);
+        declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *src, const uint8_t *topright, ptrdiff_t stride);
 
         for (pred_mode = 0; pred_mode < 15; pred_mode++) {
             if (check_pred_func(h->pred4x4[pred_mode], "4x4", pred4x4_modes[codec][pred_mode])) {
@@ -163,7 +163,7 @@ static void check_pred8x8(H264PredContext *h, uint8_t *buf0, uint8_t *buf1,
                           int codec, int chroma_format, int bit_depth)
 {
     int pred_mode;
-    declare_func(void, uint8_t *src, ptrdiff_t stride);
+    declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *src, ptrdiff_t stride);
 
     for (pred_mode = 0; pred_mode < 11; pred_mode++) {
         if (check_pred_func(h->pred8x8[pred_mode], (chroma_format == 2) ? "8x16" : "8x8",
@@ -183,7 +183,7 @@ static void check_pred16x16(H264PredContext *h, uint8_t *buf0, uint8_t *buf1,
 {
     if (chroma_format == 1) {
         int pred_mode;
-        declare_func(void, uint8_t *src, ptrdiff_t stride);
+        declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *src, ptrdiff_t stride);
 
         for (pred_mode = 0; pred_mode < 9; pred_mode++) {
             if (check_pred_func(h->pred16x16[pred_mode], "16x16", pred16x16_modes[codec][pred_mode])) {
@@ -203,7 +203,7 @@ static void check_pred8x8l(H264PredContext *h, uint8_t *buf0, uint8_t *buf1,
 {
     if (chroma_format == 1 && codec_ids[codec] == AV_CODEC_ID_H264) {
         int pred_mode;
-        declare_func(void, uint8_t *src, int topleft, int topright, ptrdiff_t stride);
+        declare_func_emms(AV_CPU_FLAG_MMXEXT, void, uint8_t *src, int topleft, int topright, ptrdiff_t stride);
 
         for (pred_mode = 0; pred_mode < 12; pred_mode++) {
             if (check_pred_func(h->pred8x8l[pred_mode], "8x8l", pred4x4_modes[codec][pred_mode])) {