Changeset 521 in 3DVCSoftware


Ignore:
Timestamp:
4 Jul 2013, 21:00:23 (11 years ago)
Author:
tech
Message:

Integrated following changes:

  • H_MV_FIX1071, fix of encoder side reference list construction on IRAP pictures, same as in HM11.
  • H_3D_VSO_FIX_BORDRE_EXTENSION, fixed uninitialized borders for org-yuvs in VSO
  • H_MV_ENC_DEC_TRAC, added cu/pu level trace ( only enabled when ENC_DEC_TRACE is enabled)
Location:
branches/HTM-DEV-0.3-dev2/source
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp

    r504 r521  
    267267          bitstreamFile.seekg(location-streamoff(3));
    268268          bytestream.reset();
    269 #if H_MV
    270269#if ENC_DEC_TRACE
     270#if H_MV_ENC_DEC_TRAC
     271          const Bool resetCounter = false;
     272          if ( resetCounter )
     273          {
     274            g_nSymbolCounter  = symCount; // Only reset counter SH becomes traced twice
     275          }
     276          else
     277          {
     278            g_disableHLSTrace = true;     // Trancing of second parsing of SH is not carried out
     279          }         
     280#else
    271281          g_nSymbolCounter = symCount;
    272282#endif

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComRom.cpp

    r446 r521  
    324324Bool   g_bJustDoIt = false;
    325325UInt64 g_nSymbolCounter = 0;
     326#if H_MV_ENC_DEC_TRAC
     327Bool g_traceCU = true;
     328Bool g_tracePU = true;
     329Bool g_traceTU = true;
     330Bool g_disableHLSTrace = false;
     331UInt64 g_stopAtCounter   = 10803;
     332#endif
    326333#endif
    327334// ====================================================================================================================
    … …  
    518525Int  g_eTTable[4] = {0,3,1,2};
    519526
     527#if H_MV_ENC_DEC_TRAC
     528#if ENC_DEC_TRACE
     529Void writeToTraceFile( Char* symbolName, Int val, Bool doIt )
     530{
     531  if ( ( ( g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END )|| g_bJustDoIt ) && doIt  )
     532  {
     533    if ( g_stopAtCounter == g_nSymbolCounter )
     534    {
     535      std::cout << "Break point here." << std::endl;
     536    }
     537    fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
     538    fprintf( g_hTrace, "%-50s       : %d\n", symbolName, val );     
     539    fflush ( g_hTrace );
     540    g_nSymbolCounter++;
     541  }
     542}
     543
     544Void writeToTraceFile( Char* symbolName, Bool doIt )
     545{
     546  if ( ( ( g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END )|| g_bJustDoIt ) && doIt  )
     547  {
     548    fprintf( g_hTrace, "%s", symbolName );   
     549    fflush ( g_hTrace );
     550    g_nSymbolCounter++;
     551  }
     552}
     553
     554#endif
     555#endif
    520556//! \}

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComRom.h

    r324 r521  
    4040
    4141#include "CommonDef.h"
     42#include "TypeDef.h"
    4243
    4344#include<stdio.h>
    … …  
    184185#define DTRACE_CABAC_N        if ( ( g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END )|| g_bJustDoIt ) fprintf( g_hTrace, "\n"    );
    185186
     187#if H_MV_ENC_DEC_TRAC
     188 extern Bool   g_traceCU;
     189 extern Bool   g_tracePU;
     190 extern Bool   g_traceTU;
     191 extern Bool   g_disableHLSTrace;
     192 extern UInt64 g_stopAtCounter;
     193
     194#define DTRACE_CU(x,y)             writeToTraceFile( x,y, g_traceCU );
     195#define DTRACE_PU(x,y)             writeToTraceFile( x,y, g_tracePU );
     196#define DTRACE_TU(x,y)             writeToTraceFile( x,y, g_traceTU );
     197#define DTRACE_CU_S(x)             writeToTraceFile( x,   g_traceCU );
     198#define DTRACE_PU_S(x)             writeToTraceFile( x,   g_tracePU );
     199#define DTRACE_TU_S(x)             writeToTraceFile( x,   g_traceTU );
     200
     201
     202 Void           writeToTraceFile( Char* symbolName, Int val, Bool doIt );
     203 Void           writeToTraceFile( Char* symbolName, Bool doIt );
     204#endif
    186205#else
    187206
    … …  
    194213#define DTRACE_CABAC_N
    195214
     215#if H_MV_ENC_DEC_TRAC
     216#define DTRACE_CU(x,y)             
     217#define DTRACE_PU(x,y)             
     218#define DTRACE_TU(x,y)             
     219
     220#define DTRACE_CU_S(x)             
     221#define DTRACE_PU_S(x)             
     222#define DTRACE_TU_S(x)             
     223
     224#endif
    196225#endif
    197226

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp

    r504 r521  
    654654}
    655655
    656 #if H_MV
     656#if H_MV && !H_MV_FIX1071
    657657// Temporary fix for FIX1071 should be removed later
    658658Int TComSlice::getNumRpsCurrTempList( TComReferencePictureSet* rps /* = 0 */)
    … …  
    661661#endif
    662662{
    663 
    664663  Int numRpsCurrTempList = 0;
    665664
    … …  
    668667    return 0;
    669668  }
    670 #if H_MV
     669#if H_MV && !H_MV_FIX1071
    671670// Temporary fix for FIX1071 should be removed later
    672671  if (rps == NULL)
    … …  
    13021301/** Function for constructing an explicit Reference Picture Set out of the available pictures in a referenced Reference Picture Set
    13031302*/
     1303#if FIX1071 && H_MV_FIX1071
     1304Void TComSlice::createExplicitReferencePictureSetFromReference( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool isRAP)
     1305#else
    13041306Void TComSlice::createExplicitReferencePictureSetFromReference( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet)
     1307#endif
    13051308{
    13061309  TComPic* rpcPic;
    … …  
    13271330        // and should be added to the explicit Reference Picture Set
    13281331        pcRPS->setDeltaPOC(k, pReferencePictureSet->getDeltaPOC(i));
     1332#if FIX1071 && H_MV_FIX1071
     1333        pcRPS->setUsed(k, pReferencePictureSet->getUsed(i) && (!isRAP));
     1334#else
    13291335        pcRPS->setUsed(k, pReferencePictureSet->getUsed(i));
     1336#endif
    13301337        if(pcRPS->getDeltaPOC(k) < 0)
    13311338        {

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h

    r510 r521  
    16191619  Bool      getCheckLDC     ()                                  { return m_bCheckLDC; }
    16201620  Bool      getMvdL1ZeroFlag ()                                  { return m_bLMvdL1Zero;    }
    1621 #if H_MV // This is a temporary fix of the temporary fix L0177
     1621#if H_MV && !H_MV_FIX1071 // This is a temporary fix of the temporary fix L0177
    16221622  Int       getNumRpsCurrTempList( TComReferencePictureSet* rps = NULL );
    16231623#else
    … …  
    17361736  Bool isStepwiseTemporalLayerSwitchingPointCandidate( TComList<TComPic*>& rcListPic );
    17371737  Int       checkThatAllRefPicsAreAvailable( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool printErrors, Int pocRandomAccess = 0);
     1738#if FIX1071 && H_MV_FIX1071
     1739  Void      createExplicitReferencePictureSetFromReference( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool isRAP);
     1740#else
    17381741  Void      createExplicitReferencePictureSetFromReference( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet);
     1742#endif
    17391743
    17401744  Void setMaxNumMergeCand               (UInt val )         { m_maxNumMergeCand = val;                    }

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h

    r510 r521  
    6969///////////////////////////////////   MAJOR DEFINES   /////////////////////////////////// 
    7070/////////////////////////////////////////////////////////////////////////////////////////
     71#if H_MV
     72#define H_MV_FIX1071                      1  //< Fix on Fix1071, same as in HTM 11
     73#define H_MV_ENC_DEC_TRAC                 0  //< CU/PU level tracking
     74#endif
    7175
    7276#if H_3D
    … …  
    129133                                              // Sony_M23639
    130134#define H_3D_GEN                          1   // Some general changes can be removed after merge
    131 #define H_3D_CLEANUPS                     1
    132 #define H_3D_FIX                          1   // Temporary for minor fixes
     135#define H_3D_CLEANUPS                     1   // Temporary for minor fixes can be removed after merge
     136#define H_3D_FIX                          1   // Temporary for minor fixes can be removed after merge
     137#define H_3D_VSO_FIX_BORDRE_EXTENSION     1   // Temporary for minor fixes can be removed after merge
    133138#endif
    134139

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/SyntaxElementParser.cpp

    r324 r521  
    4949{
    5050  xReadCode (length, rValue);
     51#if H_MV_ENC_DEC_TRAC
     52  if ( g_disableHLSTrace )
     53  {
     54    return;
     55  }
     56#endif
    5157  fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
    5258  if (length < 10)
    … …  
    6470{
    6571  xReadUvlc (rValue);
     72#if H_MV_ENC_DEC_TRAC
     73  if ( g_disableHLSTrace )
     74  {
     75    return;
     76  }
     77#endif
    6678  fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
    6779  fprintf( g_hTrace, "%-50s ue(v) : %d\n", pSymbolName, rValue );
    … …  
    7284{
    7385  xReadSvlc(rValue);
     86#if H_MV_ENC_DEC_TRAC
     87  if ( g_disableHLSTrace )
     88  {
     89    return;
     90  }
     91#endif
    7492  fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
    7593  fprintf( g_hTrace, "%-50s se(v) : %d\n", pSymbolName, rValue );
    … …  
    8098{
    8199  xReadFlag(rValue);
     100#if H_MV_ENC_DEC_TRAC
     101  if ( g_disableHLSTrace )
     102  {
     103    return;
     104  }
     105#endif
    82106  fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
    83107  fprintf( g_hTrace, "%-50s u(1)  : %d\n", pSymbolName, rValue );

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecBinCoderCABAC.cpp

    r324 r521  
    3737
    3838#include "TDecBinCoderCABAC.h"
     39#include "../TLibCommon/TComRom.h"
    3940
    4041//! \ingroup TLibDecoder
    … …  
    260261  UInt uiBit = 0;
    261262  m_pcTComBitstream->read( iNum, uiBit );
     263#if H_MV_ENC_DEC_TRAC         
     264  DTRACE_CU("Number of pcm_alignment_zero_bit", iNum)
     265#endif
    262266}
    263267

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r504 r521  
    4747Void  xTraceSPSHeader (TComSPS *pSPS)
    4848{
     49#if H_MV_ENC_DEC_TRAC
     50  if ( g_disableHLSTrace )
     51  {
     52    return;
     53  }
     54  // To avoid mismatches
     55  fprintf( g_hTrace, "=========== Sequence Parameter Set ===========\n" );
     56#else
    4957  fprintf( g_hTrace, "=========== Sequence Parameter Set ID: %d ===========\n", pSPS->getSPSId() );
     58#endif
    5059}
    5160
    5261Void  xTracePPSHeader (TComPPS *pPPS)
    5362{
     63#if H_MV_ENC_DEC_TRAC
     64  if ( g_disableHLSTrace )
     65  {
     66    return;
     67  }
     68  fprintf( g_hTrace, "=========== Picture Parameter Set ===========\n" );
     69#else
    5470  fprintf( g_hTrace, "=========== Picture Parameter Set ID: %d ===========\n", pPPS->getPPSId() );
     71#endif
    5572}
    5673
    5774Void  xTraceSliceHeader (TComSlice *pSlice)
    5875{
     76#if H_MV_ENC_DEC_TRAC
     77  if ( g_disableHLSTrace )
     78  {
     79    return;
     80  }
     81#endif
    5982  fprintf( g_hTrace, "=========== Slice ===========\n");
    6083}

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCu.cpp

    r510 r521  
    204204  UInt uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ];
    205205  UInt uiBPelY   = uiTPelY + (g_uiMaxCUHeight>>uiDepth) - 1;
    206  
     206#if H_MV_ENC_DEC_TRAC
     207  DTRACE_CU_S("=========== coding_quadtree ===========\n")
     208  DTRACE_CU("x0", uiLPelX)
     209  DTRACE_CU("x1", uiTPelY)
     210  DTRACE_CU("log2CbSize", g_uiMaxCUWidth>>uiDepth)
     211  DTRACE_CU("cqtDepth"  , uiDepth)
     212#endif
    207213  TComSlice * pcSlice = pcCU->getPic()->getSlice(pcCU->getPic()->getCurrSliceIdx());
    208214  Bool bStartInCU = pcCU->getSCUAddr()+uiAbsPartIdx+uiCurNumParts>pcSlice->getSliceSegmentCurStartCUAddr()&&pcCU->getSCUAddr()+uiAbsPartIdx<pcSlice->getSliceSegmentCurStartCUAddr();
    … …  
    264270  }
    265271 
     272#if H_MV_ENC_DEC_TRAC
     273  DTRACE_CU_S("=========== coding_unit ===========\n")
     274#endif
     275
    266276  if( (g_uiMaxCUWidth>>uiDepth) >= pcCU->getSlice()->getPPS()->getMinCuDQPSize() && pcCU->getSlice()->getPPS()->getUseDQP())
    267277  {
    … …  
    330340  if( pcCU->isSkipped(uiAbsPartIdx) )
    331341  {
     342#if H_MV_ENC_DEC_TRAC
     343    DTRACE_PU_S("=========== prediction_unit ===========\n")
     344    DTRACE_PU("x0", uiLPelX)
     345    DTRACE_PU("x1", uiTPelY)
     346#endif
    332347    m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_0 );
    333348    m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_1 );

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecEntropy.cpp

    r510 r521  
    215215  for ( UInt uiPartIdx = 0, uiSubPartIdx = uiAbsPartIdx; uiPartIdx < uiNumPU; uiPartIdx++, uiSubPartIdx += uiPUOffset )
    216216  {
     217#if H_MV_ENC_DEC_TRAC
     218    DTRACE_PU_S("=========== prediction_unit ===========\n")
     219    // ToDo:
     220    //DTRACE_PU("x0", uiLPelX)
     221    //DTRACE_PU("x1", uiTPelY)
     222#endif
    217223    decodeMergeFlag( pcCU, uiSubPartIdx, uiDepth, uiPartIdx );
    218224    if ( pcCU->getMergeFlag( uiSubPartIdx ) )
    … …  
    364370  {
    365371    m_pcEntropyDecoderIf->parseMVPIdx( iMVPIdx );
     372#if H_MV_ENC_DEC_TRAC
     373#if ENC_DEC_TRACE
     374    if ( eRefList == REF_PIC_LIST_0 )
     375    {
     376      DTRACE_PU("mvp_l0_flag", iMVPIdx)
     377    }
     378    else
     379    {
     380      DTRACE_PU("mvp_l1_flag", iMVPIdx)
     381    }
     382#endif
     383#endif
    366384  }
    367385  pcSubCU->fillMvpCand(uiPartIdx, uiPartAddr, eRefList, iRefIdx, pAMVPInfo);
    … …  
    484502    pcCU->setTrIdxSubParts( uiTrDepth, uiAbsPartIdx, uiDepth );
    485503   
     504#if !H_MV_ENC_DEC_TRAC
    486505    {
    487506      DTRACE_CABAC_VL( g_nSymbolCounter++ );
    … …  
    494513      DTRACE_CABAC_T( "\n" );
    495514    }
     515#endif
    496516   
    497517    pcCU->setCbfSubParts ( 0, TEXT_LUMA, uiAbsPartIdx, uiDepth );

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecSbac.cpp

    r504 r521  
    331331    m_pcTDecBinIf->decodeBinTrm(uiSymbol);
    332332
     333#if H_MV_ENC_DEC_TRAC
     334      DTRACE_CU("pcm_flag", uiSymbol)
     335#endif
    333336    if (uiSymbol)
    334337    {
    … …  
    412415  UInt uiSymbol;
    413416  m_pcTDecBinIf->decodeBin( uiSymbol, m_CUTransquantBypassFlagSCModel.get( 0, 0, 0 ) );
     417#if H_MV_ENC_DEC_TRAC
     418  DTRACE_CU("cu_transquant_bypass_flag", uiSymbol);
     419#endif
    414420  pcCU->setCUTransquantBypassSubParts(uiSymbol ? true : false, uiAbsPartIdx, uiDepth);
    415421}
    … …  
    431437  UInt uiCtxSkip = pcCU->getCtxSkipFlag( uiAbsPartIdx );
    432438  m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUSkipFlagSCModel.get( 0, 0, uiCtxSkip ) );
     439#if !H_MV_ENC_DEC_TRAC
    433440  DTRACE_CABAC_VL( g_nSymbolCounter++ );
    434441  DTRACE_CABAC_T( "\tSkipFlag" );
    … …  
    438445  DTRACE_CABAC_V( uiSymbol );
    439446  DTRACE_CABAC_T( "\n");
     447#endif
    440448 
    441449  if( uiSymbol )
    … …  
    447455    pcCU->setMergeFlagSubParts( true , uiAbsPartIdx, 0, uiDepth );
    448456  }
     457#if H_MV_ENC_DEC_TRAC
     458  DTRACE_CU("cu_skip_flag", uiSymbol);
     459#endif
    449460}
    450461
    … …  
    460471  UInt uiSymbol;
    461472  m_pcTDecBinIf->decodeBin( uiSymbol, *m_cCUMergeFlagExtSCModel.get( 0 ) );
     473#if H_MV_ENC_DEC_TRAC
     474  DTRACE_PU("merge_flag", uiSymbol)
     475#endif
    462476  pcCU->setMergeFlagSubParts( uiSymbol ? true : false, uiAbsPartIdx, uiPUIdx, uiDepth );
    463477
     478#if !H_MV_ENC_DEC_TRAC
    464479  DTRACE_CABAC_VL( g_nSymbolCounter++ );
    465480  DTRACE_CABAC_T( "\tMergeFlag: " );
    … …  
    470485  DTRACE_CABAC_V( uiAbsPartIdx );
    471486  DTRACE_CABAC_T( "\n" );
     487#endif
    472488}
    473489
    … …  
    494510      }
    495511    }
     512#if H_MV_ENC_DEC_TRAC
     513    DTRACE_PU("merge_idx", uiUnaryIdx)
     514#endif
    496515  }
    497516  ruiMergeIndex = uiUnaryIdx;
    498517
     518#if !H_MV_ENC_DEC_TRAC
    499519  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    500520  DTRACE_CABAC_T( "\tparseMergeIndex()" )
    … …  
    502522  DTRACE_CABAC_V( ruiMergeIndex )
    503523  DTRACE_CABAC_T( "\n" )
     524#endif
    504525}
    505526
    … …  
    521542  UInt uiSymbol;
    522543  m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUSplitFlagSCModel.get( 0, 0, pcCU->getCtxSplitFlag( uiAbsPartIdx, uiDepth ) ) );
     544#if H_MV_ENC_DEC_TRAC
     545  DTRACE_CU("split_cu_flag", uiSymbol);
     546#else
    523547  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    524548  DTRACE_CABAC_T( "\tSplitFlag\n" )
     549#endif
    525550  pcCU->setDepthSubParts( uiDepth + uiSymbol, uiAbsPartIdx );
    526551 
    … …  
    545570    {
    546571      m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUPartSizeSCModel.get( 0, 0, 0) );
     572#if H_MV_ENC_DEC_TRAC         
     573      DTRACE_CU("part_mode", uiSymbol)
     574#endif       
    547575    }
    548576    eMode = uiSymbol ? SIZE_2Nx2N : SIZE_NxN;
    … …  
    598626      }
    599627    }
     628#if H_MV_ENC_DEC_TRAC         
     629    DTRACE_CU("part_mode", eMode )
     630#endif       
    600631  }
    601632  pcCU->setPartSizeSubParts( eMode, uiAbsPartIdx, uiDepth );
    … …  
    621652  m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUPredModeSCModel.get( 0, 0, 0 ) );
    622653  iPredMode += uiSymbol;
     654#if H_MV_ENC_DEC_TRAC         
     655  DTRACE_CU("pred_mode_flag", uiSymbol)
     656#endif       
    623657  pcCU->setPredModeSubParts( (PredMode)iPredMode, uiAbsPartIdx, uiDepth );
    624658}
    … …  
    639673    m_pcTDecBinIf->decodeBin( symbol, m_cCUIntraPredSCModel.get( 0, 0, 0) );
    640674    mpmPred[j] = symbol;
     675#if H_MV_ENC_DEC_TRAC         
     676    DTRACE_CU("prev_intra_luma_pred_flag", symbol)
     677#endif
    641678  }
    642679  for (j=0;j<partNum;j++)
    … …  
    652689        symbol++;
    653690      }
     691#if H_MV_ENC_DEC_TRAC         
     692      DTRACE_CU("mpm_idx", symbol)
     693#endif
    654694      intraPredMode = preds[symbol];
    655695    }
    … …  
    659699      m_pcTDecBinIf->decodeBinsEP( symbol, 5 );
    660700      intraPredMode = symbol;
    661        
     701#if H_MV_ENC_DEC_TRAC         
     702      DTRACE_CU("rem_intra_luma_pred_mode", symbol)
     703#endif       
    662704      //postponed sorting of MPMs (only in remaining branch)
    663705      if (preds[0] > preds[1])
    … …  
    690732  if( uiSymbol == 0 )
    691733  {
     734#if H_MV_ENC_DEC_TRAC         
     735    DTRACE_CU("intra_chroma_pred_mode", uiSymbol )
     736#endif       
    692737    uiSymbol = DM_CHROMA_IDX;
    693738  }
    … …  
    697742      UInt uiIPredMode;
    698743      m_pcTDecBinIf->decodeBinsEP( uiIPredMode, 2 );
     744#if H_MV_ENC_DEC_TRAC         
     745      DTRACE_CU("intra_chroma_pred_mode", uiIPredMode )
     746#endif       
    699747      UInt uiAllowedChromaDir[ NUM_CHROMA_MODE ];
    700748      pcCU->getAllowedChromaDir( uiAbsPartIdx, uiAllowedChromaDir );
    … …  
    729777  uiSymbol++;
    730778  ruiInterDir = uiSymbol;
     779#if H_MV_ENC_DEC_TRAC
     780    DTRACE_PU("inter_pred_idc", ruiInterDir - 1 )   
     781#endif
     782
    731783  return;
    732784}
    … …  
    764816  }
    765817
     818#if H_MV_ENC_DEC_TRAC
     819#if ENC_DEC_TRACE
     820  if ( eRefList == REF_PIC_LIST_0 )
     821  {
     822    DTRACE_PU("ref_idx_l0", uiSymbol)
     823  }
     824  else
     825  {
     826    DTRACE_PU("ref_idx_l1", uiSymbol)
     827  }
     828#endif
     829#endif
    766830  return;
    767831}
    … …  
    835899{
    836900  m_pcTDecBinIf->decodeBin( ruiSubdivFlag, m_cCUTransSubdivFlagSCModel.get( 0, 0, uiLog2TransformBlockSize ) );
     901#if !H_MV_ENC_DEC_TRAC
    837902  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    838903  DTRACE_CABAC_T( "\tparseTransformSubdivFlag()" )
    … …  
    842907  DTRACE_CABAC_V( uiLog2TransformBlockSize )
    843908  DTRACE_CABAC_T( "\n" )
     909#endif
    844910}
    845911
    … …  
    849915  const UInt uiCtx = 0;
    850916  m_pcTDecBinIf->decodeBin( uiSymbol , m_cCUQtRootCbfSCModel.get( 0, 0, uiCtx ) );
     917#if !H_MV_ENC_DEC_TRAC
    851918  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    852919  DTRACE_CABAC_T( "\tparseQtRootCbf()" )
    … …  
    858925  DTRACE_CABAC_V( uiAbsPartIdx )
    859926  DTRACE_CABAC_T( "\n" )
     927#else
     928  DTRACE_CU( "rqt_root_cbf", uiSymbol )
     929#endif
    860930 
    861931  uiQtRootCbf = uiSymbol;
    … …  
    904974  const UInt uiCtx = pcCU->getCtxQtCbf( eType, uiTrDepth );
    905975  m_pcTDecBinIf->decodeBin( uiSymbol , m_cCUQtCbfSCModel.get( 0, eType ? TEXT_CHROMA: eType, uiCtx ) );
    906  
     976#if !H_MV_ENC_DEC_TRAC 
    907977  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    908978  DTRACE_CABAC_T( "\tparseQtCbf()" )
    … …  
    916986  DTRACE_CABAC_V( uiAbsPartIdx )
    917987  DTRACE_CABAC_T( "\n" )
     988#endif
    918989 
    919990  pcCU->setCbfSubParts( uiSymbol << uiTrDepth, eType, uiAbsPartIdx, uiDepth );
    … …  
    9411012    }
    9421013  }
     1014#if !H_MV_ENC_DEC_TRAC
    9431015  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    9441016  DTRACE_CABAC_T("\tparseTransformSkip()");
    … …  
    9521024  DTRACE_CABAC_V( uiAbsPartIdx )
    9531025  DTRACE_CABAC_T( "\n" )
     1026#endif
    9541027
    9551028  pcCU->setTransformSkipSubParts( useTransformSkip, eTType, uiAbsPartIdx, uiDepth);
    … …  
    10271100Void TDecSbac::parseCoeffNxN( TComDataCU* pcCU, TCoeff* pcCoef, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, UInt uiDepth, TextType eTType )
    10281101{
     1102#if !H_MV_ENC_DEC_TRAC
    10291103  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    10301104  DTRACE_CABAC_T( "\tparseCoeffNxN()\teType=" )
    … …  
    10511125  DTRACE_CABAC_V(  pcCU->getPredictionMode( uiAbsPartIdx ) )
    10521126  DTRACE_CABAC_T( "\n" )
     1127#endif
    10531128 
    10541129  if( uiWidth > pcCU->getSlice()->getSPS()->getMaxTrSize() )
    … …  
    15881663    uiW += ( 1 == uiCode ? 1 : 0 );
    15891664  }
     1665#if H_MV_ENC_DEC_TRAC
     1666  DTRACE_CU("iv_res_pred_weight_idx", uiW )
     1667#endif
    15901668  pcCU->setARPWSubParts( ( UChar )( uiW ) , uiAbsPartIdx, uiDepth ); 
    15911669}
    … …  
    16041682  UInt uiCtxIC = pcCU->getCtxICFlag( uiAbsPartIdx );
    16051683  m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUICFlagSCModel.get( 0, 0, uiCtxIC ) );
     1684#if !H_MV_ENC_DEC_TRAC
    16061685  DTRACE_CABAC_VL( g_nSymbolCounter++ );
    16071686  DTRACE_CABAC_T( "\tICFlag" );
    … …  
    16111690  DTRACE_CABAC_V( uiSymbol );
    16121691  DTRACE_CABAC_T( "\n");
     1692#else
     1693  DTRACE_CU("ic_flag", uiSymbol)
     1694#endif
    16131695 
    16141696  pcCU->setICFlagSubParts( uiSymbol ? true : false , uiAbsPartIdx, 0, uiDepth );

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecSlice.cpp

    r324 r521  
    123123  DTRACE_CABAC_T( "\tPOC: " );
    124124  DTRACE_CABAC_V( rpcPic->getPOC() );
     125#if H_MV_ENC_DEC_TRAC
     126  DTRACE_CABAC_T( " Layer: " );
     127  DTRACE_CABAC_V( rpcPic->getLayerId() );
     128#endif
    125129  DTRACE_CABAC_T( "\n" );
    126130

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.cpp

    r504 r521  
    718718    return false;
    719719  }
     720#if ENC_DEC_TRACE
     721#if H_MV_ENC_DEC_TRAC
     722  // parse remainder of SH
     723   g_disableHLSTrace = false;
     724#endif
     725#endif
    720726#endif
    721727  // actual decoding starts here

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp

    r504 r521  
    3939#include "TEncCavlc.h"
    4040#include "SEIwrite.h"
     41#include "../TLibCommon/TypeDef.h"
    4142
    4243//! \ingroup TLibEncoder
    … …  
    4748Void  xTraceSPSHeader (TComSPS *pSPS)
    4849{
     50#if H_MV_ENC_DEC_TRAC
     51  fprintf( g_hTrace, "=========== Sequence Parameter Set ===========\n" );
     52#else
    4953  fprintf( g_hTrace, "=========== Sequence Parameter Set ID: %d ===========\n", pSPS->getSPSId() );
     54#endif
    5055}
    5156
    5257Void  xTracePPSHeader (TComPPS *pPPS)
    5358{
     59#if H_MV_ENC_DEC_TRAC
     60  fprintf( g_hTrace, "=========== Picture Parameter Set ===========\n" );
     61#else
    5462  fprintf( g_hTrace, "=========== Picture Parameter Set ID: %d ===========\n", pPPS->getPPSId() );
     63#endif
    5564}
    5665
    … …  
    838847    //   colour_plane_id                                      u(2)
    839848
    840 #if H_MV
     849#if H_MV && !H_MV_FIX1071
    841850    // Temporary fix for FIX1071 should be removed later
    842851    TComReferencePictureSet* rps = pcSlice->getRPS();
    … …  
    846855      Int picOrderCntLSB = (pcSlice->getPOC()-pcSlice->getLastIDR()+(1<<pcSlice->getSPS()->getBitsForPOC()))%(1<<pcSlice->getSPS()->getBitsForPOC());
    847856      WRITE_CODE( picOrderCntLSB, pcSlice->getSPS()->getBitsForPOC(), "pic_order_cnt_lsb");
    848 #if !H_MV
    849       // Temporary fix for FIX1071 should be removed later
     857#if !H_MV || H_MV_FIX1071
    850858      TComReferencePictureSet* rps = pcSlice->getRPS();
    851859#endif     
    852 #if FIX1071
     860#if FIX1071 && H_MV_FIX1071
     861      // check for bitstream restriction stating that:
     862      // If the current picture is a BLA or CRA picture, the value of NumPocTotalCurr shall be equal to 0.
     863      // Ideally this process should not be repeated for each slice in a picture
     864      if (pcSlice->isIRAP())
     865      {
     866          for (Int picIdx = 0; picIdx < rps->getNumberOfPictures(); picIdx++)
     867          {
     868          assert (!rps->getUsed(picIdx));
     869          }
     870        }
     871#endif
     872#if FIX1071 && !H_MV_FIX1071
    853873      // Deal with bitstream restriction stating that:
    854874      // – If the current picture is a BLA or CRA picture, the value of NumPocTotalCurr shall be equal to 0.
    … …  
    872892        }
    873893      }
    874 
    875894      if(pcSlice->getRPSidx() < 0 || useAltRps)
    876895#else
    … …  
    10091028      pcSlice->setNumRefIdx(REF_PIC_LIST_1, 0);
    10101029    }
    1011 #if H_MV
     1030#if H_MV && !H_MV_FIX1071
    10121031    // Temporary fix for FIX1071 should be removed later
    10131032    if( pcSlice->getPPS()->getListsModificationPresentFlag() && pcSlice->getNumRpsCurrTempList( rps ) > 1)

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCu.cpp

    r510 r521  
    12231223  UInt uiBPelY   = uiTPelY + (g_uiMaxCUHeight>>uiDepth) - 1;
    12241224 
     1225#if H_MV_ENC_DEC_TRAC
     1226  DTRACE_CU_S("=========== coding_quadtree ===========\n")
     1227  DTRACE_CU("x0", uiLPelX)
     1228  DTRACE_CU("x1", uiTPelY)
     1229  DTRACE_CU("log2CbSize", g_uiMaxCUWidth>>uiDepth)
     1230  DTRACE_CU("cqtDepth"  , uiDepth)
     1231#endif
     1232
    12251233  TComSlice * pcSlice = pcCU->getPic()->getSlice(pcCU->getPic()->getCurrSliceIdx());
    12261234  // If slice start is within this cu...
    … …  
    12571265  }
    12581266 
     1267#if H_MV_ENC_DEC_TRAC
     1268  DTRACE_CU_S("=========== coding_unit ===========\n")
     1269#endif
     1270
    12591271  if( (g_uiMaxCUWidth>>uiDepth) >= pcCU->getSlice()->getPPS()->getMinCuDQPSize() && pcCU->getSlice()->getPPS()->getUseDQP())
    12601272  {
    … …  
    12721284  if( pcCU->isSkipped( uiAbsPartIdx ) )
    12731285  {
     1286#if H_MV_ENC_DEC_TRAC
     1287    DTRACE_PU_S("=========== prediction_unit ===========\n")
     1288    DTRACE_PU("x0", uiLPelX)
     1289    DTRACE_PU("x1", uiTPelY)
     1290#endif
    12741291    m_pcEntropyCoder->encodeMergeIndex( pcCU, uiAbsPartIdx );
    12751292#if H_3D_IC

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncEntropy.cpp

    r504 r521  
    368368  else
    369369  {
     370#if !H_MV_ENC_DEC_TRAC
    370371    {
    371372      DTRACE_CABAC_VL( g_nSymbolCounter++ );
    … …  
    378379      DTRACE_CABAC_T( "\n" );
    379380    }
     381#endif
    380382   
    381383    if( pcCU->getPredictionMode(uiAbsPartIdx) != MODE_INTRA && uiDepth == pcCU->getDepth( uiAbsPartIdx ) && !pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, 0 ) && !pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, 0 ) )
    … …  
    495497  for ( UInt uiPartIdx = 0, uiSubPartIdx = uiAbsPartIdx; uiPartIdx < uiNumPU; uiPartIdx++, uiSubPartIdx += uiPUOffset )
    496498  {
     499#if H_MV_ENC_DEC_TRAC
     500    DTRACE_PU_S("=========== prediction_unit ===========\n")
     501       //Todo:
     502      //DTRACE_PU("x0", uiLPelX)
     503      //DTRACE_PU("x1", uiTPelY)
     504#endif
    497505    encodeMergeFlag( pcCU, uiSubPartIdx );
    498506    if ( pcCU->getMergeFlag( uiSubPartIdx ) )

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.cpp

    r510 r521  
    595595    pcSlice->getRPS()->setNumberOfLongtermPictures(0);
    596596
     597#if FIX1071 && H_MV_FIX1071
     598    if ((pcSlice->checkThatAllRefPicsAreAvailable(rcListPic, pcSlice->getRPS(), false) != 0) || (pcSlice->isIRAP()))
     599    {
     600      pcSlice->createExplicitReferencePictureSetFromReference(rcListPic, pcSlice->getRPS(), pcSlice->isIRAP());
     601    }
     602#else
    597603    if(pcSlice->checkThatAllRefPicsAreAvailable(rcListPic, pcSlice->getRPS(), false) != 0)
    598604    {
    599605      pcSlice->createExplicitReferencePictureSetFromReference(rcListPic, pcSlice->getRPS());
    600606    }
     607#endif
    601608    pcSlice->applyReferencePictureSet(rcListPic, pcSlice->getRPS());
    602609

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSbac.cpp

    r504 r521  
    439439
    440440  xWriteUnaryMaxSymbol(iSymbol, m_cMVPIdxSCModel.get(0), 1, iNum-1);
     441#if H_MV_ENC_DEC_TRAC
     442#if ENC_DEC_TRACE
     443  if ( eRefList == REF_PIC_LIST_0 )
     444  {
     445    DTRACE_PU("mvp_l0_flag", iSymbol)
     446  }
     447  else
     448  {
     449    DTRACE_PU("mvp_l1_flag", iSymbol)
     450  }
     451#endif
     452#endif
    441453}
    442454
    … …  
    449461    {
    450462      m_pcBinIf->encodeBin( eSize == SIZE_2Nx2N? 1 : 0, m_cCUPartSizeSCModel.get( 0, 0, 0 ) );
     463#if H_MV_ENC_DEC_TRAC
     464      DTRACE_CU("part_mode", eSize == SIZE_2Nx2N? 1 : 0)
     465#endif       
    451466    }
    452467    return;
    453468  }
    454469 
     470#if H_MV_ENC_DEC_TRAC         
     471  DTRACE_CU("part_mode", eSize )
     472#endif       
    455473  switch(eSize)
    456474  {
    … …  
    531549  Int iPredMode = pcCU->getPredictionMode( uiAbsPartIdx );
    532550  m_pcBinIf->encodeBin( iPredMode == MODE_INTER ? 0 : 1, m_cCUPredModeSCModel.get( 0, 0, 0 ) );
     551#if H_MV_ENC_DEC_TRAC
     552  DTRACE_CU("pred_mode_flag", iPredMode == MODE_INTER ? 0 : 1);
     553#endif
    533554}
    534555
    … …  
    537558  UInt uiSymbol = pcCU->getCUTransquantBypass(uiAbsPartIdx);
    538559  m_pcBinIf->encodeBin( uiSymbol, m_CUTransquantBypassFlagSCModel.get( 0, 0, 0 ) );
     560#if H_MV_ENC_DEC_TRAC
     561  DTRACE_CU("cu_transquant_bypass_flag", uiSymbol);
     562#endif
    539563}
    540564
    … …  
    550574  UInt uiCtxSkip = pcCU->getCtxSkipFlag( uiAbsPartIdx ) ;
    551575  m_pcBinIf->encodeBin( uiSymbol, m_cCUSkipFlagSCModel.get( 0, 0, uiCtxSkip ) );
     576#if !H_MV_ENC_DEC_TRAC
    552577  DTRACE_CABAC_VL( g_nSymbolCounter++ );
    553578  DTRACE_CABAC_T( "\tSkipFlag" );
    … …  
    557582  DTRACE_CABAC_V( uiSymbol );
    558583  DTRACE_CABAC_T( "\n");
     584#else
     585  DTRACE_CU("cu_skip_flag", uiSymbol);
     586#endif
    559587}
    560588
    … …  
    569597  m_pcBinIf->encodeBin( uiSymbol, *m_cCUMergeFlagExtSCModel.get( 0 ) );
    570598
     599#if H_MV_ENC_DEC_TRAC
     600  DTRACE_PU("merge_flag", uiSymbol);
     601#else
    571602  DTRACE_CABAC_VL( g_nSymbolCounter++ );
    572603  DTRACE_CABAC_T( "\tMergeFlag: " );
    … …  
    577608  DTRACE_CABAC_V( uiAbsPartIdx );
    578609  DTRACE_CABAC_T( "\n" );
     610#endif
    579611}
    580612
    … …  
    606638      }
    607639    }
    608   }
     640#if H_MV_ENC_DEC_TRAC
     641    DTRACE_PU("merge_idx", uiUnaryIdx);
     642#endif
     643  }
     644#if !H_MV_ENC_DEC_TRAC
    609645  DTRACE_CABAC_VL( g_nSymbolCounter++ );
    610646  DTRACE_CABAC_T( "\tparseMergeIndex()" );
    … …  
    612648  DTRACE_CABAC_V( pcCU->getMergeIndex( uiAbsPartIdx ) );
    613649  DTRACE_CABAC_T( "\n" );
     650#endif
    614651}
    615652
    … …  
    628665     m_pcBinIf->encodeBin( ( iW == iMaxW ) ? 1 : 0, m_cCUPUARPWSCModel.get( 0, 0, 3 ) );
    629666  }
     667#if H_MV_ENC_DEC_TRAC
     668  DTRACE_CU("iv_res_pred_weight_idx", iW);
     669#endif
    630670}
    631671#endif
    … …  
    643683  UInt uiCtxIC  = pcCU->getCtxICFlag( uiAbsPartIdx ) ;
    644684  m_pcBinIf->encodeBin( uiSymbol, m_cCUICFlagSCModel.get( 0, 0, uiCtxIC ) );
     685#if !H_MV_ENC_DEC_TRAC
    645686  DTRACE_CABAC_VL( g_nSymbolCounter++ );
    646687  DTRACE_CABAC_T( "\tICFlag" );
    … …  
    650691  DTRACE_CABAC_V( uiSymbol );
    651692  DTRACE_CABAC_T( "\n");
     693#else
     694  DTRACE_CU("ic_flag", uiSymbol );
     695#endif
    652696}
    653697#endif
    … …  
    664708  assert( uiCtx < 3 );
    665709  m_pcBinIf->encodeBin( uiCurrSplitFlag, m_cCUSplitFlagSCModel.get( 0, 0, uiCtx ) );
     710#if !H_MV_ENC_DEC_TRAC
    666711  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    667712  DTRACE_CABAC_T( "\tSplitFlag\n" )
     713#else
     714  DTRACE_CU("split_cu_flag", uiCurrSplitFlag );
     715#endif
    668716  return;
    669717}
    … …  
    672720{
    673721  m_pcBinIf->encodeBin( uiSymbol, m_cCUTransSubdivFlagSCModel.get( 0, 0, uiCtx ) );
     722#if !H_MV_ENC_DEC_TRAC
    674723  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    675724  DTRACE_CABAC_T( "\tparseTransformSubdivFlag()" )
    … …  
    679728  DTRACE_CABAC_V( uiCtx )
    680729  DTRACE_CABAC_T( "\n" )
     730#endif
    681731}
    682732
    … …  
    701751    }
    702752    m_pcBinIf->encodeBin((predIdx[j] != -1)? 1 : 0, m_cCUIntraPredSCModel.get( 0, 0, 0 ) );
     753#if H_MV_ENC_DEC_TRAC
     754    DTRACE_CU("prev_intra_luma_pred_flag", (predIdx[j] != -1)? 1 : 0);
     755#endif
    703756  } 
    704757  for (j=0;j<partNum;j++)
    … …  
    711764        m_pcBinIf->encodeBinEP( predIdx[j]-1 );
    712765      }
     766#if H_MV_ENC_DEC_TRAC
     767      DTRACE_CU("mpm_idx", predIdx[j] );
     768#endif
    713769    }
    714770    else
    … …  
    731787      }
    732788      m_pcBinIf->encodeBinsEP( dir[j], 5 );
     789#if H_MV_ENC_DEC_TRAC
     790      DTRACE_CU("rem_intra_luma_pred_mode", dir[j] );
     791#endif
    733792    }
    734793  }
    … …  
    743802  {
    744803    m_pcBinIf->encodeBin( 0, m_cCUChromaPredSCModel.get( 0, 0, 0 ) );
     804#if H_MV_ENC_DEC_TRAC
     805    DTRACE_CU("intra_chroma_pred_mode", 0 );
     806#endif
    745807  }
    746808  else
    … …  
    760822
    761823    m_pcBinIf->encodeBinsEP( uiIntraDirChroma, 2 );
     824#if H_MV_ENC_DEC_TRAC
     825    DTRACE_CU("intra_chroma_pred_mode", uiIntraDirChroma );
     826#endif
     827
    762828  }
    763829  return;
    … …  
    777843    m_pcBinIf->encodeBin( uiInterDir, *( pCtx + 4 ) );
    778844  }
     845#if H_MV_ENC_DEC_TRAC
     846  DTRACE_PU("inter_pred_idc", uiInterDir );
     847#endif
     848
    779849  return;
    780850}
    … …  
    809879      }
    810880    }
     881#if H_MV_ENC_DEC_TRAC
     882#if ENC_DEC_TRACE
     883    iRefFrame = pcCU->getCUMvField( eRefList )->getRefIdx( uiAbsPartIdx );
     884    if ( eRefList == REF_PIC_LIST_0 )
     885    {
     886      DTRACE_PU("ref_idx_l0", iRefFrame)
     887    }
     888    else
     889    {
     890      DTRACE_PU("ref_idx_l1", iRefFrame)
     891    }
     892#endif
     893#endif
    811894  }
    812895  return;
    … …  
    896979  UInt uiCtx = pcCU->getCtxQtCbf( eType, uiTrDepth );
    897980  m_pcBinIf->encodeBin( uiCbf , m_cCUQtCbfSCModel.get( 0, eType ? TEXT_CHROMA : eType, uiCtx ) );
     981#if !H_MV_ENC_DEC_TRAC
    898982  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    899983  DTRACE_CABAC_T( "\tparseQtCbf()" )
    … …  
    907991  DTRACE_CABAC_V( uiAbsPartIdx )
    908992  DTRACE_CABAC_T( "\n" )
     993#endif
    909994}
    910995
    … …  
    9221007  UInt useTransformSkip = pcCU->getTransformSkip( uiAbsPartIdx,eTType);
    9231008  m_pcBinIf->encodeBin( useTransformSkip, m_cTransformSkipSCModel.get( 0, eTType? TEXT_CHROMA: TEXT_LUMA, 0 ) );
     1009#if !H_MV_ENC_DEC_TRAC
    9241010  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    9251011  DTRACE_CABAC_T("\tparseTransformSkip()");
    … …  
    9331019  DTRACE_CABAC_V( uiAbsPartIdx )
    9341020  DTRACE_CABAC_T( "\n" )
     1021#endif
    9351022}
    9361023
    … …  
    9471034
    9481035  m_pcBinIf->encodeBinTrm (uiIPCM);
    949 
     1036#if H_MV_ENC_DEC_TRAC         
     1037  DTRACE_CU("pcm_flag", uiIPCM)
     1038#endif
    9501039  if (writePCMSampleFlag)
    9511040  {
    … …  
    10171106  UInt uiCtx = 0;
    10181107  m_pcBinIf->encodeBin( uiCbf , m_cCUQtRootCbfSCModel.get( 0, 0, uiCtx ) );
     1108#if !H_MV_ENC_DEC_TRAC
    10191109  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    10201110  DTRACE_CABAC_T( "\tparseQtRootCbf()" )
    … …  
    10261116  DTRACE_CABAC_V( uiAbsPartIdx )
    10271117  DTRACE_CABAC_T( "\n" )
     1118#else
     1119  DTRACE_CU( "rqt_root_cbf", uiCbf )
     1120#endif
    10281121}
    10291122
    … …  
    11161209Void TEncSbac::codeCoeffNxN( TComDataCU* pcCU, TCoeff* pcCoef, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, UInt uiDepth, TextType eTType )
    11171210{
     1211#if !H_MV_ENC_DEC_TRAC
    11181212  DTRACE_CABAC_VL( g_nSymbolCounter++ )
    11191213  DTRACE_CABAC_T( "\tparseCoeffNxN()\teType=" )
    … …  
    11401234  DTRACE_CABAC_V(  pcCU->getPredictionMode( uiAbsPartIdx ) )
    11411235  DTRACE_CABAC_T( "\n" )
    1142 
     1236#endif
    11431237  if( uiWidth > m_pcSlice->getSPS()->getMaxTrSize() )
    11441238  {

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSlice.cpp

    r504 r521  
    13321332  DTRACE_CABAC_T( "\tPOC: " );
    13331333  DTRACE_CABAC_V( rpcPic->getPOC() );
     1334#if H_MV_ENC_DEC_TRAC
     1335  DTRACE_CABAC_T( " Layer: " );
     1336  DTRACE_CABAC_V( rpcPic->getLayerId() );
     1337#endif
    13341338  DTRACE_CABAC_T( "\n" );
    13351339#if ENC_DEC_TRACE

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp

    r479 r521  
    507507  // mark it should be extended
    508508  rpcPic->getPicYuvRec()->setBorderExtension(false);
     509#if H_3D_VSO_FIX_BORDRE_EXTENSION
     510  rpcPic->getPicYuvOrg()->setBorderExtension(false);
     511#endif
    509512}
    510513
Note: See TracChangeset for help on using the changeset viewer.