Ignore:
Timestamp:
15 Jul 2015, 14:57:32 (10 years ago)
Author:
tech
Message:

Merged 14.1-update-dev2@1277.

Location:
branches/HTM-14.1-update-dev1
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-14.1-update-dev1

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/SyntaxElementParser.cpp

    r1200 r1279  
    6363  if ( !g_disableNumbering )
    6464  {
    65 #endif
    66   fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
    67 #if H_MV_ENC_DEC_TRAC
    68   }
     65    incSymbolCounter();
     66    fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter );
     67  }
     68#else
     69    fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
    6970#endif
    7071  if (length < 10)
    … …  
    9394  if ( !g_disableNumbering )
    9495  {
    95 #endif
     96  incSymbolCounter();
     97  fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter );
     98  }
     99#else
    96100  fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
    97 #if H_MV_ENC_DEC_TRAC
    98   }
    99101#endif
    100102  fprintf( g_hTrace, "%-50s ue(v) : %u\n", pSymbolName, rValue );
    … …  
    115117  }
    116118  if ( !g_disableNumbering )
    117   {
    118 #endif
    119   fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
    120 #if H_MV_ENC_DEC_TRAC
    121   }
     119  { 
     120    incSymbolCounter();
     121    fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter );
     122  }
     123#else
     124    fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
    122125#endif
    123126  fprintf( g_hTrace, "%-50s se(v) : %d\n", pSymbolName, rValue );
    … …  
    139142  if ( !g_disableNumbering )
    140143  {
    141 #endif
     144    incSymbolCounter();
     145    fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter );
     146  }
     147#else
    142148  fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
    143 #if H_MV_ENC_DEC_TRAC
    144   }
    145149#endif
    146150  fprintf( g_hTrace, "%-50s u(1)  : %d\n", pSymbolName, rValue );

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1258 r1279  
    27732773    }
    27742774
    2775 #if H_3D_IC
     2775#if NH_3D_IC
    27762776    else if(    pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE )
    27772777             && !pcSlice->getIsDepth() && vps->getNumRefListLayers( layerId ) > 0
    … …  
    27862786      if ( uiCodeTmp )
    27872787      {
    2788         READ_FLAG ( uiCodeTmp, "ic_skip_mergeidx0" );
     2788        READ_FLAG ( uiCodeTmp, "slice_ic_disabled_merge_zero_idx_flag" );
    27892789        pcSlice->setIcSkipParseFlag( uiCodeTmp );
    27902790      }
    … …  
    27952795    {
    27962796      READ_UVLC( uiCode, "five_minus_max_num_merge_cand");
    2797 #if H_3D_IV_MERGE
     2797#if NH_3D_IV_MERGE
    27982798      pcSlice->setMaxNumMergeCand(( ( pcSlice->getMpiFlag() || pcSlice->getIvMvPredFlag() || pcSlice->getViewSynthesisPredFlag() ) ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
    27992799#else
    … …  
    33663366}
    33673367
    3368 #if H_3D_ARP
     3368#if NH_3D_ARP
    33693369Void TDecCavlc::parseARPW( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    33703370{
    … …  
    33723372}
    33733373#endif
    3374 #if H_3D_IC
     3374#if NH_3D_IC
    33753375Void TDecCavlc::parseICFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    33763376{
    … …  
    33853385
    33863386#endif
    3387 #if H_3D_DBBP
     3387#if NH_3D_DBBP
    33883388  Void TDecCavlc::parseDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    33893389  {

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCAVLC.h

    r1258 r1279  
    117117  Void parseMergeFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    118118  Void parseMergeIndex      ( TComDataCU* pcCU, UInt& ruiMergeIndex );
    119 #if H_3D_ARP
     119#if NH_3D_ARP
    120120  Void parseARPW            ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    121121#endif
    122 #if H_3D_IC
     122#if NH_3D_IC
    123123  Void  parseICFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    124124#endif
    … …  
    129129  Void  parseSDCFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    130130#endif
    131 #if H_3D_DBBP
     131#if NH_3D_DBBP
    132132  Void  parseDBBPFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    133133#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCu.cpp

    r1258 r1279  
    5252  m_ppcYuvReco = NULL;
    5353  m_ppcCU      = NULL;
    54 #if H_3D_DBBP
     54#if NH_3D_DBBP
    5555  m_ppcYuvRecoDBBP = NULL;
    5656#endif
    … …  
    8181  m_ppcYuvReco = new TComYuv*[m_uiMaxDepth-1];
    8282  m_ppcCU      = new TComDataCU*[m_uiMaxDepth-1];
    83 #if H_3D_DBBP
     83#if NH_3D_DBBP
    8484  m_ppcYuvRecoDBBP = new TComYuv*[m_uiMaxDepth-1];
    8585#endif
    … …  
    9595    m_ppcYuvReco[ui] = new TComYuv;    m_ppcYuvReco[ui]->create( uiWidth, uiHeight, chromaFormatIDC );
    9696    m_ppcCU     [ui] = new TComDataCU; m_ppcCU     [ui]->create( chromaFormatIDC, uiNumPartitions, uiWidth, uiHeight, true, uiMaxWidth >> (m_uiMaxDepth - 1) );
    97 #if H_3D_DBBP
    98     m_ppcYuvRecoDBBP[ui] = new TComYuv;    m_ppcYuvRecoDBBP[ui]->create( uiWidth, uiHeight );
     97#if NH_3D_DBBP
     98    m_ppcYuvRecoDBBP[ui] = new TComYuv;    m_ppcYuvRecoDBBP[ui]->create( uiWidth, uiHeight, chromaFormatIDC );
    9999#endif
    100100}
    … …  
    119119    m_ppcYuvReco[ui]->destroy(); delete m_ppcYuvReco[ui]; m_ppcYuvReco[ui] = NULL;
    120120    m_ppcCU     [ui]->destroy(); delete m_ppcCU     [ui]; m_ppcCU     [ui] = NULL;
    121 #if H_3D_DBBP
     121#if NH_3D_DBBP
    122122    m_ppcYuvRecoDBBP[ui]->destroy(); delete m_ppcYuvRecoDBBP[ui]; m_ppcYuvRecoDBBP[ui] = NULL;
    123123#endif
    … …  
    127127  delete [] m_ppcYuvReco; m_ppcYuvReco = NULL;
    128128  delete [] m_ppcCU     ; m_ppcCU      = NULL;
    129 #if H_3D_DBBP
     129#if NH_3D_DBBP
    130130  delete [] m_ppcYuvRecoDBBP; m_ppcYuvRecoDBBP = NULL;
    131131#endif
    … …  
    152152    setIsChromaQpAdjCoded(true);
    153153  }
    154 
     154 
    155155  // start from the top level CU
    156156  xDecodeCU( pCtu, 0, 0, isLastCtuOfSliceSegment);
    … …  
    163163Void TDecCu::decompressCtu( TComDataCU* pCtu )
    164164{
    165 #if !H_3D_IV_MERGE
     165#if !NH_3D_IV_MERGE
    166166  xDecompressCU( pCtu, 0,  0 );
    167167#endif
    … …  
    283283    pcCU->setQPSubParts( pcCU->getRefQP(uiAbsPartIdx), uiAbsPartIdx, uiDepth ); // set QP to default QP
    284284  }
    285 #if H_3D_NBDV
     285#if NH_3D_NBDV
    286286  DisInfo DvInfo;
    287287  DvInfo.m_acNBDV.setZero();
    288288  DvInfo.m_aVIdxCan = 0;
    289 #if H_3D_NBDV_REF 
     289#if NH_3D_NBDV_REF 
    290290  DvInfo.m_acDoNBDV.setZero();
    291291#endif
    … …  
    293293if(!pcCU->getSlice()->isIntra())
    294294  {
    295 #if H_3D_ARP && H_3D_IV_MERGE
    296     if( pcCU->getSlice()->getIvResPredFlag() || pcCU->getSlice()->getIvMvPredFlag() )
     295#if NH_3D_ARP && NH_3D_IV_MERGE && NH_3D_VSP
     296    if( pcCU->getSlice()->getIvResPredFlag() || pcCU->getSlice()->getIvMvPredFlag() || pcCU->getSlice()->getViewSynthesisPredFlag() )
    297297#else
     298#if NH_3D_IV_MERGE && NH_3D_VSP
     299    if( pcCU->getSlice()->getIvMvPredFlag() || pcCU->getSlice()->getViewSynthesisPredFlag() )
     300#else
     301#if NH_3D_ARP && NH_3D_VSP
     302    if( pcCU->getSlice()->getIvResPredFlag() || pcCU->getSlice()->getViewSynthesisPredFlag() )
     303#else
     304#if NH_3D_VSP
     305    if( pcCU->getSlice()->getViewSynthesisPredFlag() )
     306#else
    298307#if H_3D_ARP
    299     if( pcCU->getSlice()->getVPS()->getUseAdvRP(pcCU->getSlice()->getLayerId()) )
     308    if( pcCU->getSlice()->getIvResPredFlag( ) )
    300309#else
    301310#if H_3D_IV_MERGE
    302311    if( pcCU->getSlice()->getVPS()->getIvMvPredFlag(pcCU->getSlice()->getLayerId()) )
    303312#else
     313#if NH_3D_DBBP
     314    if( pcCU->getSlice()->getDepthBasedBlkPartFlag() )
     315#else
    304316    if (0)
    305317#endif
    306318#endif
    307319#endif
    308     {
    309       m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_0, true );
    310       m_ppcCU[uiDepth]->copyDVInfoFrom( pcCU, uiAbsPartIdx);
     320#endif
     321#endif
     322#endif
     323#endif
     324    {
     325      m_ppcCU[uiDepth]->copyInterPredInfoFrom(pcCU, uiAbsPartIdx, REF_PIC_LIST_0, true);
     326      m_ppcCU[uiDepth]->copyDVInfoFrom(pcCU, uiAbsPartIdx);
    311327      PartSize ePartTemp = m_ppcCU[uiDepth]->getPartitionSize(0);
    312328      UChar cWidTemp     = m_ppcCU[uiDepth]->getWidth(0);
    313329      UChar cHeightTemp  = m_ppcCU[uiDepth]->getHeight(0);
    314       m_ppcCU[uiDepth]->setWidth  ( 0, pcCU->getSlice()->getSPS()->getMaxCUWidth ()/(1<<uiDepth)  );
    315       m_ppcCU[uiDepth]->setHeight ( 0, pcCU->getSlice()->getSPS()->getMaxCUHeight()/(1<<uiDepth)  );
    316       m_ppcCU[uiDepth]->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );     
    317 #if H_3D_IV_MERGE
     330      m_ppcCU[uiDepth]->setWidth (0, pcCU->getSlice()->getSPS()->getMaxCUWidth () / (1 << uiDepth));
     331      m_ppcCU[uiDepth]->setHeight(0, pcCU->getSlice()->getSPS()->getMaxCUHeight() / (1 << uiDepth));
     332      m_ppcCU[uiDepth]->setPartSizeSubParts(SIZE_2Nx2N, 0, uiDepth);     
     333#if NH_3D_IV_MERGE
    318334      if( pcCU->getSlice()->getIsDepth())
    319335      {
    … …  
    323339      {
    324340#endif
    325 #if H_3D_NBDV_REF
     341#if NH_3D_NBDV_REF
    326342      if( pcCU->getSlice()->getDepthBasedBlkPartFlag() )  //Notes from QC: please check the condition for DoNBDV. Remove this comment once it is done.
    327343      {
    … …  
    333349        m_ppcCU[uiDepth]->getDisMvpCandNBDV(&DvInfo);
    334350      }
    335 #if H_3D_IV_MERGE
     351#if NH_3D_IV_MERGE
    336352      }
    337353#endif
    … …  
    346362      }
    347363#endif
    348 
    349364      pcCU->setDvInfoSubParts(DvInfo, uiAbsPartIdx, uiDepth);
    350       m_ppcCU[uiDepth]->setPartSizeSubParts( ePartTemp, 0, uiDepth );
    351       m_ppcCU[uiDepth]->setWidth  ( 0, cWidTemp );
    352       m_ppcCU[uiDepth]->setHeight ( 0, cHeightTemp );
     365      m_ppcCU[uiDepth]->setPartSizeSubParts(ePartTemp, 0, uiDepth);
     366      m_ppcCU[uiDepth]->setWidth(0, cWidTemp);
     367      m_ppcCU[uiDepth]->setHeight(0, cHeightTemp);
    353368     }
    354369  }
    … …  
    381396    m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_0 );
    382397    m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_1 );
    383 #if H_3D_IV_MERGE
     398#if NH_3D_IV_MERGE
    384399    m_ppcCU[uiDepth]->copyDVInfoFrom(pcCU, uiAbsPartIdx);
     400    TComMvField cMvFieldNeighbours[MRG_MAX_NUM_CANDS_MEM << 1]; // double length for mv of both lists
     401    UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS_MEM];
     402#else
     403#if NH_3D_MLC
    385404    TComMvField cMvFieldNeighbours[MRG_MAX_NUM_CANDS_MEM << 1]; // double length for mv of both lists
    386405    UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS_MEM];
    … …  
    389408    UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS];
    390409#endif
     410#endif
    391411    Int numValidMergeCand = 0;
    392412    for( UInt ui = 0; ui < m_ppcCU[uiDepth]->getSlice()->getMaxNumMergeCand(); ++ui )
    … …  
    396416    m_pcEntropyDecoder->decodeMergeIndex( pcCU, 0, uiAbsPartIdx, uiDepth );
    397417    UInt uiMergeIndex = pcCU->getMergeIndex(uiAbsPartIdx);
    398 #if H_3D_ARP
     418#if NH_3D_ARP
    399419    m_pcEntropyDecoder->decodeARPW( pcCU , uiAbsPartIdx , uiDepth );
    400420#endif
    401 #if H_3D_IC
     421#if NH_3D_IC
    402422    m_pcEntropyDecoder->decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
    403423#endif
    404424
    405 #if H_3D_VSP
     425
     426#if NH_3D_VSP
    406427    Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
    407428    memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    408 #if H_3D_SPIVMP
     429#endif
     430#if NH_3D_SPIVMP
    409431    Bool bSPIVMPFlag[MRG_MAX_NUM_CANDS_MEM];
    410432    memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
    411433    TComMvField*  pcMvFieldSP;
    412434    UChar* puhInterDirSP;
    413     pcMvFieldSP = new TComMvField[pcCU->getPic()->getPicSym()->getNumPartition()*2];
    414     puhInterDirSP = new UChar[pcCU->getPic()->getPicSym()->getNumPartition()];
    415 #endif
     435    pcMvFieldSP = new TComMvField[pcCU->getPic()->getPicSym()->getNumPartitionsInCtu()*2];
     436    puhInterDirSP = new UChar[pcCU->getPic()->getPicSym()->getNumPartitionsInCtu()];
     437#endif
     438
     439#if NH_3D_MLC
    416440    m_ppcCU[uiDepth]->initAvailableFlags();
     441#endif
    417442    m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
     443#if NH_3D_MLC
    418444    m_ppcCU[uiDepth]->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours
    419 #if H_3D_SPIVMP
     445#if NH_3D_SPIVMP
    420446      , pcMvFieldSP, puhInterDirSP
    421447#endif
    422448      , numValidMergeCand, uiMergeIndex );
    423449
    424     m_ppcCU[uiDepth]->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
    425 #if H_3D_SPIVMP
     450    m_ppcCU[uiDepth]->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours
     451#if NH_3D_VSP
     452      , vspFlag
     453#endif
     454#if NH_3D_SPIVMP
    426455      , bSPIVMPFlag
    427456#endif
    428457      , numValidMergeCand );
     458#endif
     459#if NH_3D_VSP
    429460    pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
    430 #else
    431 #if H_3D
    432     m_ppcCU[uiDepth]->initAvailableFlags();
    433     m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
    434     m_ppcCU[uiDepth]->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
    435 #else
    436     m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
    437 #endif
    438 #endif
     461#endif
     462
    439463    pcCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
    440464
    … …  
    448472        pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvd( cTmpMv, SIZE_2Nx2N, uiAbsPartIdx, uiDepth );
    449473        pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvField( cMvFieldNeighbours[ 2*uiMergeIndex + uiRefListIdx ], SIZE_2Nx2N, uiAbsPartIdx, uiDepth );
    450 #if H_3D_VSP
     474#if NH_3D_VSP
    451475        if( pcCU->getVSPFlag( uiAbsPartIdx ) != 0 )
    452476        {
    … …  
    481505      }
    482506    }
    483 #if H_3D_SPIVMP
     507#if NH_3D_SPIVMP
    484508    pcCU->setSPIVMPFlagSubParts(bSPIVMPFlag[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
    485509    if (bSPIVMPFlag[uiMergeIndex])
    … …  
    506530
    507531    xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, isLastCtuOfSliceSegment );
    508 #if H_3D_IV_MERGE
     532#if NH_3D_IV_MERGE
    509533    xDecompressCU(pcCU, uiAbsPartIdx, uiDepth );
    510534#endif
    … …  
    531555#endif
    532556      xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, isLastCtuOfSliceSegment );
    533 #if H_3D_IV_MERGE
     557#if NH_3D_IV_MERGE
    534558      xDecompressCU(pcCU, uiAbsPartIdx, uiDepth );
    535559#endif
    … …  
    551575#endif
    552576  xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, isLastCtuOfSliceSegment );
    553 #if H_3D_IV_MERGE
     577#if NH_3D_IV_MERGE
    554578  xDecompressCU(pcCU, uiAbsPartIdx, uiDepth );
    555579#endif
    … …  
    574598{
    575599  TComPic* pcPic = pCtu->getPic();
    576 #if !H_3D_IV_MERGE
     600#if !NH_3D_IV_MERGE
    577601  TComSlice * pcSlice = pCtu->getSlice();
    578602  const TComSPS &sps=*(pcSlice->getSPS());
    … …  
    617641  {
    618642    case MODE_INTER:
    619 #if H_3D_DBBP
     643#if NH_3D_DBBP
    620644    if( m_ppcCU[uiDepth]->getDBBPFlag(0) )
    621645    {
    … …  
    637661      }
    638662#endif
    639 #if H_3D_DBBP
     663#if NH_3D_DBBP
    640664    }
    641665#endif
    … …  
    852876#endif
    853877
    854 #if H_3D_DBBP
     878#if NH_3D_DBBP
    855879Void TDecCu::xReconInterDBBP( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    856880{
    … …  
    858882  AOF(!pcCU->getSlice()->isIntra());
    859883  PartSize ePartSize = pcCU->getPartitionSize( 0 );
     884 
     885  Int bitDepthY = pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA);
    860886 
    861887  // get collocated depth block
    … …  
    878904 
    879905  // first, extract the two sets of motion parameters
    880   UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxCUDepth() - uiDepth ) << 1 ) ) >> 4;
     906  UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxTotalCUDepth() - uiDepth ) << 1 ) ) >> 4;
    881907  for( UInt uiSegment = 0; uiSegment < 2; uiSegment++ )
    882908  {
    … …  
    884910   
    885911    pDBBPTmpData->auhInterDir[uiSegment] = pcCU->getInterDir(uiPartAddr);
     912    assert( pDBBPTmpData->auhInterDir[uiSegment] == 1 || pDBBPTmpData->auhInterDir[uiSegment] == 2  );  // only uni-prediction allowed
    886913   
    887914    for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ )
    … …  
    891918    }
    892919   
     920#if H_3D
    893921    AOF( pcCU->getARPW(uiPartAddr) == 0 );
    894922    AOF( pcCU->getICFlag(uiPartAddr) == false );
    895923    AOF( pcCU->getSPIVMPFlag(uiPartAddr) == false );
    896924    AOF( pcCU->getVSPFlag(uiPartAddr) == 0 );
     925#endif
    897926  }
    898927 
    … …  
    934963 
    935964  // reconstruct final prediction signal by combining both segments
    936   m_pcPrediction->combineSegmentsWithMask(apSegPredYuv, m_ppcYuvReco[uiDepth], pMask, pcCU->getWidth(0), pcCU->getHeight(0), 0, ePartSize);
     965  m_pcPrediction->combineSegmentsWithMask(apSegPredYuv, m_ppcYuvReco[uiDepth], pMask, pcCU->getWidth(0), pcCU->getHeight(0), 0, ePartSize, bitDepthY);
    937966
    938967  // inter recon
    939   xDecodeInterTexture( pcCU, 0, uiDepth );
     968  xDecodeInterTexture( pcCU, uiDepth );
    940969 
    941970  // clip for only non-zero cbp case
    942   if  ( ( pcCU->getCbf( 0, TEXT_LUMA ) ) || ( pcCU->getCbf( 0, TEXT_CHROMA_U ) ) || ( pcCU->getCbf(0, TEXT_CHROMA_V ) ) )
    943   {
    944     m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ) );
     971  if  ( ( pcCU->getCbf( 0, COMPONENT_Y ) ) || ( pcCU->getCbf( 0, COMPONENT_Cb ) ) || ( pcCU->getCbf(0, COMPONENT_Cr ) ) )
     972  {
     973    m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ), pcCU->getSlice()->getSPS()->getBitDepths() );
    945974  }
    946975  else

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCu.h

    r1258 r1279  
    6262  TComDataCU**        m_ppcCU;            ///< CU data array
    6363
    64 #if H_3D_DBBP
     64#if NH_3D_DBBP
    6565  TComYuv**           m_ppcYuvRecoDBBP;
    6666#endif
    … …  
    102102  Void xReconInter              ( TComDataCU* pcCU, UInt uiDepth );
    103103
    104 #if H_3D_DBBP
     104#if NH_3D_DBBP
    105105  Void xReconInterDBBP          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    106106#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecEntropy.cpp

    r1258 r1279  
    104104}
    105105
    106 #if H_3D_ARP
     106#if NH_3D_ARP
    107107Void TDecEntropy::decodeARPW( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    108108{
    … …  
    123123#endif
    124124
    125 #if H_3D_IC
     125#if NH_3D_IC
    126126Void TDecEntropy::decodeICFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    127127{
    128128  pcCU->setICFlagSubParts( false , uiAbsPartIdx, 0, uiDepth );
    129129
     130#if NH_3D_ARP
    130131  if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() || pcCU->getARPW( uiAbsPartIdx ) > 0 )
     132#else
     133  if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() )
     134#endif
    131135  {
    132136    return;
    … …  
    234238  UInt uiNumPU = ( ePartSize == SIZE_2Nx2N ? 1 : ( ePartSize == SIZE_NxN ? 4 : 2 ) );
    235239  UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxTotalCUDepth() - uiDepth ) << 1 ) ) >> 4;
    236 #if H_3D_IV_MERGE
     240//#if H_3D_IV_MERGE
     241#if NH_3D_MLC
    237242  TComMvField cMvFieldNeighbours[MRG_MAX_NUM_CANDS_MEM << 1]; // double length for mv of both lists
    238243  UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS_MEM];
    … …  
    241246  UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS];
    242247#endif
    243 #if H_3D_SPIVMP
     248#if NH_3D_SPIVMP
    244249  Bool bSPIVMPFlag[MRG_MAX_NUM_CANDS_MEM];     
    245   TComMvField*  pcMvFieldSP = new TComMvField[pcCU->getPic()->getPicSym()->getNumPartition()*2];
    246   UChar* puhInterDirSP = new UChar[pcCU->getPic()->getPicSym()->getNumPartition()];
    247 #endif
    248 #if H_3D_IV_MERGE
     250  TComMvField*  pcMvFieldSP = new TComMvField[pcCU->getPic()->getPicSym()->getNumPartitionsInCtu()*2];
     251  UChar* puhInterDirSP = new UChar[pcCU->getPic()->getPicSym()->getNumPartitionsInCtu()];
     252#endif
     253#if NH_3D_IV_MERGE
    249254  pcSubCU->copyDVInfoFrom( pcCU, uiAbsPartIdx);
    250255#endif
    … …  
    258263  pcSubCU->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_0 );
    259264  pcSubCU->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_1 );
    260 #if H_3D
     265#if NH_3D
    261266  for ( UInt uiPartIdx = 0, uiSubPartIdx = uiAbsPartIdx; uiPartIdx < uiNumPU; uiPartIdx++, uiSubPartIdx += uiPUOffset )
    262267  {
    … …  
    290295
    291296  ////// Parse CUs extension syntax
     297#if NH_3D_DBBP
    292298  decodeDBBPFlag( pcCU, uiAbsPartIdx, uiDepth );
    293   decodeSDCFlag ( pcCU, uiAbsPartIdx, uiDepth );
    294 
    295 #if H_3D_ARP
     299#endif
     300  //decodeSDCFlag ( pcCU, uiAbsPartIdx, uiDepth );
     301
     302#if NH_3D_ARP
    296303  decodeARPW  ( pcCU, uiAbsPartIdx, uiDepth );
    297304#endif
    298 #if H_3D_IC
     305#if NH_3D_IC
    299306  decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
    300307#endif
    … …  
    306313    {
    307314      UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
    308 #if H_3D_DBBP
     315#if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
     316      if (bDebugPredEnabled)
     317      {
     318        std::cout << "Coded merge flag, CU absPartIdx: " << uiAbsPartIdx << " PU(" << uiPartIdx << ") absPartIdx: " << uiSubPartIdx;
     319        std::cout << " merge index: " << (UInt)pcCU->getMergeIndex(uiSubPartIdx) << std::endl;
     320      }
     321#endif
     322
     323#if NH_3D_DBBP
    309324      if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 && pcCU->getDBBPFlag(uiAbsPartIdx) == false )
    310325#else
    … …  
    312327#endif
    313328      {
    314         pcSubCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );
    315         if ( !isMerged )
    316         {
    317 #if H_3D_VSP
     329        if ( !hasMergedCandList )
     330        {
     331          pcSubCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth ); // temporarily set.
     332
     333#if NH_3D_MLC
     334#if NH_3D_VSP
    318335          Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
    319336          memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    320 #if H_3D_SPIVMP
     337#endif
     338#if NH_3D_SPIVMP
    321339          memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
    322340#endif
    323341          pcSubCU->initAvailableFlags();
    324           pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
     342#endif
     343          pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
     344#if NH_3D_MLC
    325345          pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours
    326 #if H_3D_SPIVMP
     346#if NH_3D_SPIVMP
    327347            , pcMvFieldSP, puhInterDirSP
    328348#endif
    329349            , numValidMergeCand );
    330           pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
    331 #if H_3D_SPIVMP
     350          pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours
     351#if NH_3D_VSP
     352            , vspFlag
     353#endif
     354#if NH_3D_SPIVMP
    332355            , bSPIVMPFlag
    333356#endif
    334357            , numValidMergeCand );
     358#if NH_3D_VSP
    335359          pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
    336 
    337 #else
    338 #if H_3D
    339           pcSubCU->initAvailableFlags();
    340           pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
    341           pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
    342 
    343 #else
    344           pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
    345 #endif
    346 #endif
    347           isMerged = true;
    348         }
    349         pcSubCU->setPartSizeSubParts( ePartSize, 0, uiDepth );
     360#endif
     361#endif
     362          pcSubCU->setPartSizeSubParts( ePartSize, 0, uiDepth ); // restore.
     363          hasMergedCandList = true;
     364        }
    350365      }
    351366      else
    352367      {
    353         uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
    354 #if H_3D_VSP
     368#if NH_3D_MLC
     369#if NH_3D_VSP
    355370        Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
    356371        memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    357 #if H_3D_SPIVMP
     372#endif
     373#if NH_3D_SPIVMP
    358374        memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
    359375#endif
    360376        pcSubCU->initAvailableFlags();
     377#endif
    361378        pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
     379#if NH_3D_MLC
    362380        pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours
    363 #if H_3D_SPIVMP
     381#if NH_3D_SPIVMP
    364382          , pcMvFieldSP, puhInterDirSP
    365383#endif
    366384          ,numValidMergeCand, uiMergeIndex );
    367         pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
    368 #if H_3D_SPIVMP
     385        pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours
     386#if NH_3D_VSP
     387          , vspFlag
     388#endif
     389#if NH_3D_SPIVMP
    369390          , bSPIVMPFlag
    370391#endif
    371392          ,numValidMergeCand );
     393#if NH_3D_VSP
    372394        pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
    373 #else
    374 #if H_3D
    375         pcSubCU->initAvailableFlags();
    376         pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
    377         pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
    378 #else
    379         pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
    380395#endif
    381396#endif
    … …  
    385400      TComMv cTmpMv( 0, 0 );
    386401      for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ )
    387       {       
     402      {
    388403        if ( pcCU->getSlice()->getNumRefIdx( RefPicList( uiRefListIdx ) ) > 0 )
    389404        {
    … …  
    392407          pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvd( cTmpMv, ePartSize, uiSubPartIdx, uiDepth, uiPartIdx );
    393408          pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvField( cMvFieldNeighbours[ 2*uiMergeIndex + uiRefListIdx ], ePartSize, uiSubPartIdx, uiDepth, uiPartIdx );
    394 #if H_3D_VSP
    395 #if H_3D_DBBP
     409#if NH_3D_VSP
     410#if NH_3D_DBBP
    396411          if( pcCU->getVSPFlag( uiSubPartIdx ) != 0 && !pcCU->getDBBPFlag( uiAbsPartIdx ) )
    397412#else
    … …  
    412427        }
    413428      }
    414 #if H_3D_SPIVMP
     429#if NH_3D_SPIVMP
    415430      pcCU->setSPIVMPFlagSubParts(bSPIVMPFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth ); 
    416431      if (bSPIVMPFlag[uiMergeIndex] != 0)
    … …  
    443458        {
    444459          decodeMvsAMVP   ( pcSubCU, uiSubPartIdx-uiAbsPartIdx, uiDepth, uiPartIdx, RefPicList( uiRefListIdx ) );
     460#if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST
     461          if (bDebugPredEnabled)
     462          {
     463            std::cout << "refListIdx: " << uiRefListIdx << std::endl;
     464            std::cout << "MVD horizontal: " << pcCU->getCUMvField(RefPicList(uiRefListIdx))->getMvd( uiAbsPartIdx ).getHor() << std::endl;
     465            std::cout << "MVD vertical:   " << pcCU->getCUMvField(RefPicList(uiRefListIdx))->getMvd( uiAbsPartIdx ).getVer() << std::endl;
     466            std::cout << "MVPIdxPU: " << pcCU->getMVPIdx(RefPicList( uiRefListIdx ), uiSubPartIdx) << std::endl;
     467            std::cout << "InterDir: " << (UInt)pcCU->getInterDir(uiSubPartIdx) << std::endl;
     468          }
     469#endif
    445470        }
    446471      }
    … …  
    474499      }
    475500#endif
     501#if NH_3D_IC
     502      decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
     503#endif
    476504
    477505      UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
    … …  
    481509        {
    482510          pcSubCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth ); // temporarily set.
     511
     512#if NH_3D_MLC
     513#if NH_3D_VSP
     514          Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
     515          memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
     516#endif
     517#if NH_3D_SPIVMP
     518          memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
     519#endif
     520          pcSubCU->initAvailableFlags();
     521#endif
    483522          pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
     523#if NH_3D_MLC
     524          pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours
     525#if NH_3D_SPIVMP
     526            , pcMvFieldSP, puhInterDirSP
     527#endif
     528            , numValidMergeCand );
     529          pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours
     530#if NH_3D_VSP
     531            , vspFlag
     532#endif
     533#if NH_3D_SPIVMP
     534            , bSPIVMPFlag
     535#endif
     536            , numValidMergeCand );
     537#if NH_3D_VSP
     538          pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
     539#endif
     540#endif
    484541          pcSubCU->setPartSizeSubParts( ePartSize, 0, uiDepth ); // restore.
    485542          hasMergedCandList = true;
    … …  
    489546      {
    490547        uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
     548
     549#if NH_3D_MLC
     550#if NH_3D_VSP
     551        Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
     552        memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
     553#endif
     554#if NH_3D_SPIVMP
     555        memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
     556#endif
     557        pcSubCU->initAvailableFlags();
     558#endif
    491559        pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
     560#if NH_3D_MLC
     561        pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours
     562#if NH_3D_SPIVMP
     563          , pcMvFieldSP, puhInterDirSP
     564#endif
     565          ,numValidMergeCand, uiMergeIndex );
     566        pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours
     567#if NH_3D_VSP
     568          , vspFlag
     569#endif
     570#if NH_3D_SPIVMP
     571          , bSPIVMPFlag
     572#endif
     573          ,numValidMergeCand );
     574#if NH_3D_VSP
     575        pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
     576#endif
     577#endif
    492578      }
    493579
    … …  
    503589          pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvd( cTmpMv, ePartSize, uiSubPartIdx, uiDepth, uiPartIdx );
    504590          pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvField( cMvFieldNeighbours[ 2*uiMergeIndex + uiRefListIdx ], ePartSize, uiSubPartIdx, uiDepth, uiPartIdx );
    505 
    506         }
    507       }
     591#if NH_3D_VSP
     592          if( pcCU->getVSPFlag( uiSubPartIdx ) != 0 )
     593          {
     594            if ( uhInterDirNeighbours[ uiMergeIndex ] & (1<<uiRefListIdx) )
     595            {
     596              UInt dummy;
     597              Int vspSize;
     598              Int width, height;
     599              pcCU->getPartIndexAndSize( uiPartIdx, dummy, width, height, uiSubPartIdx, pcCU->getTotalNumPart()==256 );
     600              pcCU->setMvFieldPUForVSP( pcCU, uiSubPartIdx, width, height, RefPicList( uiRefListIdx ), cMvFieldNeighbours[ 2*uiMergeIndex + uiRefListIdx ].getRefIdx(), vspSize );
     601              pcCU->setVSPFlag( uiSubPartIdx, vspSize );
     602            }
     603          }
     604#endif
     605        }
     606      }
     607#if NH_3D_SPIVMP
     608      pcCU->setSPIVMPFlagSubParts(bSPIVMPFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth ); 
     609      if (bSPIVMPFlag[uiMergeIndex] != 0)
     610      {
     611        Int iWidth, iHeight;
     612        UInt uiIdx;
     613        pcCU->getPartIndexAndSize( uiPartIdx, uiIdx, iWidth, iHeight, uiSubPartIdx, true );
     614
     615        UInt uiSPAddr;
     616
     617        Int iNumSPInOneLine, iNumSP, iSPWidth, iSPHeight;
     618
     619        pcCU->getSPPara(iWidth, iHeight, iNumSP, iNumSPInOneLine, iSPWidth, iSPHeight);
     620
     621        for (Int iPartitionIdx = 0; iPartitionIdx < iNumSP; iPartitionIdx++)
     622        {
     623          pcCU->getSPAbsPartIdx(uiSubPartIdx, iSPWidth, iSPHeight, iPartitionIdx, iNumSPInOneLine, uiSPAddr);
     624          pcCU->setInterDirSP(puhInterDirSP[iPartitionIdx], uiSPAddr, iSPWidth, iSPHeight);
     625          pcCU->getCUMvField( REF_PIC_LIST_0 )->setMvFieldSP(pcCU, uiSPAddr, pcMvFieldSP[2*iPartitionIdx], iSPWidth, iSPHeight);
     626          pcCU->getCUMvField( REF_PIC_LIST_1 )->setMvFieldSP(pcCU, uiSPAddr, pcMvFieldSP[2*iPartitionIdx + 1], iSPWidth, iSPHeight);
     627        }
     628      }
     629#endif
    508630    }
    509631    else
    … …  
    529651        }
    530652      }
     653#if NH_3D_IC
     654      decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
     655#endif
    531656    }
    532657
    … …  
    539664  }
    540665#endif
    541 #if H_3D_SPIVMP
     666#if NH_3D_SPIVMP
    542667  delete[] pcMvFieldSP;
    543668  delete[] puhInterDirSP;
    … …  
    607732}
    608733
    609 #if H_3D
     734#if NH_3D
    610735Void TDecEntropy::decodeMVPIdxPU( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList )
    611736{
    … …  
    10611186}
    10621187#endif
    1063 #if H_3D_DBBP
     1188#if NH_3D_DBBP
    10641189Void TDecEntropy::decodeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    10651190{

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecEntropy.h

    r1258 r1279  
    8383  virtual Void parseMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx ) = 0;
    8484  virtual Void parseMergeIndex    ( TComDataCU* pcCU, UInt& ruiMergeIndex ) = 0;
    85 #if H_3D_ARP
     85#if NH_3D_ARP
    8686  virtual Void parseARPW          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    8787#endif
    88 #if H_3D_IC
     88#if NH_3D_IC
    8989  virtual Void parseICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    9090#endif
    … …  
    9595  virtual Void parseSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    9696#endif
    97 #if H_3D_DBBP
     97#if NH_3D_DBBP
    9898  virtual Void parseDBBPFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    9999#endif
    … …  
    145145  Void decodeMvdPU        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList );
    146146  Void decodeMVPIdxPU     ( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList );
    147 #if H_3D
     147#if NH_3D
    148148  Void decodeMvsAMVP      ( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx,
    149149RefPicList eRefList );
    … …  
    174174  Void decodePartSize          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    175175
    176 #if H_3D_ARP
     176#if NH_3D_ARP
    177177  Void decodeARPW              ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    178178#endif
    179 #if H_3D_IC
     179#if NH_3D_IC
    180180  Void decodeICFlag            ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    181181#endif
    … …  
    184184  Void decodeSDCFlag           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    185185#endif
    186 #if H_3D_DBBP
     186#if NH_3D_DBBP
    187187  Void decodeDBBPFlag          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    188188#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecGop.cpp

    r1200 r1279  
    122122  }
    123123
    124 #if H_3D_NBDV
     124#if NH_3D_NBDV
    125125  if(pcSlice->getViewIndex() && !pcSlice->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.
    126126  {
    127     Int iColPoc = pcSlice->getRefPOC(RefPicList(1-pcSlice->getColFromL0Flag()), pcSlice->getColRefIdx());
    128     rpcPic->setNumDdvCandPics(rpcPic->getDisCandRefPictures(iColPoc));
     127    Int iColPoc = pcSlice->getRefPOC(RefPicList(1 - pcSlice->getColFromL0Flag()), pcSlice->getColRefIdx());
     128    pcPic->setNumDdvCandPics(pcPic->getDisCandRefPictures(iColPoc));
    129129  }
    130130
    131131  if(pcSlice->getViewIndex() && !pcSlice->getIsDepth() && !pcSlice->isIntra()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.
    132132  {
    133     rpcPic->checkTemporalIVRef();
     133    pcPic->checkTemporalIVRef();
    134134  }
    135135
    136136  if(pcSlice->getIsDepth())
    137137  {
    138     rpcPic->checkTextureRef();
     138    pcPic->checkTextureRef();
    139139  }
    140140#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecSbac.cpp

    r1258 r1279  
    7373, m_cCUMergeFlagExtSCModel                   ( 1,             1,                      NUM_MERGE_FLAG_EXT_CTX               , m_contextModels + m_numContextModels, m_numContextModels)
    7474, m_cCUMergeIdxExtSCModel                    ( 1,             1,                      NUM_MERGE_IDX_EXT_CTX                , m_contextModels + m_numContextModels, m_numContextModels)
    75 #if H_3D_ARP
     75#if NH_3D_ARP
    7676, m_cCUPUARPWSCModel          ( 1,             1,               NUM_ARPW_CTX                  , m_contextModels + m_numContextModels, m_numContextModels)
    7777#endif
    78 #if H_3D_IC
     78#if NH_3D_IC
    7979, m_cCUICFlagSCModel          ( 1,             1,               NUM_IC_FLAG_CTX               , m_contextModels + m_numContextModels, m_numContextModels)
    8080#endif
    … …  
    120120, m_cDdcFlagSCModel                          ( 1,             1,                     NUM_DDC_FLAG_CTX                      , m_contextModels + m_numContextModels, m_numContextModels)
    121121#endif
    122 #if H_3D_DBBP
     122#if NH_3D_DBBP
    123123, m_cDBBPFlagSCModel                         ( 1,             1,                     DBBP_NUM_FLAG_CTX                     , m_contextModels + m_numContextModels, m_numContextModels)
    124124#endif
    … …  
    165165  m_cCUMergeFlagExtSCModel.initBuffer             ( sliceType, qp, (UChar*)INIT_MERGE_FLAG_EXT );
    166166  m_cCUMergeIdxExtSCModel.initBuffer              ( sliceType, qp, (UChar*)INIT_MERGE_IDX_EXT );
    167 #if H_3D_ARP
     167#if NH_3D_ARP
    168168  m_cCUPUARPWSCModel.initBuffer          ( sliceType, qp, (UChar*)INIT_ARPW );
    169169#endif
    170 #if H_3D_IC
     170#if NH_3D_IC
    171171  m_cCUICFlagSCModel.initBuffer          ( sliceType, qp, (UChar*)INIT_IC_FLAG );
    172172#endif
    … …  
    211211  m_cDdcFlagSCModel.initBuffer                    ( sliceType, qp, (UChar*)INIT_DDC_FLAG );
    212212#endif
    213 #if H_3D_DBBP
     213#if NH_3D_DBBP
    214214  m_cDBBPFlagSCModel.initBuffer                   ( sliceType, qp, (UChar*)INIT_DBBP_FLAG );
    215215#endif
    … …  
    238238}
    239239
    240 #if H_3D_ARP
    241   m_cCUPUARPWSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_ARPW );
    242 #endif
    243 #if H_3D_IC
    244   m_cCUICFlagSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_IC_FLAG );
    245 #endif
    246 #if H_3D_DBBP
    247   m_cDBBPFlagSCModel.initBuffer              ( eSliceType, iQp, (UChar*)INIT_DBBP_FLAG );
    248 #endif
    249240
    250241
    … …  
    651642
    652643  UInt uiSymbol;
    653 #if H_3D_QTLPC
     644#if NH_3D_QTLPC
    654645  Bool bParseSplitFlag    = true;
    655646  Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag();
    … …  
    666657#endif
    667658  {
    668     TComDataCU *pcTextureCU = pcTexture->getCU(pcCU->getAddr());
     659    TComDataCU *pcTextureCU = pcTexture->getCtu(pcCU->getCtuRsAddr());
    669660    assert(pcTextureCU->getDepth(uiAbsPartIdx) >= uiDepth);
    670661    bParseSplitFlag         = (pcTextureCU->getDepth(uiAbsPartIdx) > uiDepth);
    … …  
    681672  DTRACE_CABAC_T( "\tSplitFlag\n" )
    682673#endif
    683 #if H_3D_QTLPC
     674#if NH_3D_QTLPC
    684675  }
    685676  else
    … …  
    713704  assert ( pcCU->getSlice()->getSPS()->getLog2DiffMaxMinCodingBlockSize() == log2DiffMaxMinCodingBlockSize);
    714705
    715 #if H_3D_QTLPC
     706#if NH_3D_QTLPC
    716707  Bool bParsePartSize    = true;
    717708
    … …  
    732723#endif
    733724  {
    734     TComDataCU *pcTextureCU = pcTexture->getCU(pcCU->getAddr());
     725    TComDataCU *pcTextureCU = pcTexture->getCtu(pcCU->getCtuRsAddr());
    735726    assert(pcTextureCU->getDepth(uiAbsPartIdx) >= uiDepth);
    736727    if(pcTextureCU->getDepth(uiAbsPartIdx) == uiDepth )
    … …  
    749740  if ( pcCU->isIntra( uiAbsPartIdx ) )
    750741  {
    751 #if H_3D_QTLPC
     742#if NH_3D_QTLPC
    752743    if(bParsePartSize)
    753744    {
    … …  
    762753    }
    763754    eMode = uiSymbol ? SIZE_2Nx2N : SIZE_NxN;
    764 #if H_3D_QTLPC
     755#if NH_3D_QTLPC
    765756    }
    766757#endif
    … …  
    780771  else
    781772  {
    782 #if H_3D_QTLPC
     773#if NH_3D_QTLPC
    783774    if(bParsePartSize)
    784775    {
    … …  
    824815      }
    825816    }
    826 #if H_3D_QTLPC
     817#if NH_3D_QTLPC
    827818      }
    828819      else if(uiTexturePart == SIZE_2NxN || uiTexturePart == SIZE_2NxnU || uiTexturePart == SIZE_2NxnD)
    829820      {
    830821        UInt uiMaxNumBits = 1;
    831         if ( pcCU->getSlice()->getSPS()->getAMPAcc( uiDepth ) )
     822        if ( ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiDepth < log2DiffMaxMinCodingBlockSize )
    832823        {
    833824          uiMaxNumBits ++;
    … …  
    835826        for ( UInt ui = 0; ui < uiMaxNumBits; ui++ )
    836827        {
    837           m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUPartSizeSCModel.get( 0, 0, ui) );
     828          m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUPartSizeSCModel.get( 0, 0, ui) RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(ctype) );
    838829          if ( uiSymbol )
    839830          {
    … …  
    843834        }
    844835        eMode = (PartSize) uiMode;
    845         if(uiMode && pcCU->getSlice()->getSPS()->getAMPAcc( uiDepth ) && uiSymbol==1 )
     836        if(uiMode && ( ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiSymbol==1 )
    846837        {
    847838          eMode = SIZE_2NxN;
    848839        }
    849         else if (uiMode && pcCU->getSlice()->getSPS()->getAMPAcc( uiDepth )==0  && uiSymbol==0)
     840        else if (uiMode && (( ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiDepth < log2DiffMaxMinCodingBlockSize )==0)  && uiSymbol==0)
    850841        {
    851842          eMode = SIZE_2NxN;
    852843        }
    853         else if (uiMode && pcCU->getSlice()->getSPS()->getAMPAcc( uiDepth ) && uiSymbol==0)
    854         {
    855           m_pcTDecBinIf->decodeBinEP(uiSymbol);
     844        else if (uiMode && ( ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiSymbol==0)
     845        {
     846          m_pcTDecBinIf->decodeBinEP(uiSymbol RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(ctype));
    856847          eMode = (uiSymbol == 0? SIZE_2NxnU : SIZE_2NxnD);
    857848        }
    … …  
    860851      {
    861852        UInt uiMaxNumBits = 1;
    862         if ( pcCU->getSlice()->getSPS()->getAMPAcc( uiDepth ) )
     853        if (  ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiDepth < log2DiffMaxMinCodingBlockSize )
    863854        {
    864855          uiMaxNumBits ++;
    … …  
    866857        for ( UInt ui = 0; ui < uiMaxNumBits; ui++ )
    867858        {
    868           m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUPartSizeSCModel.get( 0, 0, ui) );
     859          m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUPartSizeSCModel.get( 0, 0, ui) RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(ctype));
    869860          if ( uiSymbol )
    870861          {
    … …  
    874865        }
    875866        eMode = (PartSize) uiMode;
    876         if(uiMode && pcCU->getSlice()->getSPS()->getAMPAcc( uiDepth ) && uiSymbol==1 )
     867        if(uiMode && ( ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiSymbol==1 )
    877868        {
    878869          eMode = SIZE_Nx2N;
    879870        }
    880         else if (uiMode && pcCU->getSlice()->getSPS()->getAMPAcc( uiDepth )==0  && uiSymbol==0)
     871        else if (uiMode && (( ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiDepth < log2DiffMaxMinCodingBlockSize )==0)  && uiSymbol==0)
    881872        {
    882873          eMode = SIZE_Nx2N;
    883874        }
    884         else if (uiMode && pcCU->getSlice()->getSPS()->getAMPAcc( uiDepth ) && uiSymbol==0)
    885         {
    886           m_pcTDecBinIf->decodeBinEP(uiSymbol);
     875        else if (uiMode && ( ( pcCU->getSlice()->getSPS()->getUseAMP() && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiDepth < log2DiffMaxMinCodingBlockSize ) && uiSymbol==0)
     876        {
     877          m_pcTDecBinIf->decodeBinEP(uiSymbol RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(ctype));
    887878          eMode = (uiSymbol == 0? SIZE_nLx2N : SIZE_nRx2N);
    888879        }
    … …  
    896887      DTRACE_CU("part_mode", eMode )
    897888#endif
    898 #if H_3D_QTLPC
     889#if NH_3D_QTLPC
    899890    }
    900891#endif
    … …  
    22782269}
    22792270
    2280 #if H_3D_ARP
     2271#if NH_3D_ARP
    22812272Void TDecSbac::parseARPW( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    22822273{
    2283   UInt uiMaxW = pcCU->getSlice()->getARPStepNum() - 1;
    22842274  UInt uiW = 0;
    22852275  UInt uiOffset = pcCU->getCTXARPWFlag(uiAbsPartIdx);
    22862276  UInt uiCode = 0;
    22872277
    2288   assert ( uiMaxW > 0 );
    2289 
    2290   m_pcTDecBinIf->decodeBin( uiCode , m_cCUPUARPWSCModel.get( 0, 0, 0 + uiOffset ) );
     2278  m_pcTDecBinIf->decodeBin( uiCode , m_cCUPUARPWSCModel.get( 0, 0, 0 + uiOffset ) RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(STATS__CABAC_BITS__ARP_FLAG));
    22912279
    22922280  uiW = uiCode;
    22932281  if( 1 == uiW )   
    22942282  {
    2295     m_pcTDecBinIf->decodeBin( uiCode , m_cCUPUARPWSCModel.get( 0, 0, 2 ) );
     2283    m_pcTDecBinIf->decodeBin( uiCode , m_cCUPUARPWSCModel.get( 0, 0, 2 ) RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(STATS__CABAC_BITS__ARP_FLAG));
    22962284    uiW += ( 1 == uiCode ? 1 : 0 );
    22972285  }
    … …  
    23032291#endif
    23042292
    2305 #if H_3D_IC
     2293#if NH_3D_IC
    23062294/** parse illumination compensation flag
    23072295 * \param pcCU
    … …  
    23132301{
    23142302  UInt uiSymbol = 0;
    2315   m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUICFlagSCModel.get( 0, 0, 0 ) );
     2303  m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUICFlagSCModel.get( 0, 0, 0 ) RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(STATS__CABAC_BITS__3D_IC) );
     2304
    23162305#if !H_MV_ENC_DEC_TRAC
    23172306  DTRACE_CABAC_VL( g_nSymbolCounter++ );
    … …  
    25232512#endif
    25242513
    2525 #if H_3D_DBBP
     2514#if NH_3D_DBBP
    25262515Void TDecSbac::parseDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    25272516{
    … …  
    25312520  UInt uiSymbol = 0;
    25322521 
    2533   m_pcTDecBinIf->decodeBin( uiSymbol, m_cDBBPFlagSCModel.get( 0, 0, 0 ) );
     2522  m_pcTDecBinIf->decodeBin( uiSymbol, m_cDBBPFlagSCModel.get( 0, 0, 0 ) RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(STATS__CABAC_BITS__DBBP_FLAG) );
    25342523  DTRACE_CU("dbbp_flag", uiSymbol)
    25352524  PartSize ePartSize = pcCU->getPartitionSize( uiAbsPartIdx );
    25362525  AOF( ePartSize == SIZE_2NxN || ePartSize == SIZE_Nx2N );
    2537   UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxCUDepth() - uiDepth ) << 1 ) ) >> 4;
     2526  UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxTotalCUDepth() - uiDepth ) << 1 ) ) >> 4;
    25382527  pcCU->setDBBPFlagSubParts(uiSymbol, uiAbsPartIdx, 0, uiDepth);
    25392528  pcCU->setDBBPFlagSubParts(uiSymbol, uiAbsPartIdx+uiPUOffset, 1, uiDepth);

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecSbac.h

    r1258 r1279  
    122122  Void  parseSDCFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    123123#endif
    124 #if H_3D_DBBP
     124#if NH_3D_DBBP
    125125  Void parseDBBPFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    126126#endif
    … …  
    143143  Void parseMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    144144  Void parseMergeIndex    ( TComDataCU* pcCU, UInt& ruiMergeIndex );
    145 #if H_3D_ARP
     145#if NH_3D_ARP
    146146  Void parseARPW          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    147147#endif
    148 #if H_3D_IC
     148#if NH_3D_IC
    149149  Void parseICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    150150#endif
    … …  
    188188  ContextModel3DBuffer m_cCUMergeFlagExtSCModel;
    189189  ContextModel3DBuffer m_cCUMergeIdxExtSCModel;
    190 #if H_3D_ARP
     190#if NH_3D_ARP
    191191  ContextModel3DBuffer m_cCUPUARPWSCModel;
    192192#endif
    193 #if H_3D_IC
     193#if NH_3D_IC
    194194  ContextModel3DBuffer m_cCUICFlagSCModel;
    195195#endif
    … …  
    238238  ContextModel3DBuffer m_cDdcFlagSCModel;
    239239#endif
    240 #if H_3D_DBBP
     240#if NH_3D_DBBP
    241241  ContextModel3DBuffer m_cDBBPFlagSCModel;
    242242#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecSlice.cpp

    r1200 r1279  
    9090  g_bJustDoIt = g_bEncDecTraceEnable;
    9191#endif
     92#if H_MV_ENC_DEC_TRAC
     93#if ENC_DEC_TRACE
     94  incSymbolCounter();
     95#endif
     96  DTRACE_CABAC_VL( g_nSymbolCounter );
     97#else
    9298  DTRACE_CABAC_VL( g_nSymbolCounter++ );
     99#endif
    93100  DTRACE_CABAC_T( "\tPOC: " );
    94101  DTRACE_CABAC_V( pcPic->getPOC() );

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecTop.cpp

    r1251 r1279  
    292292
    293293
    294 #if H_3D_IV_MERGE
     294#if NH_3D_IV_MERGE
    295295Void
    296296CamParsCollector::copyCamParamForSlice( TComSlice* pcSlice )
    … …  
    423423{
    424424#if ENC_DEC_TRACE
     425#if H_MV_ENC_DEC_TRAC_FIX
     426  if (g_hTrace != stdout && g_hTrace != NULL)
     427#else
    425428  if (g_hTrace != stdout)
     429#endif
    426430  {
    427431    fclose( g_hTrace );
     432#if H_MV_ENC_DEC_TRAC_FIX
     433    g_hTrace = NULL;
     434#endif
    428435  }
    429436#endif
    … …  
    11421149    pcSlice->getTempRefPicLists( m_cListPic, m_refPicSetInterLayer0, m_refPicSetInterLayer1, tempRefPicLists, usedAsLongTerm, numPocTotalCurr);
    11431150    pcSlice->setRefPicList     ( tempRefPicLists, usedAsLongTerm, numPocTotalCurr, true );
    1144 #if H_3D
     1151#if NH_3D_NBDV
    11451152    pcSlice->setDefaultRefView();
    11461153#endif
    1147 #if H_3D_ARP
     1154#if NH_3D_ARP
    11481155    pcSlice->setARPStepNum(m_ivPicLists);
    1149     if( pcSlice->getARPStepNum() > 1 )
    1150     {
    1151       // GT: This seems to be broken, not all nuh_layer_ids are necessarily present
    1152       for(Int iLayerId = 0; iLayerId < nalu.m_nuhLayerId; iLayerId ++ )
    1153       {
    1154         Int  iViewIdx =   pcSlice->getVPS()->getViewIndex(iLayerId);
    1155         Bool bIsDepth = ( pcSlice->getVPS()->getDepthId  ( iLayerId ) == 1 );
    1156         if( iViewIdx<getViewIndex() && !bIsDepth )
    1157         {
    1158           pcSlice->setBaseViewRefPicList( m_ivPicLists->getPicList( iLayerId ), iViewIdx );
    1159         }
    1160       }
    1161     }
    11621156#endif
    11631157#else
    … …  
    11671161#if NH_3D
    11681162    pcSlice->checkInCompPredRefLayers();
    1169 #if H_3D_IV_MERGE
     1163#if NH_3D_IV_MERGE
    11701164#if H_3D_FCO
    11711165    //assert( !getIsDepth() );
    … …  
    12261220    //---------------
    12271221    pcSlice->setRefPOCList();
    1228 #if  H_3D_TMVP
     1222#if  NH_3D_TMVP
    12291223    if(pcSlice->getLayerId())
    12301224    {
    … …  
    12641258  }
    12651259
    1266 #if H_3D_IV_MERGE
     1260#if NH_3D_IV_MERGE
    12671261#if H_3D_FCO
    12681262  if( !pcSlice->getIsDepth() && m_pcCamParsCollector )

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecTop.h

    r1239 r1279  
    8181  Int**** getBaseViewShiftLUTI()  { return m_aiBaseViewShiftLUT;   }
    8282
    83 #if H_3D_IV_MERGE
     83#if NH_3D_IV_MERGE
    8484  Void  copyCamParamForSlice( TComSlice* pcSlice );
    8585#endif
Note: See TracChangeset for help on using the changeset viewer.