From dc6eb6e52dba7cf0c291dbe8d084534ecd861abc Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Fri, 23 Aug 2019 18:21:40 +0200
Subject: [PATCH] remove g_aucPrevLog2[]
---
source/Lib/CommonLib/RdCost.h | 2 +-
source/Lib/CommonLib/Rom.cpp | 2 --
source/Lib/CommonLib/Rom.h | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/source/Lib/CommonLib/RdCost.h b/source/Lib/CommonLib/RdCost.h
index 9e7b16df6..20af443bf 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 4d032d0ec..01cd86e29 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 478c418a4..e3714d37c 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];
--
GitLab