Ignore:
Timestamp:
14 Feb 2013, 23:41:41 (12 years ago)
Author:
tech
Message:

Integration of branch dev 2.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp

    r273 r280  
    33973397#endif
    33983398
    3399 #if LG_RESTRICTEDRESPRED_M24766
     3399#if LG_RESTRICTEDRESPRED_M24766 && !MTK_MDIVRP_C0138
    34003400Int TComDataCU::getResiPredMode(UInt uiPartAddr)
    34013401{
    … …  
    37533753{
    37543754#if HHI_INTER_VIEW_MOTION_PRED
     3755#if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
     3756  const Int extraMergeCand = ( ( getSlice()->getIsDepth() || getSlice()->getSPS()->getMultiviewMvPredMode() )? 1 : 0 );
     3757#else
    37553758  const Int extraMergeCand = ( getSlice()->getSPS()->getMultiviewMvPredMode() ? 1 : 0 );
     3759#endif
    37563760#endif
    37573761
    … …  
    37843788  deriveLeftRightTopIdxGeneral( cCurPS, uiAbsPartIdx, uiPUIdx, uiPartIdxLT, uiPartIdxRT );
    37853789  deriveLeftBottomIdxGeneral( cCurPS, uiAbsPartIdx, uiPUIdx, uiPartIdxLB );
     3790
     3791#if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
     3792  if( m_pcSlice->getIsDepth())
     3793  {
     3794    UInt uiPartIdxCenter;
     3795    xDeriveCenterIdx( cCurPS, uiPUIdx, uiPartIdxCenter );   
     3796    TComDataCU *pcTextureCU = m_pcSlice->getTexturePic()->getCU( getAddr() );
     3797    if ( pcTextureCU && !pcTextureCU->isIntra( uiPartIdxCenter ) )
     3798    {
     3799      abCandIsInter[iCount] = true;     
     3800      puhInterDirNeighbours[iCount] = pcTextureCU->getInterDir( uiPartIdxCenter );
     3801      if( ( puhInterDirNeighbours[iCount] & 1 ) == 1 )
     3802      {
     3803        pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_0, pcMvFieldNeighbours[iCount<<1] );
     3804        TComMv cMvPred = pcMvFieldNeighbours[iCount<<1].getMv();
     3805        const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
     3806        cMvPred+=cAdd;
     3807        cMvPred>>=2;
     3808        clipMv(cMvPred);
     3809        pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
     3810      }
     3811      if ( getSlice()->isInterB() )
     3812      {
     3813        if( ( puhInterDirNeighbours[iCount] & 2 ) == 2 )
     3814        {
     3815          pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_1, pcMvFieldNeighbours[(iCount<<1)+1] );
     3816          TComMv cMvPred = pcMvFieldNeighbours[(iCount<<1)+1].getMv();
     3817          const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
     3818          cMvPred+=cAdd;
     3819          cMvPred>>=2;
     3820          clipMv(cMvPred);
     3821          pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
     3822        }
     3823      }
     3824#if SIMP_MRG_PRUN
     3825      if ( mrgCandIdx == iCount )
     3826      {
     3827        return;
     3828      }
     3829#endif
     3830      iCount ++;
     3831    }
     3832  }
     3833#endif
    37863834
    37873835#if HHI_INTER_VIEW_MOTION_PRED
    … …  
    38093857#endif
    38103858
     3859#if MTK_MDIVRP_C0138
     3860  Bool bDVAvail = true;
     3861#endif
     3862
    38113863#if QC_MULTI_DIS_CAN_A0097
    38123864  DisInfo cDisInfo;
    … …  
    38373889    cDisInfo.m_acMvCand[0].setVer(0);
    38383890    cDisInfo.m_aVIdxCan[0] = 0;
     3891#if MTK_MDIVRP_C0138
     3892    bDVAvail = false;
     3893#endif
    38393894  }
    38403895#if QC_MRG_CANS_B0048
    38413896  Int iPdmDir[2] = {0, 0};
    38423897#endif
     3898#if QC_AMVP_MRG_UNIFY_IVCAN_C0051
     3899  getUnifiedMvPredCan(uiPUIdx, REF_PIC_LIST_0, 0, aiPdmRefIdx, acPdmMv, &cDisInfo, iPdmDir, true);
     3900  Int iPdmInterDir;
     3901#else
    38433902  Int     iPdmInterDir      = cDisInfo.iN==0? 0:getPdmMergeCandidateDisCan ( uiPUIdx, aiPdmRefIdx, acPdmMv, &cDisInfo 
    38443903#if QC_MRG_CANS_B0048
    … …  
    38463905#endif
    38473906    );
     3907#endif
    38483908#else
    38493909  Int     iPdmInterDir      = getPdmMergeCandidate( uiPUIdx, aiPdmRefIdx, acPdmMv );
     3910#endif
     3911#if MTK_MDIVRP_C0138
     3912  if (m_pcSlice->getSPS()->getMultiviewResPredMode()==1 && iPdmDir[0] && !bNoPdmMerge && cCurPS == SIZE_2Nx2N && bDVAvail)
     3913  {
     3914    setResPredAvailSubParts(true, 0, 0, uiDepth);
     3915  }
    38503916#endif
    38513917
    … …  
    46454711    UInt uiCurLCUIdx = getAddr();
    46464712    xDeriveCenterIdx( eCUMode, uiPUIdx, uiPartIdxCenter );
    4647     bExistMV = uiLCUIdx >= 0 && xGetColMVP( REF_PIC_LIST_0, uiLCUIdx, uiAbsPartAddr, cColMv, iRefIdx );
     4713    bExistMV = uiLCUIdx >= 0 && xGetColMVP( REF_PIC_LIST_0, uiLCUIdx, uiAbsPartAddr, cColMv, iRefIdx
     4714#if QC_TMVP_MRG_REFIDX_C0047
     4715    , 1
     4716#endif
     4717    );
    46484718    if( bExistMV == false )
    46494719    {
    4650       bExistMV = xGetColMVP( REF_PIC_LIST_0, uiCurLCUIdx, uiPartIdxCenter,  cColMv, iRefIdx );
     4720      bExistMV = xGetColMVP( REF_PIC_LIST_0, uiCurLCUIdx, uiPartIdxCenter,  cColMv, iRefIdx
     4721#if QC_TMVP_MRG_REFIDX_C0047
     4722    , 1
     4723#endif
     4724    );
    46514725    }
    46524726    if( bExistMV )
    … …  
    46634737        iRefIdx = 0;
    46644738#endif
    4665         bExistMV = uiLCUIdx >= 0 && xGetColMVP( REF_PIC_LIST_1, uiLCUIdx, uiAbsPartAddr, cColMv, iRefIdx);
     4739        bExistMV = uiLCUIdx >= 0 && xGetColMVP( REF_PIC_LIST_1, uiLCUIdx, uiAbsPartAddr, cColMv, iRefIdx
     4740#if QC_TMVP_MRG_REFIDX_C0047
     4741        , 1
     4742#endif
     4743        );
    46664744        if( bExistMV == false )
    46674745        {
    4668           bExistMV = xGetColMVP( REF_PIC_LIST_1, uiCurLCUIdx, uiPartIdxCenter,  cColMv, iRefIdx );
     4746          bExistMV = xGetColMVP( REF_PIC_LIST_1, uiCurLCUIdx, uiPartIdxCenter,  cColMv, iRefIdx
     4747#if QC_TMVP_MRG_REFIDX_C0047
     4748        , 1
     4749#endif 
     4750        );
    46694751        }
    46704752        if( bExistMV )
    … …  
    68956977        cDisInfo.m_aVIdxCan[0] = 0;
    68966978      }
     6979#if QC_AMVP_MRG_UNIFY_IVCAN_C0051
     6980      Int paiPdmRefIdx[4] = {-1, -1, -1, -1};
     6981      Int iPdmDir[4] = {-1, -1, -1, -1};
     6982#if QC_C0051_FIXED_BY_MTK
     6983      TComMv cPdmMvPred[4];
     6984#else
     6985      TComMv cPdmMvPred[2];
     6986#endif
     6987      cPdmMvPred[0].m_bDvMcp = cPdmMvPred[1].m_bDvMcp = false;
     6988      if(getUnifiedMvPredCan(uiPartIdx, eRefPicList, iRefIdx, paiPdmRefIdx, cPdmMvPred, &cDisInfo, iPdmDir, false))
     6989#else
    68976990      TComMv  cPdmMvPred;
    68986991#if QC_MULTI_DIS_CAN_A0097
    … …  
    69016994      if( getPdmMvPred( uiPartIdx, eRefPicList, iRefIdx, cPdmMvPred ) )
    69026995#endif
     6996#endif
     6997#if QC_AMVP_MRG_UNIFY_IVCAN_C0051
     6998      {
     6999        clipMv( cPdmMvPred[0] );
     7000        pInfo->m_acMvCand[0] = cPdmMvPred[0];
     7001      }
     7002      else
     7003      {
     7004        pInfo->m_acMvCand[0].set(0,0);
     7005      }
     7006#else
    69037007      {
    69047008        clipMv( cPdmMvPred );
    … …  
    69097013        pInfo->m_acMvCand[0].set(0,0);
    69107014      }
     7015#endif
    69117016    }
    69127017  }
    … …  
    75757680  Int iNeibPOC = iCurrPOC;
    75767681  Int iNeibRefPOC;
    7577 
     7682#if INTER_VIEW_VECTOR_SCALING_C0116
     7683  Int iCurrViewId = m_pcSlice->getViewOrderIdx(); // will be changed to view_id
     7684  Int iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, iRefIdx)->getViewOrderIdx(); // will be changed to view_id
     7685  Int iNeibViewId = iCurrViewId;
     7686  Int iNeibRefViewId;
     7687#endif
    75787688#if QC_IV_AS_LT_B0046
    75797689  Bool bIsCurrRefLongTerm = m_pcSlice->getRefPic( eRefPicList, iRefIdx)->getIsLongTerm();
    … …  
    75837693  {
    75847694    iNeibRefPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) );
     7695#if INTER_VIEW_VECTOR_SCALING_C0116
     7696    iNeibRefViewId = pcTmpCU->getSlice()->getRefPic(eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx))->getViewOrderIdx(); // will be changed to view_id
     7697#endif
    75857698#if QC_IV_AS_LT_B0046
    75867699    bIsNeibRefLongTerm = m_pcSlice->getRefPic( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx))->getIsLongTerm() ;
     7700#if INTER_VIEW_VECTOR_SCALING_C0116
     7701    if ( (bIsCurrRefLongTerm == bIsNeibRefLongTerm) && ((iNeibRefPOC == iCurrRefPOC) && (iNeibRefViewId == iCurrRefViewId)))
     7702#else
    75877703    if ( (bIsCurrRefLongTerm == bIsNeibRefLongTerm) && (iNeibRefPOC == iCurrRefPOC) )
     7704#endif
    75887705#else
    75897706    if( pcTmpCU->getSlice()->getRefViewId( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) ) != m_pcSlice->getRefViewId( eRefPicList, iRefIdx ) )
    … …  
    76067723  {
    76077724    iNeibRefPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) );
     7725#if INTER_VIEW_VECTOR_SCALING_C0116
     7726    iNeibRefViewId = pcTmpCU->getSlice()->getRefPic(eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx))->getViewOrderIdx(); // will be changed to view_id
     7727#endif
    76087728    TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
    76097729    TComMv rcMv;
    … …  
    76187738    }
    76197739#endif
     7740#if INTER_VIEW_VECTOR_SCALING_C0116
     7741    Int iScale = 4096;
     7742    if((iCurrRefPOC != iNeibRefPOC)  )    // inter & inter
     7743        iScale = xGetDistScaleFactor( iCurrPOC, iCurrRefPOC, iNeibPOC, iNeibRefPOC );
     7744    else if(m_pcSlice->getIVScalingFlag())    // inter-view & inter-view
     7745        iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iNeibViewId, iNeibRefViewId );
     7746#else
    76207747    Int iScale = xGetDistScaleFactor( iCurrPOC, iCurrRefPOC, iNeibPOC, iNeibRefPOC );
     7748#endif
    76217749    if ( iScale == 4096 )
    76227750    {
    … …  
    76407768  {
    76417769    iNeibRefPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) );
     7770#if INTER_VIEW_VECTOR_SCALING_C0116
     7771    iNeibRefViewId = pcTmpCU->getSlice()->getRefPic(eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx))->getViewOrderIdx(); // will be changed to view_id
     7772#endif
    76427773    TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList2nd)->getMv(uiIdx);
    76437774    TComMv rcMv;
    … …  
    76527783    }
    76537784#endif
     7785#if INTER_VIEW_VECTOR_SCALING_C0116
     7786    Int iScale = 4096;
     7787    if((iCurrRefPOC != iNeibRefPOC))    // inter & inter
     7788        iScale = xGetDistScaleFactor( iCurrPOC, iCurrRefPOC, iNeibPOC, iNeibRefPOC );
     7789    else if(m_pcSlice->getIVScalingFlag())    // inter-view & inter-view
     7790        iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iNeibViewId, iNeibRefViewId );
     7791#else
    76547792    Int iScale = xGetDistScaleFactor( iCurrPOC, iCurrRefPOC, iNeibPOC, iNeibRefPOC );
     7793#endif
    76557794    if ( iScale == 4096 )
    76567795    {
    … …  
    77827921 * \returns Bool
    77837922 */
    7784 Bool TComDataCU::xGetColMVP( RefPicList eRefPicList, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv, Int& riRefIdx )
     7923Bool TComDataCU::xGetColMVP( RefPicList eRefPicList, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv, Int& riRefIdx
     7924#if QC_TMVP_MRG_REFIDX_C0047
     7925  ,
     7926  Bool bMRG
     7927#endif
     7928)
    77857929{
    77867930  UInt uiAbsPartAddr = uiPartUnitIdx;
    … …  
    77887932  RefPicList  eColRefPicList;
    77897933  Int iColPOC, iColRefPOC, iCurrPOC, iCurrRefPOC, iScale;
    7790 #if SONY_COLPIC_AVAILABILITY
    7791 #if QC_IV_AS_LT_B0046
    7792   Int iColViewOrderIdx, iCurrViewOrderIdx, iCurrRefViewOrderIdx;
    7793 #else
    7794   Int iColViewOrderIdx, iColRefViewOrderIdx, iCurrViewOrderIdx, iCurrRefViewOrderIdx;
    7795 #endif
    7796 #endif
    77977934  TComMv cColMv;
    7798 
    7799 #if SONY_COLPIC_AVAILABILITY
    7800   iCurrViewOrderIdx    = m_pcSlice->getViewOrderIdx();
    7801   iCurrRefViewOrderIdx = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewOrderIdx();
    7802 #endif
     7935#if INTER_VIEW_VECTOR_SCALING_C0115
     7936  Int iColViewId, iColRefViewId, iCurrViewId, iCurrRefViewId;
     7937#endif
     7938
    78037939  // use coldir.
    78047940#if COLLOCATED_REF_IDX
    … …  
    78157951  iCurrRefPOC = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getPOC();
    78167952  iColPOC = pColCU->getSlice()->getPOC(); 
    7817 #if SONY_COLPIC_AVAILABILITY
    7818   iColViewOrderIdx = pColCU->getSlice()->getViewOrderIdx();
     7953#if INTER_VIEW_VECTOR_SCALING_C0115
     7954  iCurrViewId = m_pcSlice->getViewOrderIdx(); // will be changed to view_id   
     7955  iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewOrderIdx(); // will be changed to view_id
     7956  iColViewId = pColCU->getSlice()->getViewOrderIdx(); // will be changed to view_id
    78197957#endif
    78207958
    … …  
    78247962  }
    78257963
    7826 #if !SONY_COLPIC_AVAILABILITY&!QC_IV_AS_LT_B0046
     7964#if !INTER_VIEW_VECTOR_SCALING_C0115&!QC_IV_AS_LT_B0046
    78277965  if( m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewId() != m_pcSlice->getViewId() )
    78287966    return false;
    … …  
    78517989  // Scale the vector.
    78527990  iColRefPOC = pColCU->getSlice()->getRefPOC(eColRefPicList, iColRefIdx);
    7853 
     7991#if INTER_VIEW_VECTOR_SCALING_C0115
     7992  iColRefViewId = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewOrderIdx(); // will be changed to view_id
     7993#endif
    78547994#if !QC_IV_AS_LT_B0046
    7855 #if SONY_COLPIC_AVAILABILITY
    7856   iColRefViewOrderIdx = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewOrderIdx();
    7857 #else
    78587995  if( pColCU->getSlice()->getRefViewId( eColRefPicList, iColRefIdx ) != pColCU->getSlice()->getViewId() )
    78597996  {
    78607997    return false;
    78617998  }
    7862 #endif
    78637999#else
    78648000  Bool bIsCurrRefLongTerm = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getIsLongTerm();
    … …  
    78668002  if(bIsCurrRefLongTerm != bIsColRefLongTerm)
    78678003  {
     8004#if QC_TMVP_MRG_REFIDX_C0047
     8005    cColMv = pColCU->getCUMvField(eColRefPicList)->getMv(uiAbsPartAddr);
     8006    iCurrRefPOC = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getPOC();
     8007    if(bMRG )
     8008    {
     8009      Int iUpdRefIdx  = m_pcSlice->getNewRefIdx(eRefPicList);
     8010      if(iUpdRefIdx > 0 )
     8011      {
     8012        riRefIdx = iUpdRefIdx;
     8013        bIsCurrRefLongTerm = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getIsLongTerm();
     8014        iCurrRefPOC = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getPOC();
     8015#if INTER_VIEW_VECTOR_SCALING_C0115
     8016        iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewOrderIdx(); // will be changed to view_id
     8017#endif
     8018      }
     8019      else
     8020        return false;
     8021    }else
     8022    {
     8023#endif
    78688024    assert( ((iColPOC == iColRefPOC)&&(iCurrPOC != iCurrRefPOC))||((iColPOC != iColRefPOC)&&(iCurrPOC == iCurrRefPOC)));
    78698025    return false;
     8026#if QC_TMVP_MRG_REFIDX_C0047
     8027    }
     8028#endif
    78708029  }
    78718030#endif
    … …  
    78888047      }
    78898048    }else
    7890 #if QC_MVHEVC_B0046
    7891       rcMv = cColMv; //inter-view
    7892 #else
    7893     {
    7894 #if SONY_COLPIC_AVAILABILITY
    7895       Int iColRefViewOrderIdx = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewOrderIdx();
    7896       iScale = xGetDistScaleFactor(iCurrViewOrderIdx, iCurrRefViewOrderIdx, iColViewOrderIdx, iColRefViewOrderIdx);
     8049#if INTER_VIEW_VECTOR_SCALING_C0115
     8050    {
     8051        if((iCurrPOC == iCurrRefPOC) && m_pcSlice->getIVScalingFlag())    // inter-view & inter-view
     8052            iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
     8053        else
     8054            iScale = 4096;            // inter & inter
    78978055      if ( iScale == 4096 )
    78988056      {
    … …  
    79038061        rcMv = cColMv.scaleMv( iScale );
    79048062      }
    7905 #else
    7906       return false;
    7907 #endif
    7908     }
    7909 #endif
    7910   }
    7911 #else
    7912 #if SONY_COLPIC_AVAILABILITY
    7913   iScale = 0;
    7914   iCurrRefViewOrderIdx = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewOrderIdx();
    7915   if((iColPOC != iColRefPOC)&&(iCurrPOC != iCurrRefPOC))
    7916     iScale = xGetDistScaleFactor(iCurrPOC, iCurrRefPOC, iColPOC, iColRefPOC);
    7917   else if((iColPOC == iColRefPOC)&&(iCurrPOC == iCurrRefPOC))
    7918     iScale = xGetDistScaleFactor(iCurrViewOrderIdx, iCurrRefViewOrderIdx, iColViewOrderIdx, iColRefViewOrderIdx);
    7919   else
    7920     return false;
    7921 
    7922 #else
    7923   iScale = xGetDistScaleFactor(iCurrPOC, iCurrRefPOC, iColPOC, iColRefPOC);
    7924 #endif
    7925   if ( iScale == 4096 )
    7926   {
    7927     rcMv = cColMv;
    7928   }
    7929   else
    7930   {
    7931     rcMv = cColMv.scaleMv( iScale );
    7932   }
    7933 #endif
     8063  }
     8064#else
     8065    rcMv = cColMv; //inter-view
     8066#endif
     8067  }
     8068#endif
     8069
    79348070  return true;
    79358071}
    … …  
    89069042}
    89079043#else
     9044#if QC_AMVP_MRG_UNIFY_IVCAN_C0051
     9045Bool
     9046TComDataCU::getUnifiedMvPredCan(UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo, Int* iPdm, Bool bMerge )
     9047{
     9048  TComDepthMapGenerator* pcDepthMapGenerator = m_pcSlice->getSPS()->getDepthMapGenerator();
     9049  ROFRS( pcDepthMapGenerator, false );
     9050  if (pDInfo->iN > 0 && pcDepthMapGenerator->getPdmCandidate(this, uiPartIdx, eRefPicList, iRefIdx, paiPdmRefIdx, pacPdmMv, pDInfo, iPdm, bMerge))
     9051    return true;
     9052  return false;
     9053}
     9054#else
    89089055Int
    89099056TComDataCU::getPdmMergeCandidateDisCan( UInt uiPartIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo
    … …  
    89319078}
    89329079#endif
    8933 
     9080#endif
    89349081
    89359082Bool     
Note: See TracChangeset for help on using the changeset viewer.