Showing the changes to test/decoder/DecUT_DeblockCommon.cpp (1 of 12 files). Show all
Unified · Split
| @@ -898,10 +898,10 @@ TEST (Deblocking, WelsDeblockingMb) { · 897 unmodified lines | ||
| 898 | 898 | sDqLayer.pLumaQp = iLumaQP; |
| 899 | 899 | sDqLayer.pChromaQp = iChromaQP; |
| 900 | 900 | |
| 901 | − int8_t iMbType[2]; | |
| 901 | + int16_t iMbType[2]; | |
| 902 | 902 | sDqLayer.pMbType = iMbType; |
| 903 | − sDqLayer.pMbType[0] = 0x01; | |
| 904 | − sDqLayer.pMbType[1] = 0x01; | |
| 903 | + sDqLayer.pMbType[0] = MB_TYPE_INTRA4x4; | |
| 904 | + sDqLayer.pMbType[1] = MB_TYPE_INTRA4x4; | |
| 905 | 905 | |
| 906 | 906 | sFilter.iSliceAlphaC0Offset = 0; |
| 907 | 907 | sFilter.iSliceBetaOffset = 0; |
| @@ -922,31 +922,31 @@ TEST (Deblocking, WelsDeblockingMb) { · 14 unmodified lines | ||
| 922 | 922 | EXPECT_TRUE(iCb[2<<1]==iChromaV1 && iCr[2<<1]==iChromaV1)<<iQP<<" "<<sDqLayer.pMbType[1]; \ |
| 923 | 923 | EXPECT_TRUE(iCb[(2<<1)*sFilter.iCsStride[1]]==iChromaV2 && iCr[(2<<1)*sFilter.iCsStride[1]]==iChromaV2)<<iQP<<" "<<sDqLayer.pMbType[1]; |
| 924 | 924 | |
| 925 | − // QP>16, LEFT & TOP, Intra mode 0x01 | |
| 925 | + // QP>16, LEFT & TOP, Intra mode MB_TYPE_INTRA4x4 | |
| 926 | 926 | iQP = 16 + rand() % 35; |
| 927 | − sDqLayer.pMbType[1] = 0x01; | |
| 927 | + sDqLayer.pMbType[1] = MB_TYPE_INTRA4x4; | |
| 928 | 928 | UT_DB_MACROBLOCK_TEST (0x03, iQP, 2, 1, 1, 2, 1, 1) |
| 929 | 929 | |
| 930 | − // QP>16, LEFT & TOP, Intra mode 0x02 | |
| 930 | + // QP>16, LEFT & TOP, Intra mode MB_TYPE_INTRA16x16 | |
| 931 | 931 | iQP = 16 + rand() % 35; |
| 932 | − sDqLayer.pMbType[1] = 0x02; | |
| 932 | + sDqLayer.pMbType[1] = MB_TYPE_INTRA16x16; | |
| 933 | 933 | UT_DB_MACROBLOCK_TEST (0x03, iQP, 2, 1, 1, 2, 1, 1) |
| 934 | 934 | |
| 935 | 935 | // MbType==0x03, Intra8x8 has not been supported now. |
| 936 | 936 | |
| 937 | − // QP>16, LEFT & TOP, Intra mode 0x04 | |
| 937 | + // QP>16, LEFT & TOP, Intra mode MB_TYPE_INTRA_PCM | |
| 938 | 938 | iQP = 16 + rand() % 35; |
| 939 | − sDqLayer.pMbType[1] = 0x04; | |
| 939 | + sDqLayer.pMbType[1] = MB_TYPE_INTRA_PCM; | |
| 940 | 940 | UT_DB_MACROBLOCK_TEST (0x03, iQP, 2, 1, 1, 2, 1, 1) |
| 941 | 941 | |
| 942 | 942 | // QP>16, LEFT & TOP, neighbor is Intra |
| 943 | 943 | iQP = 16 + rand() % 35; |
| 944 | − sDqLayer.pMbType[0] = 0x02; | |
| 945 | − sDqLayer.pMbType[1] = 0x0f; // Internal SKIP, Bs==0 | |
| 944 | + sDqLayer.pMbType[0] = MB_TYPE_INTRA16x16; | |
| 945 | + sDqLayer.pMbType[1] = MB_TYPE_SKIP; // Internal SKIP, Bs==0 | |
| 946 | 946 | UT_DB_MACROBLOCK_TEST (0x03, iQP, 2, 0, 0, 2, 0, 0) |
| 947 | 947 | |
| 948 | 948 | // QP<15, no output |
| 949 | 949 | iQP = rand() % 16; |
| 950 | − sDqLayer.pMbType[1] = 0x04; | |
| 950 | + sDqLayer.pMbType[1] = MB_TYPE_INTRA_PCM; | |
| 951 | 951 | UT_DB_MACROBLOCK_TEST (0x03, iQP, 0, 0, 0, 0, 0, 0) |
| 952 | 952 | } |