shithub: openh264

Info  •  Files  •  Log  •  Branches

[UT] Utilize DCT function pointer typedefs

--- a/test/encoder/EncUT_DecodeMbAux.cpp

+++ b/test/encoder/EncUT_DecodeMbAux.cpp

@@ -266,7 +266,7 @@

   WelsIDctT4Anchor<clip_t> (&p_dst[4 * FDEC_STRIDE + 4], dct[3]);

 }

 template<typename clip_t>

-void TestIDctFourT4Rec (void (*func) (uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDct)) {

+void TestIDctFourT4Rec (PIDctFunc func) {

   int16_t iRefDct[4][16];

   uint8_t iRefDst[16 * FDEC_STRIDE];

   ENFORCE_STACK_ALIGN_1D (int16_t, iDct, 64, 16);

--- a/test/encoder/EncUT_EncoderMbAux.cpp

+++ b/test/encoder/EncUT_EncoderMbAux.cpp

@@ -145,7 +145,7 @@

   Sub4x4DctAnchor (iDct[2], &pPix1[4 * FENC_STRIDE + 0], &pPix2[4 * FDEC_STRIDE + 0]);

   Sub4x4DctAnchor (iDct[3], &pPix1[4 * FENC_STRIDE + 4], &pPix2[4 * FDEC_STRIDE + 4]);

 }

-static void TestDctT4 (void (*func) (int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2)) {

+static void TestDctT4 (PDctFunc func) {

   int16_t iDctRef[4][4];

   uint8_t uiPix1[16 * FENC_STRIDE], uiPix2[16 * FDEC_STRIDE];

   int16_t iDct[16];

@@ -161,7 +161,7 @@

     for (int j = 0; j < 4; j++)

       EXPECT_EQ (iDctRef[j][i], iDct[i * 4 + j]);

 }

-static void TestDctFourT4 (void (*func) (int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2)) {

+static void TestDctFourT4 (PDctFunc func) {

   int16_t iDctRef[4][4][4];

   CMemoryAlign cMemoryAlign (0);

   ALLOC_MEMORY (uint8_t, uiPix1, 16 * FENC_STRIDE);