diff --git a/source/Lib/CommonLib/Quant.cpp b/source/Lib/CommonLib/Quant.cpp index 5e8af8b91b2208686724ec1629da8475984c8790..009988fea282e2fbf5e7e3fea8b939098ba99103 100644 --- a/source/Lib/CommonLib/Quant.cpp +++ b/source/Lib/CommonLib/Quant.cpp @@ -539,15 +539,9 @@ void Quant::setScalingList(ScalingList *scalingList, const int maxLog2TrDynamicR { for(uint32_t list = 0; list < SCALING_LIST_NUM; list++) { -#if JVET_R0166_SCALING_LISTS_CHROMA_444 if (size == SCALING_LIST_2x2 && list < 4) // skip 2x2 luma -#else - if ((size == SCALING_LIST_2x2 && list < 4) || (size == SCALING_LIST_64x64 && list % (SCALING_LIST_NUM / SCALING_LIST_PRED_MODES) != 0)) // skip 2x2 luma -#endif continue; -#if JVET_R0166_SCALING_LISTS_CHROMA_444 scalingListId = g_scalingListId[size][list]; -#endif if (scalingList->getChromaScalingListPresentFlag() || scalingList->isLumaScalingList(scalingListId)) { for(int qp = minimumQp; qp < maximumQp; qp++) @@ -560,9 +554,6 @@ void Quant::setScalingList(ScalingList *scalingList, const int maxLog2TrDynamicR { scalingList->processDefaultMatrix(scalingListId); } -#if !JVET_R0166_SCALING_LISTS_CHROMA_444 - scalingListId++; -#endif } } //based on square result and apply downsample technology @@ -574,15 +565,8 @@ void Quant::setScalingList(ScalingList *scalingList, const int maxLog2TrDynamicR for (uint32_t list = 0; list < SCALING_LIST_NUM; list++) //9 { int largerSide = (sizew > sizeh) ? sizew : sizeh; -#if !JVET_R0166_SCALING_LISTS_CHROMA_444 - if (largerSide == SCALING_LIST_64x64 && list % (SCALING_LIST_NUM / SCALING_LIST_PRED_MODES) != 0) continue; -#endif if (largerSide < SCALING_LIST_4x4) printf("Rectangle Error !\n"); -#if JVET_R0166_SCALING_LISTS_CHROMA_444 recScalingListId = g_scalingListId[largerSide][list]; -#else - recScalingListId = SCALING_LIST_NUM * (largerSide - 2) + 2 + (list / ((largerSide == SCALING_LIST_64x64) ? 3 : 1)); -#endif for (int qp = minimumQp; qp < maximumQp; qp++) { xSetRecScalingListEnc(scalingList, list, sizew, sizeh, qp, recScalingListId); @@ -607,22 +591,13 @@ void Quant::setScalingListDec(const ScalingList &scalingList) { for(uint32_t list = 0; list < SCALING_LIST_NUM; list++) { -#if JVET_R0166_SCALING_LISTS_CHROMA_444 if (size == SCALING_LIST_2x2 && list < 4) // skip 2x2 luma -#else - if ((size == SCALING_LIST_2x2 && list < 4) || (size == SCALING_LIST_64x64 && list % (SCALING_LIST_NUM / SCALING_LIST_PRED_MODES) != 0)) // skip 2x2 luma -#endif continue; -#if JVET_R0166_SCALING_LISTS_CHROMA_444 scalingListId = g_scalingListId[size][list]; -#endif for(int qp = minimumQp; qp < maximumQp; qp++) { xSetScalingListDec(scalingList, list, size, qp, scalingListId); } -#if !JVET_R0166_SCALING_LISTS_CHROMA_444 - scalingListId++; -#endif } } //based on square result and apply downsample technology @@ -635,15 +610,8 @@ void Quant::setScalingListDec(const ScalingList &scalingList) for (uint32_t list = 0; list < SCALING_LIST_NUM; list++) //9 { int largerSide = (sizew > sizeh) ? sizew : sizeh; -#if !JVET_R0166_SCALING_LISTS_CHROMA_444 - if (largerSide == SCALING_LIST_64x64 && list % (SCALING_LIST_NUM / SCALING_LIST_PRED_MODES) != 0) continue; -#endif if (largerSide < SCALING_LIST_4x4) printf("Rectangle Error !\n"); -#if JVET_R0166_SCALING_LISTS_CHROMA_444 recScalingListId = g_scalingListId[largerSide][list]; -#else - recScalingListId = SCALING_LIST_NUM * (largerSide - 2) + 2 + (list / ((largerSide == SCALING_LIST_64x64) ? 3 : 1)); -#endif for (int qp = minimumQp; qp < maximumQp; qp++) { xSetRecScalingListDec(scalingList, list, sizew, sizeh, qp, recScalingListId); diff --git a/source/Lib/CommonLib/Rom.cpp b/source/Lib/CommonLib/Rom.cpp index d00d1da9e1f7e54a062190233b62a9000dc59c45..4c6f2ef71fdef122557f041c4a8d28d48781a960 100644 --- a/source/Lib/CommonLib/Rom.cpp +++ b/source/Lib/CommonLib/Rom.cpp @@ -678,7 +678,6 @@ const int g_quantInterDefault8x8[8 * 8] = const uint32_t g_scalingListSize [SCALING_LIST_SIZE_NUM] = { 1, 4, 16, 64, 256, 1024, 4096, 16384 }; const uint32_t g_scalingListSizeX[SCALING_LIST_SIZE_NUM] = { 1, 2, 4, 8, 16, 32, 64, 128 }; -#if JVET_R0166_SCALING_LISTS_CHROMA_444 const uint32_t g_scalingListId[SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM] = { { 0, 0, 0, 0, 0, 0}, // SCALING_LIST_1x1 @@ -690,7 +689,6 @@ const uint32_t g_scalingListId[SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM] = { 26, 21, 22, 27, 24, 25}, // SCALING_LIST_64x64 { 0, 0, 0, 0, 0, 0}, // SCALING_LIST_128x128 }; -#endif Mv g_reusedUniMVs[32][32][8][8][2][33]; diff --git a/source/Lib/CommonLib/Rom.h b/source/Lib/CommonLib/Rom.h index 42d43aa1032f55738ef45447ed84c624c89c7258..5dca675ac3bea149edceb9cc7dcfea6ad98260d2 100644 --- a/source/Lib/CommonLib/Rom.h +++ b/source/Lib/CommonLib/Rom.h @@ -180,9 +180,7 @@ extern const int g_quantInterDefault8x8[8*8]; extern const uint32_t g_scalingListSize [SCALING_LIST_SIZE_NUM]; extern const uint32_t g_scalingListSizeX[SCALING_LIST_SIZE_NUM]; -#if JVET_R0166_SCALING_LISTS_CHROMA_444 extern const uint32_t g_scalingListId[SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM]; -#endif extern MsgLevel g_verbosity; diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 8d181387a5698581e88f826309ea3de290b05a20..b44bbe03959b7e92e55ba1b62467d0a363563059 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -90,7 +90,6 @@ -#define JVET_R0166_SCALING_LISTS_CHROMA_444 1 // JVET-R0166: Scaling list for Chroma 444 #define JVET_P0359_PARAMETER_SETS_INCLUSION_SEI 1 // JVET-P0359: Parameter sets inclusion indication SEI message