[x265] cleanup unused variables

[Satoshi Nakagawa]

# HG changeset patch
# User Satoshi Nakagawa <nakagawa424 at oki.com>
# Date 1391478450 -32400
#      Tue Feb 04 10:47:30 2014 +0900
# Branch cleanup2
# Node ID b601443e9347163d63a5098177baec2b15e5c346
# Parent  d5326d9bf1b25db43e21f9993f56f2f07a4167eb
cleanup unused variables

diff -r d5326d9bf1b2 -r b601443e9347 source/Lib/TLibCommon/TComDataCU.h
--- a/source/Lib/TLibCommon/TComDataCU.h	Mon Feb 03 12:36:39 2014 +0900
+++ b/source/Lib/TLibCommon/TComDataCU.h	Tue Feb 04 10:47:30 2014 +0900
@@ -145,7 +145,6 @@
 
     bool*         m_bMergeFlags;      ///< array of merge flags
     UChar*        m_mergeIndex;       ///< array of merge candidate indices
-    bool          m_bIsMergeAMP;
     UChar*        m_lumaIntraDir;     ///< array of intra directions (luma)
     UChar*        m_chromaIntraDir;   ///< array of intra directions (chroma)
     UChar*        m_interDir;         ///< array of inter directions
@@ -337,10 +336,6 @@
     template<typename T>
     void          setSubPart(T bParameter, T* pbBaseLCU, uint32_t cuAddr, uint32_t cuDepth, uint32_t puIdx);
 
-    void          setMergeAMP(bool b)       { m_bIsMergeAMP = b; }
-
-    bool          getMergeAMP()             { return m_bIsMergeAMP; }
-
     UChar*        getLumaIntraDir()         { return m_lumaIntraDir; }
 
     UChar         getLumaIntraDir(uint32_t idx) { return m_lumaIntraDir[idx]; }
diff -r d5326d9bf1b2 -r b601443e9347 source/Lib/TLibEncoder/TEncCu.cpp
--- a/source/Lib/TLibEncoder/TEncCu.cpp	Mon Feb 03 12:36:39 2014 +0900
+++ b/source/Lib/TLibEncoder/TEncCu.cpp	Tue Feb 04 10:47:30 2014 +0900
@@ -167,9 +167,6 @@
     }
 
     m_bEncodeDQP = false;
-    m_LCUPredictionSAD = 0;
-    m_addSADDepth      = 0;
-    m_temporalSAD      = 0;
 }
 
 void TEncCu::destroy()
@@ -351,10 +348,6 @@
     m_bestCU[0]->initCU(cu->getPic(), cu->getAddr());
     m_tempCU[0]->initCU(cu->getPic(), cu->getAddr());
 
-    m_addSADDepth      = 0;
-    m_LCUPredictionSAD = 0;
-    m_temporalSAD      = 0;
-
     // analysis of CU
 #if LOG_CU_STATISTICS
     int numPartition = cu->getTotalNumPart();
@@ -537,7 +530,6 @@
 {
     //PPAScopeEvent(TEncCu_xCompressIntraCU + depth);
 
-    m_abortFlag = false;
     TComPic* pic = outBestCU->getPic();
 
     // get Original YUV data from picture
@@ -579,12 +571,6 @@
 
         bTrySplitDQP = bTrySplit;
 
-        if (depth <= m_addSADDepth)
-        {
-            m_LCUPredictionSAD += m_temporalSAD;
-            m_addSADDepth = depth;
-        }
-
         xCheckRDCostIntra(outBestCU, outTempCU, SIZE_2Nx2N);
         outTempCU->initEstData(depth, qp);
 
@@ -610,7 +596,6 @@
     else if (!(bSliceEnd && bInsidePicture))
     {
         bBoundary = true;
-        m_addSADDepth++;
     }
 
     outTempCU->initEstData(depth, qp);
@@ -708,8 +693,6 @@
 
     TComPic* pic = outBestCU->getPic();
 
-    m_abortFlag = false;
-
     // get Original YUV data from picture
     m_origYuv[depth]->copyFromPicYuv(pic->getPicYuvOrg(), outBestCU->getAddr(), outBestCU->getZorderIdxInCU());
 
@@ -778,12 +761,6 @@
 
         bTrySplitDQP = bTrySplit;
 
-        if (depth <= m_addSADDepth)
-        {
-            m_LCUPredictionSAD += m_temporalSAD;
-            m_addSADDepth = depth;
-        }
-
         if (!earlyDetectionSkipMode)
         {
             outTempCU->initEstData(depth, qp);
@@ -961,7 +938,6 @@
     else if (!(bSliceEnd && bInsidePicture))
     {
         bBoundary = true;
-        m_addSADDepth++;
     }
 
     // copy original YUV samples to PCM buffer
@@ -1396,7 +1372,6 @@
     outTempCU->setPredModeSubParts(MODE_INTER, 0, depth);
     outTempCU->setCUTransquantBypassSubParts(m_cfg->getCUTransquantBypassFlagValue(), 0, depth);
 
-    outTempCU->setMergeAMP(true);
     m_tmpRecoYuv[depth]->clear();
     m_tmpResiYuv[depth]->clear();
     m_search->predInterSearch(outTempCU, m_tmpPredYuv[depth], bUseMRG);
diff -r d5326d9bf1b2 -r b601443e9347 source/Lib/TLibEncoder/TEncCu.h
--- a/source/Lib/TLibEncoder/TEncCu.h	Mon Feb 03 12:36:39 2014 +0900
+++ b/source/Lib/TLibEncoder/TEncCu.h	Tue Feb 04 10:47:30 2014 +0900
@@ -122,13 +122,9 @@
     TEncSbac***  m_rdSbacCoders;
     TEncSbac*    m_rdGoOnSbacCoder;
 
-    uint32_t     m_LCUPredictionSAD;
-    int          m_addSADDepth;
-    int          m_temporalSAD;
     UChar        m_totalDepth;
 
     bool         m_bEncodeDQP;
-    bool         m_abortFlag; // aborts recursion when the child CU costs more than parent CU
 
 public:
 
diff -r d5326d9bf1b2 -r b601443e9347 source/encoder/compress.cpp
--- a/source/encoder/compress.cpp	Mon Feb 03 12:36:39 2014 +0900
+++ b/source/encoder/compress.cpp	Tue Feb 04 10:47:30 2014 +0900
@@ -199,8 +199,6 @@
     outTempCU->setPredModeSubParts(MODE_INTER, 0, depth);
     outTempCU->setCUTransquantBypassSubParts(m_cfg->getCUTransquantBypassFlagValue(), 0, depth);
 
-    outTempCU->setMergeAMP(true);
-
     //do motion compensation only for Luma since luma cost alone is calculated
     outTempCU->m_totalBits = 0;
     m_search->predInterSearch(outTempCU, outPredYuv, bUseMRG, true, false);
@@ -327,8 +325,6 @@
 
 void TEncCu::xCompressInterCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, TComDataCU*& cu, uint32_t depth, uint32_t PartitionIndex, UChar minDepth)
 {
-    m_abortFlag = false;
-
     TComPic* pic = outTempCU->getPic();
 
     // get Original YUV data from picture