shithub: openh264

Download patch

ref: 669089d63a48f45a1e0c0a79f150423cced0379c
parent: c0808f1f1db3a81fdf68ff63ebdc907cd57c6a0a
parent: e42ce60cc9f5fd81c60f00516e1b4839876728e6
author: HaiboZhu <haibozhu@cisco.com>
date: Fri Aug 14 11:44:08 EDT 2015 

Merge pull request #2073 from GuangweiWang/sub8x8asmUT

add UT for sub8x8 modes assembly functions


--- a/test/encoder/EncUT_MotionCompensation.cpp
+++ b/test/encoder/EncUT_MotionCompensation.cpp
@@ -315,52 +315,61 @@
   }
 }
 
-TEST (EncMcHalfpel, LumaHalfpel) {
-  SMcFunc sMcFunc;
-  for (int32_t k = 0; k < 2; k++) {
-    for (int32_t w = 0; w < 2; w++) {
-      int32_t width = 8 << w;
-      int32_t height = 16;
-      uint8_t uAnchor[4][MC_BUFF_HEIGHT][MC_BUFF_SRC_STRIDE];
-      uint8_t uSrcTest[MC_BUFF_HEIGHT][MC_BUFF_SRC_STRIDE];
-      ENFORCE_STACK_ALIGN_2D (uint8_t, uDstTest, MC_BUFF_HEIGHT, MC_BUFF_DST_STRIDE, 16);
-      uint8_t* uAnchors[4];
-      int16_t pBuf[MC_BUFF_DST_STRIDE];
-      uAnchors[0] = &uAnchor[0][4][4];
-      uAnchors[1] = &uAnchor[1][4][4];
-      uAnchors[2] = &uAnchor[2][4][4];
-      uAnchors[3] = &uAnchor[3][4][4];
-
-      memset (uAnchor, 0, 4 * sizeof (uint8_t)*MC_BUFF_HEIGHT * MC_BUFF_SRC_STRIDE);
-      memset (uDstTest, 0, sizeof (uint8_t)*MC_BUFF_HEIGHT * MC_BUFF_DST_STRIDE);
-      for (int32_t j = 0; j < MC_BUFF_HEIGHT; j++) {
-        for (int32_t i = 0; i < MC_BUFF_SRC_STRIDE; i++) {
-          uAnchor[0][j][i] = uSrcTest[j][i] = rand() % 256;
-        }
-      }
-
-      uint32_t uiCpuFlag = k == 0 ? 0 : WelsCPUFeatureDetect (NULL);
-      InitMcFunc (&sMcFunc, uiCpuFlag);
-
-      MCHalfPelFilterAnchor (uAnchors[1], uAnchors[2], uAnchors[3], uAnchors[0], MC_BUFF_SRC_STRIDE, width + 1, height + 1, pBuf + 4);
-      sMcFunc.pfLumaHalfpelHor (&uSrcTest[4][4], MC_BUFF_SRC_STRIDE, uDstTest[0], MC_BUFF_DST_STRIDE, width + 1, height);
-      for (int32_t j = 0; j < height; j++) {
-        for (int32_t i = 0; i < width + 1; i++) {
-          ASSERT_EQ (uAnchor[1][4 + j][4 + i], uDstTest[j][i]);
-        }
-      }
-      sMcFunc.pfLumaHalfpelVer (&uSrcTest[4][4], MC_BUFF_SRC_STRIDE, uDstTest[0], MC_BUFF_DST_STRIDE, width, height + 1);
-      for (int32_t j = 0; j < height + 1; j++) {
-        for (int32_t i = 0; i < width; i++) {
-          ASSERT_EQ (uAnchor[2][4 + j][4 + i], uDstTest[j][i]);
-        }
-      }
-      sMcFunc.pfLumaHalfpelCen (&uSrcTest[4][4], MC_BUFF_SRC_STRIDE, uDstTest[0], MC_BUFF_DST_STRIDE, width + 1, height + 1);
-      for (int32_t j = 0; j < height + 1; j++) {
-        for (int32_t i = 0; i < width + 1; i++) {
-          ASSERT_EQ (uAnchor[3][4 + j][4 + i], uDstTest[j][i]);
-        }
-      }
-    }
-  }
+#define DEF_HALFPEL_MCTEST(iW,iH) \
+TEST (EncMcHalfpel, iW##x##iH) { \
+    SMcFunc sMcFunc; \
+    for (int32_t k = 0; k < 2; k++) { \
+        for (int32_t w = 0; w < 2; w++) { \
+            int32_t width = iW ; \
+            int32_t height = iH; \
+            uint8_t uAnchor[4][MC_BUFF_HEIGHT][MC_BUFF_SRC_STRIDE]; \
+            uint8_t uSrcTest[MC_BUFF_HEIGHT][MC_BUFF_SRC_STRIDE]; \
+            ENFORCE_STACK_ALIGN_2D (uint8_t, uDstTest, MC_BUFF_HEIGHT, MC_BUFF_DST_STRIDE, 16); \
+            uint8_t* uAnchors[4]; \
+            int16_t pBuf[MC_BUFF_DST_STRIDE]; \
+            uAnchors[0] = &uAnchor[0][4][4]; \
+            uAnchors[1] = &uAnchor[1][4][4]; \
+            uAnchors[2] = &uAnchor[2][4][4]; \
+            uAnchors[3] = &uAnchor[3][4][4]; \
+             \
+            memset (uAnchor, 0, 4 * sizeof (uint8_t)*MC_BUFF_HEIGHT * MC_BUFF_SRC_STRIDE); \
+            memset (uDstTest, 0, sizeof (uint8_t)*MC_BUFF_HEIGHT * MC_BUFF_DST_STRIDE); \
+            for (int32_t j = 0; j < MC_BUFF_HEIGHT; j++) { \
+                for (int32_t i = 0; i < MC_BUFF_SRC_STRIDE; i++) { \
+                    uAnchor[0][j][i] = uSrcTest[j][i] = rand() % 256; \
+                } \
+            } \
+             \
+            uint32_t uiCpuFlag = k == 0 ? 0 : WelsCPUFeatureDetect (NULL); \
+            InitMcFunc (&sMcFunc, uiCpuFlag); \
+             \
+            MCHalfPelFilterAnchor (uAnchors[1], uAnchors[2], uAnchors[3], uAnchors[0], MC_BUFF_SRC_STRIDE, width + 1, height + 1, pBuf + 4); \
+            sMcFunc.pfLumaHalfpelHor (&uSrcTest[4][4], MC_BUFF_SRC_STRIDE, uDstTest[0], MC_BUFF_DST_STRIDE, width + 1, height); \
+            for (int32_t j = 0; j < height; j++) { \
+                for (int32_t i = 0; i < width + 1; i++) { \
+                    ASSERT_EQ (uAnchor[1][4 + j][4 + i], uDstTest[j][i]); \
+                } \
+            } \
+            sMcFunc.pfLumaHalfpelVer (&uSrcTest[4][4], MC_BUFF_SRC_STRIDE, uDstTest[0], MC_BUFF_DST_STRIDE, width, height + 1); \
+            for (int32_t j = 0; j < height + 1; j++) { \
+                for (int32_t i = 0; i < width; i++) { \
+                    ASSERT_EQ (uAnchor[2][4 + j][4 + i], uDstTest[j][i]); \
+                } \
+            } \
+            sMcFunc.pfLumaHalfpelCen (&uSrcTest[4][4], MC_BUFF_SRC_STRIDE, uDstTest[0], MC_BUFF_DST_STRIDE, width + 1, height + 1); \
+            for (int32_t j = 0; j < height + 1; j++) { \
+                for (int32_t i = 0; i < width + 1; i++) { \
+                    ASSERT_EQ (uAnchor[3][4 + j][4 + i], uDstTest[j][i]); \
+                } \
+            } \
+        } \
+    } \
 }
+
+DEF_HALFPEL_MCTEST(4,4)
+DEF_HALFPEL_MCTEST(4,8)
+DEF_HALFPEL_MCTEST(8,4)
+DEF_HALFPEL_MCTEST(8,8)
+DEF_HALFPEL_MCTEST(8,16)
+DEF_HALFPEL_MCTEST(16,8)
+DEF_HALFPEL_MCTEST(16,16)