changeset 5732:238d7f272d1e

TEncSearch: fix gcc warning remove unused variables and shadowed declarations
author Deepthi Devaki <deepthidevaki@multicorewareinc.com>
date Mon, 16 Dec 2013 10:57:06 +0530
parents f157836c3713
children 43656ecbe66b
files source/Lib/TLibEncoder/TEncSearch.cpp
diffstat 1 files changed, 1 insertions(+-), 9 deletions(-) [+]
line wrap: on
line diff
--- a/source/Lib/TLibEncoder/TEncSearch.cpp	Fri Dec 13 16:30:29 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp	Mon Dec 16 10:57:06 2013 +0530
@@ -1000,14 +1000,8 @@ void TEncSearch::residualTransformQuantI
     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 @@ void TEncSearch::residualTransformQuantI
 
         //----- 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 @@ void TEncSearch::residualTransformQuantI
         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 @@ void TEncSearch::residualQTIntrachroma(T
                                        TComYuv*    predYuv,
                                        TShortYUV*  resiYuv,
                                        TComYuv*    reconYuv)
-{    
+{
     bool bChromaSame = false;
     uint32_t fullDepth = cu->getDepth(0) + trDepth;
     uint32_t trMode    = cu->getTransformIdx(absPartIdx);