Changeset 1335 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder


Ignore:
Timestamp:
22 Jul 2015, 02:37:09 (9 years ago)
Author:
seregin
Message:

port rev 4413

Location:
branches/SHM-dev/source/Lib/TLibEncoder
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibEncoder/NALwrite.h

    r1259 r1335  
    3939#include <ostream>
    4040
    41 #include "TLibCommon/TypeDef.h"
     41#include "TLibCommon/CommonDef.h"
    4242#include "TLibCommon/TComBitStream.h"
    4343#include "TLibCommon/NAL.h"

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp

    r1259 r1335  
    196196  //}
    197197
    198 #ifdef DEBUG_CABAC_BINS
     198#if DEBUG_CABAC_BINS
    199199  const UInt startingRange = m_uiRange;
    200200#endif
    … …  
    228228  }
    229229
    230 #ifdef DEBUG_CABAC_BINS
     230#if DEBUG_CABAC_BINS
    231231  if ((g_debugCounter + debugCabacBinWindow) >= debugCabacBinTargetLine)
    232232  {

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncBinCoderCABACCounter.cpp

    r1307 r1335  
    7474Void TEncBinCABACCounter::encodeBin( UInt binValue, ContextModel &rcCtxModel )
    7575{
    76 #ifdef DEBUG_ENCODER_SEARCH_BINS
     76#if DEBUG_ENCODER_SEARCH_BINS
    7777  const UInt64 startingFracBits = m_fracBits;
    7878#endif
    … …  
    8282  rcCtxModel.update( binValue );
    8383
    84 #ifdef DEBUG_ENCODER_SEARCH_BINS
     84#if DEBUG_ENCODER_SEARCH_BINS
    8585  if ((g_debugCounter + debugEncoderSearchBinWindow) >= debugEncoderSearchBinTargetLine)
    8686  {

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp

    r1316 r1335  
    13761376                                                     (uiNoResidual != 0) DEBUG_STRING_PASS_INTO(tmpStr) );
    13771377
    1378 #ifdef DEBUG_STRING
     1378#if DEBUG_STRING
    13791379          DebugInterPredResiReco(tmpStr, *(m_ppcPredYuvTemp[uhDepth]), *(m_ppcResiYuvBest[uhDepth]), *(m_ppcRecoYuvTemp[uhDepth]), DebugStringGetPredModeMask(rpcTempCU->getPredictionMode(0)));
    13801380#endif
    … …  
    14861486  rpcTempCU->getTotalCost()  = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
    14871487
    1488 #ifdef DEBUG_STRING
     1488#if DEBUG_STRING
    14891489  DebugInterPredResiReco(sTest, *(m_ppcPredYuvTemp[uhDepth]), *(m_ppcResiYuvBest[uhDepth]), *(m_ppcRecoYuvTemp[uhDepth]), DebugStringGetPredModeMask(rpcTempCU->getPredictionMode(0)));
    14901490#endif
    … …  
    16351635
    16361636
    1637 #ifdef DEBUG_STRING
     1637#if DEBUG_STRING
    16381638    DEBUG_STRING_SWAP(sParent, sTest)
    16391639    const PredMode predMode=rpcBestCU->getPredictionMode(0);

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.cpp

    r1307 r1335  
    3737
    3838#include "TEncEntropy.h"
    39 #include "TLibCommon/TypeDef.h"
     39#include "TLibCommon/CommonDef.h"
    4040#include "TLibCommon/TComSampleAdaptiveOffset.h"
    4141#include "TLibCommon/TComTU.h"

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

    r1328 r1335  
    3636 */
    3737
    38 #include "TLibCommon/TypeDef.h"
     38#include "TLibCommon/CommonDef.h"
    3939#include "TLibCommon/TComRom.h"
    4040#include "TLibCommon/TComMotionInfo.h"
    … …  
    11531153        Pel *const     lumaResidualForEstimate              = bUseReconstructedResidualForEstimate ? reconstructedLumaResidual : encoderLumaResidual;
    11541154
    1155 #ifdef DEBUG_STRING
     1155#if DEBUG_STRING
    11561156  const Int debugPredModeMask=DebugStringGetPredModeMask(MODE_INTRA);
    11571157#endif
    … …  
    11631163  DEBUG_STRING_NEW(sTemp)
    11641164
    1165 #ifndef DEBUG_STRING
     1165#if !DEBUG_STRING
    11661166  if( default0Save1Load2 != 2 )
    11671167#endif
    … …  
    11901190    }
    11911191  }
    1192 #ifndef DEBUG_STRING
     1192#if !DEBUG_STRING
    11931193  else
    11941194  {
    … …  
    12731273  //--- inverse transform ---
    12741274
    1275 #ifdef DEBUG_STRING
     1275#if DEBUG_STRING
    12761276  if ( (uiAbsSum > 0) || (DebugOptionList::DebugString_InvTran.getInt()&debugPredModeMask) )
    12771277#else
    … …  
    13131313    }
    13141314
    1315  #ifdef DEBUG_STRING
     1315 #if DEBUG_STRING
    13161316    std::stringstream ss(stringstream::out);
    13171317    const Bool bDebugPred=((DebugOptionList::DebugString_Pred.getInt()&debugPredModeMask) && DEBUG_STRING_CHANNEL_CONDITION(compID));
    … …  
    23312331        Double cost      = (Double)uiSad + (Double)iModeBits * sqrtLambdaForFirstPass;
    23322332
    2333 #ifdef DEBUG_INTRA_SEARCH_COSTS
     2333#if DEBUG_INTRA_SEARCH_COSTS
    23342334        std::cout << "1st pass mode " << uiMode << " SAD = " << uiSad << ", mode bits = " << iModeBits << ", cost = " << cost << "\n";
    23352335#endif
    … …  
    24122412#endif
    24132413
    2414 #ifdef DEBUG_INTRA_SEARCH_COSTS
     2414#if DEBUG_INTRA_SEARCH_COSTS
    24152415      std::cout << "2nd pass [luma,chroma] mode [" << Int(pcCU->getIntraDir(CHANNEL_TYPE_LUMA, uiPartOffset)) << "," << Int(pcCU->getIntraDir(CHANNEL_TYPE_CHROMA, uiPartOffset)) << "] cost = " << dPUCost << "\n";
    24162416#endif
    … …  
    45504550    m_pcRDGoOnSbacCoder->store(m_pppcRDSbacCoder[pcCU->getDepth(0)][CI_TEMP_BEST]);
    45514551
    4552 #ifdef DEBUG_STRING
     4552#if DEBUG_STRING
    45534553    pcYuvResiBest->clear(); // Clear the residual image, if we didn't code it.
    45544554    for(UInt i=0; i<MAX_NUM_COMPONENT+1; i++)
    … …  
    45984598    static const UInt useTS[MAX_NUM_COMPONENT]={0,0,0};
    45994599    pcCU->setTransformSkipSubParts ( useTS, 0, pcCU->getDepth(0) );
    4600 #ifdef DEBUG_STRING
     4600#if DEBUG_STRING
    46014601    sDebug.clear();
    46024602    for(UInt i=0; i<MAX_NUM_COMPONENT+1; i++)
    … …  
    46744674
    46754675  UInt SplitFlag = ((pcCU->getSlice()->getSPS()->getQuadtreeTUMaxDepthInter() == 1) && pcCU->isInter(uiAbsPartIdx) && ( pcCU->getPartitionSize(uiAbsPartIdx) != SIZE_2Nx2N ));
    4676 #ifdef DEBUG_STRING
     4676#if DEBUG_STRING
    46774677  const Int debugPredModeMask = DebugStringGetPredModeMask(pcCU->getPredictionMode(uiAbsPartIdx));
    46784678#endif
    … …  
    50025002                }
    50035003
    5004 #ifdef DEBUG_STRING
     5004#if DEBUG_STRING
    50055005                if (currAbsSum > 0)
    50065006                {
    … …  
    51675167      DEBUG_STRING_NEW(childString)
    51685168      xEstimateInterResidualQT( pcResi, dSubdivCost, uiSubdivBits, uiSubdivDist, bCheckFull ? NULL : puiZeroDist,  tuRecurseChild DEBUG_STRING_PASS_INTO(childString));
    5169 #ifdef DEBUG_STRING
     5169#if DEBUG_STRING
    51705170      // split the string by component and append to the relevant output (because decoder decodes in channel order, whereas this search searches by TU-order)
    51715171      std::size_t lastPos=0;
    … …  
    52235223      ruiBits += uiSubdivBits;
    52245224      ruiDist += uiSubdivDist;
    5225 #ifdef DEBUG_STRING
     5225#if DEBUG_STRING
    52265226      for(UInt ch = 0; ch < numValidComp; ch++)
    52275227      {
    … …  
    52835283    ruiBits += uiSingleBits;
    52845284    ruiDist += uiSingleDist;
    5285 #ifdef DEBUG_STRING
     5285#if DEBUG_STRING
    52865286    for(UInt ch = 0; ch < numValidComp; ch++)
    52875287    {

  • branches/SHM-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp

    r1316 r1335  
    3636*/
    3737
    38 #include "../TLibCommon/TypeDef.h"
     38#include "../TLibCommon/CommonDef.h"
    3939#include "../TLibCommon/TComSlice.h"
    4040#include "../TLibCommon/TComPic.h"

  • branches/SHM-dev/source/Lib/TLibEncoder/WeightPredAnalysis.h

    r1259 r1335  
    3838#define __WEIGHTPREDANALYSIS__
    3939
    40 #include "../TLibCommon/TypeDef.h"
     40#include "../TLibCommon/CommonDef.h"
    4141#include "../TLibCommon/TComSlice.h"
    4242#include "TEncCavlc.h"
    … …  
    4646private:
    4747
    48   // member variables 
     48  // member variables
    4949  WPScalingParam  m_wp[NUM_REF_PIC_LIST_01][MAX_NUM_REF][MAX_NUM_COMPONENT];
    5050
Note: See TracChangeset for help on using the changeset viewer.