diff --git a/source/Lib/CommonLib/RdCost.h b/source/Lib/CommonLib/RdCost.h index 9e7b16df679dfe23af66379092de5c265593f70f..20af443bfbc42682d113eef9ed298509dd047c8c 100644 --- a/source/Lib/CommonLib/RdCost.h +++ b/source/Lib/CommonLib/RdCost.h @@ -289,7 +289,7 @@ public: uiTemp2 >>= MAX_CU_DEPTH; } - return uiLength2 + ( g_aucPrevLog2[uiTemp2] << 1 ); + return uiLength2 + ( g_aucLog2[uiTemp2] << 1 ); } Distortion getCostOfVectorWithPredictor( const int x, const int y, const unsigned imvShift ) { return Distortion( m_motionLambda * getBitsOfVectorWithPredictor(x, y, imvShift )); } uint32_t getBitsOfVectorWithPredictor( const int x, const int y, const unsigned imvShift ) { return xGetExpGolombNumberOfBits(((x << m_iCostScale) - m_mvPredictor.getHor())>>imvShift) + xGetExpGolombNumberOfBits(((y << m_iCostScale) - m_mvPredictor.getVer())>>imvShift); } diff --git a/source/Lib/CommonLib/Rom.cpp b/source/Lib/CommonLib/Rom.cpp index 4d032d0ec8cf106545fd8ce04cbeeb4cf9b0090b..01cd86e296c6b128985ea76a3fdde50a6a662d09 100644 --- a/source/Lib/CommonLib/Rom.cpp +++ b/source/Lib/CommonLib/Rom.cpp @@ -278,7 +278,6 @@ void initROM() n++; } - g_aucPrevLog2[i] = c; g_aucLog2 [i] = c; } @@ -631,7 +630,6 @@ const int g_sortedMipMpms[3][NUM_MPM_MIP] = SizeIndexInfo* gp_sizeIdxInfo = NULL; int8_t g_aucLog2 [MAX_CU_SIZE + 1]; int8_t g_aucNextLog2[MAX_CU_SIZE + 1]; -int8_t g_aucPrevLog2[MAX_CU_SIZE + 1]; #if JVET_O0105_ICT const int g_ictModes[2][4] = { { 0, 3, 1, 2 }, { 0, -3, -1, -2 } }; diff --git a/source/Lib/CommonLib/Rom.h b/source/Lib/CommonLib/Rom.h index 478c418a4a99e297650df548aecadcf2c9617cac..e3714d37c23b23e5917418b3ea41399b86a03a23 100644 --- a/source/Lib/CommonLib/Rom.h +++ b/source/Lib/CommonLib/Rom.h @@ -147,7 +147,6 @@ extern const uint8_t g_lfnstLut[ NUM_INTRA_MODE + NUM_EXT_LUMA_MODE - 1 ]; extern SizeIndexInfo* gp_sizeIdxInfo; extern int8_t g_aucLog2 [MAX_CU_SIZE + 1]; extern int8_t g_aucNextLog2 [MAX_CU_SIZE + 1]; -extern int8_t g_aucPrevLog2 [MAX_CU_SIZE + 1]; #if JVET_O0105_ICT extern const int g_ictModes[2][4];