Merge branch 'master' of...
Merge branch 'master' of https://vcgit.hhi.fraunhofer.de/jamesxxiu/VVCSoftware_VTM into JVET_L0256_BIO # Conflicts: # source/Lib/CommonLib/CommonDef.h
Showing
... | ... | @@ -317,7 +317,11 @@ uint32_t deriveWeightIdxBits(uint8_t gbiIdx) // Note: align this with TEncSbac:: |
// initialize ROM variables | ||
void initROM() | ||
{ | ||
#if JVET_L0285_8BIT_TRANSFORM_CORE | ||
int c; | ||
#else | ||
int i, c; | ||
#endif | ||
#if RExt__HIGH_BIT_DEPTH_SUPPORT | ||
{ | ||
... | ... | @@ -367,6 +371,7 @@ void initROM() |
g_aucLog2 [i] = c; | ||
} | ||
#if !JVET_L0285_8BIT_TRANSFORM_CORE | ||
c = 2; //for the 2x2 transforms if QTBT is on | ||
const double PI = 3.14159265358979323846; | ||
... | ... | @@ -410,6 +415,8 @@ void initROM() |
} | ||
c <<= 1; | ||
} | ||
#endif | ||
gp_sizeIdxInfo = new SizeIndexInfoLog2(); | ||
< |