[x265] [PATCH] TEncSearch: fix gcc warning
deepthidevaki at multicorewareinc.com
deepthidevaki at multicorewareinc.com
Mon Dec 16 06:27:38 CET 2013
# HG changeset patch
# User Deepthi Devaki <deepthidevaki at multicorewareinc.com>
# Date 1387171626 -19800
# Node ID e842d1b2bb798546d8324e00ea459ec0f7f3236b
# Parent 4b0163d06ba19d433749a659365b4364c32c8eae
TEncSearch: fix gcc warning
remove unused variables and shadowed declarations
diff -r 4b0163d06ba1 -r e842d1b2bb79 source/Lib/TLibEncoder/TEncSearch.cpp
--- a/source/Lib/TLibEncoder/TEncSearch.cpp Sat Dec 14 23:27:48 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp Mon Dec 16 10:57:06 2013 +0530
@@ -1000,14 +1000,8 @@
int maxTuSize = cu->getSlice()->getSPS()->getQuadtreeTULog2MaxSize();
int isIntraSlice = (cu->getSlice()->getSliceType() == I_SLICE);
- // don't check split if TU size is less or equal to max TU size
- bool noSplitIntraMaxTuSize = bCheckFull;
-
if (m_cfg->param.rdPenalty && !isIntraSlice)
{
- // in addition don't check split if TU size is less or equal to 16x16 TU size for non-intra slice
- noSplitIntraMaxTuSize = (trSizeLog2 <= X265_MIN(maxTuSize, 4));
-
// if maximum RD-penalty don't check TU size 32x32
if (m_cfg->param.rdPenalty == 2)
{
@@ -1020,7 +1014,6 @@
//----- code luma block with given intra prediction mode and store Cbf-----
uint32_t lumaPredMode = cu->getLumaIntraDir(absPartIdx);
- uint32_t fullDepth = cu->getDepth(0) + trDepth;
uint32_t width = cu->getWidth(0) >> trDepth;
uint32_t height = cu->getHeight(0) >> trDepth;
uint32_t stride = fencYuv->getStride();
@@ -1029,7 +1022,6 @@
int16_t* residual = resiYuv->getLumaAddr(absPartIdx);
Pel* recon = reconYuv->getLumaAddr(absPartIdx);
- uint32_t trSizeLog2 = g_convertToBit[cu->getSlice()->getSPS()->getMaxCUWidth() >> fullDepth] + 2;
uint32_t qtLayer = cu->getSlice()->getSPS()->getQuadtreeTULog2MaxSize() - trSizeLog2;
uint32_t numCoeffPerInc = cu->getSlice()->getSPS()->getMaxCUWidth() * cu->getSlice()->getSPS()->getMaxCUHeight() >> (cu->getSlice()->getSPS()->getMaxCUDepth() << 1);
TCoeff* coeff = m_qtTempCoeffY[qtLayer] + numCoeffPerInc * absPartIdx;
@@ -1621,7 +1613,7 @@
TComYuv* predYuv,
TShortYUV* resiYuv,
TComYuv* reconYuv)
-{
+{
bool bChromaSame = false;
uint32_t fullDepth = cu->getDepth(0) + trDepth;
uint32_t trMode = cu->getTransformIdx(absPartIdx);
More information about the x265-devel
mailing list