Changeset 295 in 3DVCSoftware for branches/HTM-5.1-dev0/source


Ignore:
Timestamp:
19 Feb 2013, 21:39:51 (11 years ago)
Author:
tech
Message:

Removed macros related to DMMs, IVRP and VSP/Texture Merge candidate.

Location:
branches/HTM-5.1-dev0/source
Files:
47 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev0/source/App/TAppDecoder/TAppDecTop.cpp

    r294 r295  
    295295      if( ( viewDepthId == 0 && (viewDepthId != previousViewDepthId) ) || m_tDecTop.size() == 1 )
    296296      {
    297 #if HHI_INTER_VIEW_RESIDUAL_PRED
     297#if H3D_IVRP
    298298        for( Int i = 0; i < m_tDecTop.size(); i++ )
    299299        {
  • branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

    r294 r295  
    382382  ("MultiviewMvRegLambdaScale", m_dMultiviewMvRegLambdaScale, (Double)0, "lambda scale for multiview motion vector regularization" )
    383383#endif
    384 #if HHI_INTER_VIEW_RESIDUAL_PRED
     384#if H3D_IVRP
    385385  ("MultiviewResPred", m_uiMultiviewResPredMode,   (UInt)0, "usage of inter-view residual prediction" )
    386386#endif
     
    916916  }
    917917#endif
    918 #if HHI_INTER_VIEW_RESIDUAL_PRED
     918#if H3D_IVRP
    919919  xConfirmPara    ( m_uiMultiviewResPredMode > 1,                                     "MultiviewResPred must be less than or equal to 1" );
    920920  xConfirmPara    ( m_uiMultiviewResPredMode > 0 && m_uiPredDepthMapGeneration == 0 , "MultiviewResPred > 0 requires PredDepthMapGen > 0" );
  • branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

    r294 r295  
    217217  Double    m_dMultiviewMvRegLambdaScale;                     ///< lambda scale for multiview motion vectors regularization
    218218#endif
    219 #if HHI_INTER_VIEW_RESIDUAL_PRED
     219#if H3D_IVRP
    220220  UInt      m_uiMultiviewResPredMode;          ///< using multiview residual prediction
    221221#endif
  • branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

    r294 r295  
    222222    m_acTEncTopList[iViewIdx]->setMultiviewMvRegLambdaScale    ( iViewIdx ? m_dMultiviewMvRegLambdaScale : 0.0 );
    223223#endif
    224 #if HHI_INTER_VIEW_RESIDUAL_PRED
     224#if H3D_IVRP
    225225    m_acTEncTopList[iViewIdx]->setMultiviewResPredMode         ( m_uiMultiviewResPredMode );
    226226#endif
     
    553553      m_acTEncDepthTopList[iViewIdx]->setMultiviewMvRegLambdaScale    ( 0.0 );
    554554#endif
    555 #if HHI_INTER_VIEW_RESIDUAL_PRED
     555#if H3D_IVRP
    556556      m_acTEncDepthTopList[iViewIdx]->setMultiviewResPredMode         ( 0 );
    557557#endif
     
    10791079#endif
    10801080
    1081 #if HHI_INTERVIEW_SKIP || H3D_IVMP || HHI_INTER_VIEW_RESIDUAL_PRED
     1081#if HHI_INTERVIEW_SKIP || H3D_IVMP || H3D_IVRP
    10821082      for( Int iViewIdx = 0; iViewIdx < m_iNumberOfViews; iViewIdx++ )
    10831083      {
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/CommonDef.h

    r294 r295  
    128128#define MAX_VIEW_NUM                10
    129129
    130 #if ( H3D_IVMP || HHI_INTER_VIEW_RESIDUAL_PRED )
     130#if ( H3D_IVMP || H3D_IVRP )
    131131#define DEPTH_MAP_GENERATION        1
    132132#define PDM_REMOVE_DEPENDENCE       1      //bug-fix for DMDV JCT2-A0095
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/ContextTables.h

    r294 r295  
    5959#define NUM_MERGE_IDX_EXT_CTX         1       ///< number of context models for merge index of merge extended
    6060
    61 #if HHI_INTER_VIEW_RESIDUAL_PRED
     61#if H3D_IVRP
    6262#define NUM_RES_PRED_FLAG_CTX         4       ///< number of context for residual prediction flag
    6363#endif
     
    191191};
    192192
    193 #if HHI_INTER_VIEW_RESIDUAL_PRED
     193#if H3D_IVRP
    194194static const UChar
    195195INIT_RES_PRED_FLAG[3][NUM_RES_PRED_FLAG_CTX] =
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp

    r294 r295  
    214214  m_piContourPredTexDeltaDC2 = NULL;
    215215#endif
    216 #if HHI_INTER_VIEW_RESIDUAL_PRED
     216#if H3D_IVRP
    217217  m_pbResPredAvailable = NULL;
    218218  m_pbResPredFlag      = NULL;
     
    285285    m_piVSPIndex         = (Char*  )xMalloc(Char,   uiNumPartition);
    286286#endif
    287 #if HHI_INTER_VIEW_RESIDUAL_PRED
     287#if H3D_IVRP
    288288    m_pbResPredAvailable = (Bool*  )xMalloc(Bool,   uiNumPartition);
    289289    m_pbResPredFlag      = (Bool*  )xMalloc(Bool,   uiNumPartition);
     
    443443#endif
    444444    if ( m_puhMergeIndex      ) { xFree(m_puhMergeIndex);       m_puhMergeIndex     = NULL; }
    445 #if HHI_INTER_VIEW_RESIDUAL_PRED
     445#if H3D_IVRP
    446446    if ( m_pbResPredAvailable ) { xFree(m_pbResPredAvailable);  m_pbResPredAvailable= NULL; }
    447447    if ( m_pbResPredFlag      ) { xFree(m_pbResPredFlag);       m_pbResPredFlag     = NULL; }
     
    713713    memset (m_pbRenderable             + firstElement, false, sizeof( Bool ) * numElements) ;
    714714#endif
    715 #if HHI_INTER_VIEW_RESIDUAL_PRED
     715#if H3D_IVRP
    716716    memset( m_pbResPredAvailable       + firstElement, 0    , sizeof( Bool ) * numElements );
    717717    memset( m_pbResPredFlag            + firstElement, 0    , sizeof( Bool ) * numElements );
     
    855855      m_piVSPIndex[ui] = 0;
    856856#endif
    857 #if HHI_INTER_VIEW_RESIDUAL_PRED
     857#if H3D_IVRP
    858858      m_pbResPredAvailable[ui] = 0;
    859859      m_pbResPredFlag[ui]      = 0;
     
    966966  memset( m_piVSPIndex,         0, iSizeInChar );
    967967#endif
    968 #if HHI_INTER_VIEW_RESIDUAL_PRED
     968#if H3D_IVRP
    969969  memset( m_pbResPredAvailable, 0, iSizeInBool  );
    970970  memset( m_pbResPredFlag,      0, iSizeInBool  );
     
    10801080      m_piContourPredTexDeltaDC2[ui]=pcCU->getContourPredTexDeltaDC2(uiPartOffset+ui);
    10811081#endif   
    1082 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1082#if H3D_IVRP
    10831083      m_pbResPredAvailable[ui] = pcCU->m_pbResPredAvailable[ uiPartOffset + ui ];
    10841084      m_pbResPredFlag     [ui] = pcCU->m_pbResPredFlag     [ uiPartOffset + ui ];
     
    12021202  m_piVSPIndex          = pcCU->getVSPIndex()         + uiPart;
    12031203#endif
    1204 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1204#if H3D_IVRP
    12051205  m_pbResPredAvailable  = pcCU->getResPredAvail()     + uiPart;
    12061206  m_pbResPredFlag       = pcCU->getResPredFlag ()     + uiPart;
     
    13481348  m_piVSPIndex         = pcCU->getVSPIndex()              + uiAbsPartIdx;
    13491349#endif
    1350 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1350#if H3D_IVRP
    13511351  m_pbResPredAvailable = pcCU->getResPredAvail()          + uiAbsPartIdx;
    13521352  m_pbResPredFlag      = pcCU->getResPredFlag ()          + uiAbsPartIdx;
     
    13991399  memcpy( m_piVSPIndex          + uiOffset, pcCU->getVSPIndex(),          iSizeInChar );
    14001400#endif
    1401 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1401#if H3D_IVRP
    14021402  memcpy( m_pbResPredAvailable  + uiOffset, pcCU->getResPredAvail(),      iSizeInBool  );
    14031403  memcpy( m_pbResPredFlag       + uiOffset, pcCU->getResPredFlag(),       iSizeInBool  );
     
    15381538  memcpy( rpcCU->getVSPIndex()          + m_uiAbsIdxInLCU, m_piVSPIndex,         iSizeInChar );
    15391539#endif
    1540 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1540#if H3D_IVRP
    15411541  memcpy( rpcCU->getResPredAvail()      + m_uiAbsIdxInLCU, m_pbResPredAvailable,  iSizeInBool  );
    15421542  memcpy( rpcCU->getResPredFlag()       + m_uiAbsIdxInLCU, m_pbResPredFlag,       iSizeInBool  );
     
    16691669  memcpy( rpcCU->getVSPIndex()          + uiPartOffset, m_piVSPIndex,         iSizeInChar );
    16701670#endif
    1671 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1671#if H3D_IVRP
    16721672  memcpy( rpcCU->getResPredAvail()      + uiPartOffset, m_pbResPredAvailable,  iSizeInBool  );
    16731673  memcpy( rpcCU->getResPredFlag()       + uiPartOffset, m_pbResPredFlag,       iSizeInBool  );
     
    26232623
    26242624
    2625 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2625#if H3D_IVRP
    26262626UInt
    26272627TComDataCU::getCtxResPredFlag( UInt uiAbsPartIdx )
     
    29492949#endif
    29502950
    2951 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2951#if H3D_IVRP
    29522952Void TComDataCU::setResPredAvailSubParts( Bool bResPredAvailable, UInt uiAbsPartIdx, UInt uiPartIdx, UInt uiDepth )
    29532953{
     
    36283628  deriveLeftRightTopIdxGeneral( cCurPS, uiAbsPartIdx, uiPUIdx, uiPartIdxLT, uiPartIdxRT );
    36293629  deriveLeftBottomIdxGeneral( cCurPS, uiAbsPartIdx, uiPUIdx, uiPartIdxLB );
    3630 #if !FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
     3630
     3631#if H3D_IVMP
     3632  Bool bNoPdmMerge   = ( m_pcSlice->getSPS()->getViewId() == 0 || ( m_pcSlice->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) != PDM_USE_FOR_MERGE );
     3633
     3634  //===== add merge with predicted depth maps =====
     3635  TComMv  acPdmMv       [4];
     3636  Int     aiPdmRefIdx   [4] = {-1, -1, -1, -1};
     3637  Bool    bLeftAvai         = false;
     3638  Int     iPosLeftAbove[2]  = {-1, -1};
     3639
     3640#if H3D_NBDV
     3641  acPdmMv[0].m_bDvMcp = acPdmMv[1].m_bDvMcp = acPdmMv[2].m_bDvMcp = acPdmMv[3].m_bDvMcp = false;
     3642#endif //H3D_NBDV
     3643
     3644#if MTK_MDIVRP_C0138
     3645  Bool bDVAvail = true;
     3646#endif
     3647
     3648#if H3D_NBDV
     3649  DisInfo cDisInfo;
     3650  cDisInfo.iN = 0;
     3651  if(!bNoPdmMerge)
     3652  {
     3653    getDisMvpCandNBDV(uiPUIdx, uiAbsPartIdx, &cDisInfo , true
     3654#if MERL_VSP_C0152
     3655            , true
     3656#endif
     3657);
     3658  }
     3659  if(cDisInfo.iN==0)
     3660  {
     3661    cDisInfo.iN = 1;
     3662    cDisInfo.m_acMvCand[0].setHor(0);
     3663    cDisInfo.m_acMvCand[0].setVer(0);
     3664    cDisInfo.m_aVIdxCan[0] = 0;
     3665#if MTK_MDIVRP_C0138
     3666    bDVAvail = false;
     3667#endif
     3668  }
     3669
    36313670#if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
    36323671  if( m_pcSlice->getIsDepth())
     
    36623701        }
    36633702      }
    3664 #if FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
     3703#if MERL_VSP_C0152
    36653704      xInheritVspMode( pcTextureCU, uiPartIdxCenter, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
    36663705#endif
     
    36733712  }
    36743713#endif
    3675 #endif
    3676 
    3677 #if H3D_IVMP
    3678   Bool bNoPdmMerge   = ( m_pcSlice->getSPS()->getViewId() == 0 || ( m_pcSlice->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) != PDM_USE_FOR_MERGE );
    3679 
    3680   //===== add merge with predicted depth maps =====
    3681   TComMv  acPdmMv       [4];
    3682   Int     aiPdmRefIdx   [4] = {-1, -1, -1, -1};
    3683   Bool    bLeftAvai         = false;
    3684   Int     iPosLeftAbove[2]  = {-1, -1};
    3685 
    3686 #if H3D_NBDV
    3687   acPdmMv[0].m_bDvMcp = acPdmMv[1].m_bDvMcp = acPdmMv[2].m_bDvMcp = acPdmMv[3].m_bDvMcp = false;
    3688 #endif //H3D_NBDV
    3689 
    3690 #if MTK_MDIVRP_C0138
    3691   Bool bDVAvail = true;
    3692 #endif
    3693 
    3694 #if H3D_NBDV
    3695   DisInfo cDisInfo;
    3696   cDisInfo.iN = 0;
    3697   if(!bNoPdmMerge)
    3698   {
    3699     getDisMvpCandNBDV(uiPUIdx, uiAbsPartIdx, &cDisInfo , true
    3700 #if MERL_VSP_C0152
    3701             , true
    3702 #endif
    3703 );
    3704   }
    3705   if(cDisInfo.iN==0)
    3706   {
    3707     cDisInfo.iN = 1;
    3708     cDisInfo.m_acMvCand[0].setHor(0);
    3709     cDisInfo.m_acMvCand[0].setVer(0);
    3710     cDisInfo.m_aVIdxCan[0] = 0;
    3711 #if MTK_MDIVRP_C0138
    3712     bDVAvail = false;
    3713 #endif
    3714   }
    3715 #if FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
    3716 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
    3717   if( m_pcSlice->getIsDepth())
    3718   {
    3719     UInt uiPartIdxCenter;
    3720     xDeriveCenterIdx( cCurPS, uiPUIdx, uiPartIdxCenter );   
    3721     TComDataCU *pcTextureCU = m_pcSlice->getTexturePic()->getCU( getAddr() );
    3722     if ( pcTextureCU && !pcTextureCU->isIntra( uiPartIdxCenter ) )
    3723     {
    3724       abCandIsInter[iCount] = true;     
    3725       puhInterDirNeighbours[iCount] = pcTextureCU->getInterDir( uiPartIdxCenter );
    3726       if( ( puhInterDirNeighbours[iCount] & 1 ) == 1 )
    3727       {
    3728         pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_0, pcMvFieldNeighbours[iCount<<1] );
    3729         TComMv cMvPred = pcMvFieldNeighbours[iCount<<1].getMv();
    3730         const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
    3731         cMvPred+=cAdd;
    3732         cMvPred>>=2;
    3733         clipMv(cMvPred);
    3734         pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
    3735       }
    3736       if ( getSlice()->isInterB() )
    3737       {
    3738         if( ( puhInterDirNeighbours[iCount] & 2 ) == 2 )
    3739         {
    3740           pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_1, pcMvFieldNeighbours[(iCount<<1)+1] );
    3741           TComMv cMvPred = pcMvFieldNeighbours[(iCount<<1)+1].getMv();
    3742           const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
    3743           cMvPred+=cAdd;
    3744           cMvPred>>=2;
    3745           clipMv(cMvPred);
    3746           pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
    3747         }
    3748       }
    3749 #if FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
    3750       xInheritVspMode( pcTextureCU, uiPartIdxCenter, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
    3751 #endif
    3752       if ( mrgCandIdx == iCount )
    3753       {
    3754         return;
    3755       }
    3756       iCount ++;
    3757     }
    3758   }
    3759 #endif
    3760 #endif
     3714
    37613715  Int iPdmDir[2] = {0, 0};
    37623716#if QC_AMVP_MRG_UNIFY_IVCAN_C0051
     
    39963950#endif
    39973951#if H3D_IVMP
    3998     Bool bRemoveSpa = false; //prunign to inter-view candidates
     3952    Bool bRemoveSpa = false; //pruning to inter-view candidates
    39993953    Int  iCnloop    = bLeftAvai? (iCount-2): (iCount-1);
    40003954    for(; iCnloop >= 0; iCnloop --)
     
    79567910#endif
    79577911
    7958 #if HHI_INTER_VIEW_RESIDUAL_PRED
     7912#if H3D_IVRP
    79597913Bool
    79607914TComDataCU::getResidualSamples( UInt uiPartIdx, Bool bRecon, TComYuv* pcYuv )
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComDataCU.h

    r294 r295  
    4949#include "TComPattern.h"
    5050
    51 #if HHI_INTER_VIEW_RESIDUAL_PRED
     51#if H3D_IVRP
    5252#include "TComYuv.h"
    5353#endif
     
    210210  Int           m_numSucIPCM;         ///< the number of succesive IPCM blocks associated with the current log2CUSize
    211211  Bool          m_lastCUSucIPCMFlag;  ///< True indicates that the last CU is IPCM and shares the same root as the current CU. 
    212 #if HHI_INTER_VIEW_RESIDUAL_PRED
     212#if H3D_IVRP
    213213  Bool*         m_pbResPredAvailable; ///< array of residual prediction available flags
    214214  Bool*         m_pbResPredFlag;      ///< array of residual prediction flags
     
    560560  Bool          getIViewOrgDepthMvPred( UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, TComMv& rcMv );
    561561#endif //  H3D_IVMP
    562 #if HHI_INTER_VIEW_RESIDUAL_PRED
     562#if H3D_IVRP
    563563  Bool*         getResPredAvail         ()                        { return m_pbResPredAvailable;        }
    564564  Bool          getResPredAvail         ( UInt uiIdx )            { return m_pbResPredAvailable[uiIdx]; }
     
    573573  Void          setResPredIndicator     ( Bool bAv, Bool bRP )    { m_pbResPredAvailable[0] = bAv; m_pbResPredFlag[0] = bRP; }
    574574#endif
    575 #if HHI_INTER_VIEW_RESIDUAL_PRED
     575#if H3D_IVRP
    576576  Bool          getResidualSamples( UInt uiPartIdx, Bool bRecon, TComYuv* pcYuv = 0 );
    577577#endif
     
    699699  UInt          getCtxInterDir                  ( UInt   uiAbsPartIdx                                 );
    700700
    701 #if HHI_INTER_VIEW_RESIDUAL_PRED
     701#if H3D_IVRP
    702702  UInt          getCtxResPredFlag               ( UInt   uiAbsPartIdx                                 );
    703703#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComDepthMapGenerator.h

    r292 r295  
    8080
    8181  UInt      getPdm  ()                            { if( m_aacActiveSPS[0][1] ) { return m_aacActiveSPS[0][1]->getPredDepthMapGeneration(); } return 0; }
    82 #if HHI_INTER_VIEW_RESIDUAL_PRED
     82#if H3D_IVRP
    8383  UInt      getResPrd ()                          { if( m_aacActiveSPS[0][1] ) { return m_aacActiveSPS[0][1]->getMultiviewResPredMode  (); } return 0; }
    8484#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPic.cpp

    r294 r295  
    6262  m_pcOrgDepthMap     = NULL;
    6363#endif
    64 #if HHI_INTER_VIEW_RESIDUAL_PRED
     64#if H3D_IVRP
    6565  m_pcResidual        = NULL;
    6666#endif
     
    165165  }
    166166#endif
    167 #if HHI_INTER_VIEW_RESIDUAL_PRED
     167#if H3D_IVRP
    168168  if( m_pcResidual )
    169169  {
     
    222222#endif
    223223
    224 #if HHI_INTER_VIEW_RESIDUAL_PRED
     224#if H3D_IVRP
    225225Void
    226226TComPic::addResidualBuffer()
     
    272272#endif
    273273
    274 #if HHI_INTER_VIEW_RESIDUAL_PRED
     274#if H3D_IVRP
    275275Void
    276276TComPic::removeResidualBuffer()
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPic.h

    r293 r295  
    8686#endif
    8787#endif
    88 #if HHI_INTER_VIEW_RESIDUAL_PRED
     88#if H3D_IVRP
    8989  TComPicYuv*           m_pcResidual;             //  residual buffer (coded or inter-view predicted residual)
    9090#endif
     
    173173#endif
    174174
    175 #if HHI_INTER_VIEW_RESIDUAL_PRED
     175#if H3D_IVRP
    176176  TComPicYuv*   getResidual()         { return  m_pcResidual; }
    177177#endif
     
    253253  Void          addOrgDepthMapBuffer    ();
    254254#endif
    255 #if HHI_INTER_VIEW_RESIDUAL_PRED
     255#if H3D_IVRP
    256256  Void          addResidualBuffer       ();
    257257#endif
     
    262262  Void          removeOrgDepthMapBuffer ();
    263263#endif
    264 #if HHI_INTER_VIEW_RESIDUAL_PRED
     264#if H3D_IVRP
    265265  Void          removeResidualBuffer    ();
    266266#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPrediction.cpp

    r294 r295  
    28602860  ruiIntraTabIdx  = 0;
    28612861#endif
    2862 #if HHIQC_DMMFASTSEARCH_B0039
    28632862  TComPic*      pcPicTex = pcCU->getSlice()->getTexturePic();
    28642863  TComDataCU* pcColTexCU = pcPicTex->getCU(pcCU->getAddr());
     
    29492948#endif
    29502949  }
    2951 #else
    2952   for( UInt uiIdx = 0; uiIdx < pacWedgeList->size(); uiIdx++ )
    2953   {
    2954     calcWedgeDCs       ( &(pacWedgeList->at(uiIdx)), piRefBlkY, uiWidth,      iDC1, iDC2 );
    2955     assignWedgeDCs2Pred( &(pacWedgeList->at(uiIdx)), piPred,    uiPredStride, iDC1, iDC2 );
    2956 
    2957     UInt uiActDist = cWedgeDist.getDistPart( piPred, uiPredStride, piRefBlkY, uiWidth, uiWidth, uiHeight, WedgeDist_SAD );
    2958 
    2959     if( uiActDist < uiBestDist || uiBestDist == MAX_UINT )
    2960     {
    2961       uiBestDist   = uiActDist;
    2962       uiBestTabIdx = uiIdx;
    2963     }
    2964   }
    2965 #endif
    29662950
    29672951  cPredYuv.destroy();
     
    30673051  delete pcContourWedge;
    30683052}
    3069 #endif
     3053#endif // HHI_DMM_PRED_TEX
    30703054
    30713055#if HHI_DMM_WEDGE_INTRA
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComResidualGenerator.cpp

    r294 r295  
    4444
    4545
    46 #if HHI_INTER_VIEW_RESIDUAL_PRED
     46#if H3D_IVRP
    4747
    4848
     
    743743
    744744
    745 #endif // HHI_INTER_VIEW_RESIDUAL_PRED
    746 
     745#endif // H3D_IVRP
     746
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComResidualGenerator.h

    r290 r295  
    5050
    5151
    52 #if HHI_INTER_VIEW_RESIDUAL_PRED
     52#if H3D_IVRP
    5353
    5454class TComResidualGenerator
     
    121121#endif // __TCOM_RESIDUAL_GENERATOR__
    122122
    123 #endif // HHI_INTER_VIEW_RESIDUAL_PRED
     123#endif // H3D_IVRP
    124124
    125125
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComRom.cpp

    r294 r295  
    174174    g_aacWedgeRefLists.clear();
    175175  }
    176 #if HHIQC_DMMFASTSEARCH_B0039
     176
    177177  if ( !g_aacWedgeNodeLists.empty() )
    178178  {
     
    183183    g_aacWedgeNodeLists.clear();
    184184  }
    185 #endif
     185
    186186#endif
    187187}
     
    859859std::vector< std::vector<TComWedgeRef> > g_aacWedgeRefLists;
    860860
    861 #if HHIQC_DMMFASTSEARCH_B0039
    862861std::vector< std::vector< std::vector<UInt> > > g_aauiWdgLstM3;
    863862std::vector< std::vector< TComWedgeNode> >      g_aacWedgeNodeLists;
    864 #endif
    865863
    866864Void initWedgeLists()
     
    875873    g_aacWedgeRefLists.push_back( acWedgeRefList );
    876874
    877 #if HHIQC_DMMFASTSEARCH_B0039
    878875    // create WedgeNodeList
    879876    std::vector<TComWedgeNode> acWedgeNodeList;
     
    936933    }
    937934    g_aacWedgeNodeLists.push_back( acWedgeNodeList );
    938 #endif
     935
    939936  }
    940937  return;
     
    974971      for( Int iL = 0; iL < uiBlockSize; iL++ )
    975972      {
    976 #if HHIQC_DMMFASTSEARCH_B0039
    977973        cTempWedgelet.setWedgelet( uhStartX + (iK*iStepStartX) , uhStartY + (iK*iStepStartY), uhEndX + (iL*iStepEndX), uhEndY + (iL*iStepEndY), (UChar)uiOri, eWedgeRes, ((iL%2)==0 && (iK%2)==0) );
    978 #else
    979         cTempWedgelet.setWedgelet( uhStartX + (iK*iStepStartX) , uhStartY + (iK*iStepStartY), uhEndX + (iL*iStepEndX), uhEndY + (iL*iStepEndY), (UChar)uiOri, eWedgeRes );
    980 #endif
    981974        addWedgeletToList( cTempWedgelet, racWedgeList, racWedgeRefList );
    982975      }
    983976    }
    984977  }
    985 #if HHIQC_DMMFASTSEARCH_B0039
    986978  UInt uiThrSz = DMM3_SIMPLIFY_TR;
    987979
     
    1001993  }
    1002994  g_aauiWdgLstM3.push_back(auiWdgListSz);
    1003 #endif
    1004995}
    1005996
     
    10371028  if( bValid )
    10381029  {
    1039 #if HHIQC_DMMFASTSEARCH_B0039
    1040   cWedgelet.findClosetAngle();
    1041 #endif
     1030    cWedgelet.findClosetAngle();
    10421031    racWedgeList.push_back( cWedgelet );
    10431032    TComWedgeRef cWedgeRef;
     
    10461035  }
    10471036}
    1048 #endif
     1037#endif //HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    10491038
    10501039//! \}
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComRom.h

    r294 r295  
    188188extern       std::vector< std::vector<TComWedgeRef> >  g_aacWedgeRefLists;
    189189
    190 #if HHIQC_DMMFASTSEARCH_B0039
     190#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    191191extern       std::vector< std::vector< std::vector<UInt> > > g_aauiWdgLstM3;
    192192extern       std::vector< std::vector<TComWedgeNode> >       g_aacWedgeNodeLists;
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComSlice.h

    r294 r295  
    5454class TComDepthMapGenerator;
    5555#endif
    56 #if HHI_INTER_VIEW_RESIDUAL_PRED
     56#if H3D_IVRP
    5757class TComResidualGenerator;
    5858#endif
     
    389389  UInt  m_uiMultiviewMvPredMode;
    390390#endif
    391 #if HHI_INTER_VIEW_RESIDUAL_PRED
     391#if H3D_IVRP
    392392  UInt  m_uiMultiviewResPredMode;
    393393#endif
     
    396396  TComDepthMapGenerator* m_pcDepthMapGenerator;
    397397#endif
    398 #if HHI_INTER_VIEW_RESIDUAL_PRED
     398#if H3D_IVRP
    399399  TComResidualGenerator* m_pcResidualGenerator;
    400400#endif
     
    639639  Void setPredDepthMapGeneration( UInt uiViewId, Bool bIsDepth, UInt uiPdmGenMode = 0, UInt uiPdmMvPredMode = 0, UInt uiPdmPrec = 0, Int** aaiPdmScaleNomDelta = 0, Int** aaiPdmOffset = 0 );
    640640#endif
    641 #if HHI_INTER_VIEW_RESIDUAL_PRED
     641#if H3D_IVRP
    642642  Void  setMultiviewResPredMode  ( UInt uiResPrdMode ) { m_uiMultiviewResPredMode = uiResPrdMode; }
    643643#endif
     
    653653  UInt  getMultiviewMvPredMode   ()          { return m_uiMultiviewMvPredMode;    }
    654654#endif
    655 #if HHI_INTER_VIEW_RESIDUAL_PRED
     655#if H3D_IVRP
    656656  UInt  getMultiviewResPredMode  ()          { return m_uiMultiviewResPredMode;   }
    657657#endif
     
    661661  TComDepthMapGenerator*  getDepthMapGenerator()                                              { return m_pcDepthMapGenerator; }
    662662#endif
    663 #if HHI_INTER_VIEW_RESIDUAL_PRED
     663#if H3D_IVRP
    664664  Void                    setResidualGenerator( TComResidualGenerator* pcResidualGenerator )  { m_pcResidualGenerator = pcResidualGenerator; }
    665665  TComResidualGenerator*  getResidualGenerator()                                              { return m_pcResidualGenerator; }
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComWedgelet.cpp

    r189 r295  
    5252                                                            m_uhOri    ( 0 ),
    5353                                                            m_eWedgeRes( FULL_PEL )
    54 #if HHIQC_DMMFASTSEARCH_B0039
     54#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    5555                                                            , m_bIsCoarse( false )
    5656#endif
     
    6565                                                            m_uhOri    ( rcWedge.m_uhOri     ),
    6666                                                            m_eWedgeRes( rcWedge.m_eWedgeRes ),
    67 #if HHIQC_DMMFASTSEARCH_B0039
     67#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    6868                                                            m_bIsCoarse( rcWedge.m_bIsCoarse ),
    6969                                                            m_uiAng    ( rcWedge.m_uiAng     ),
     
    101101}
    102102
    103 #if HHIQC_DMMFASTSEARCH_B0039
     103#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    104104Void TComWedgelet::findClosetAngle()
    105105{
     
    142142  m_uhOri     = uhOri;
    143143  m_eWedgeRes = eWedgeRes;
    144 #if HHIQC_DMMFASTSEARCH_B0039
     144#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    145145  m_bIsCoarse = bIsCoarse;
    146146#endif
     
    687687  case( 2 ): { for( UInt iX = uiTempBlockSize-1; iX > uhXs;            iX-- ) { UInt iY = uiTempBlockSize-1; while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iY--; } } } break;
    688688  case( 3 ): { for( UInt iY = uiTempBlockSize-1; iY > uhYs;            iY-- ) { UInt iX = 0;                 while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iX++; } } } break;
    689 #if HHIQC_DMMFASTSEARCH_B0039
     689#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    690690  case( 4 ):
    691691    {
     
    721721      case( 2 ): { uiOffX = 1; uiOffY = 1; } break;
    722722      case( 3 ): { uiOffX = 0; uiOffY = 1; } break;
    723 #if HHIQC_DMMFASTSEARCH_B0039
     723#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    724724      case( 4 ):
    725725        {
     
    805805}
    806806
    807 #if HHIQC_DMMFASTSEARCH_B0039
     807#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    808808TComWedgeNode::TComWedgeNode()
    809809{
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComWedgelet.h

    r189 r295  
    5050};
    5151
    52 #if HHIQC_DMMFASTSEARCH_B0039
     52#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    5353#define NUM_WEDGE_REFINES 8
    5454#define NO_IDX MAX_UINT
     
    6767  UChar           m_uhOri;                      // orientation index
    6868  WedgeResolution m_eWedgeRes;                  // start/end pos resolution
    69 #if HHIQC_DMMFASTSEARCH_B0039
     69#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    7070  Bool            m_bIsCoarse;
    7171  UInt            m_uiAng;
     
    9999  UChar           getEndY    () { return m_uhYe; }
    100100  UChar           getOri     () { return m_uhOri; }
    101 #if HHIQC_DMMFASTSEARCH_B0039
     101#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    102102  Bool            getIsCoarse() { return m_bIsCoarse; }
    103103  UInt            getAng     () { return m_uiAng; }
     
    153153typedef std::vector<TComWedgeRef> WedgeRefList;
    154154
    155 #if HHIQC_DMMFASTSEARCH_B0039
     155#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    156156// ====================================================================================================================
    157157// Class definition TComWedgeNode
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TypeDef.h

    r294 r295  
    5656#define HHI_DMM_WEDGE_INTRA               1   // depth model modes independent on texture (explicit and intra-predicted Wedgelet prediction)
    5757#define HHI_DMM_PRED_TEX                  1   // depth model modes dependent on texture (inter-component Wedgelet and Contour prediction )
     58                                              // HHIQC_DMMFASTSEARCH_B0039, fast Wedgelet search for DMM modes 1 and 3
     59
    5860#define LGE_EDGE_INTRA_A0070              1   // JCT3V-A0070
    5961
    60 #define HHIQC_DMMFASTSEARCH_B0039         1   // JCT3V-B0039: fast Wedgelet search for DMM modes 1 and 3 // --> weg
    61 
    6262#define HHI_DMM_DELTADC_Q1_C0034          1   // JCT3V-C0034: no quantization and fast encoder search for DMM delta DC values
    63 #if HHIQC_DMMFASTSEARCH_B0039 && HHI_DMM_PRED_TEX
     63#if ( HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA ) && HHI_DMM_PRED_TEX
    6464#define LGE_DMM3_SIMP_C0044               1
    6565#endif
     
    8686                                              // QC_MRG_CANS_B0048             , JCT3V-B0048, B0086, B0069
    8787                                              // OL_DISMV_POS_B0069            , different pos for disparity MV candidate, B0069
    88                                               // MTK_INTERVIEW_MERGE_A0049     ,// JCT3V-A0049 second part
     88                                              // MTK_INTERVIEW_MERGE_A0049     , second part
    8989#define QC_AMVP_MRG_UNIFY_IVCAN_C0051     1
    90 #define QC_C0051_FIXED_BY_MTK             1   // bug fix for C0051 implementation
     90#define QC_C0051_FIXED_BY_MTK             1   // Bug fix for C0051 implementation
    9191
    9292
    9393///// ***** INTERVIEW RESIDUAL PREDICTION *********
    94 #define HHI_INTER_VIEW_RESIDUAL_PRED      1   // inter-view residual prediction
     94#define H3D_IVRP                          1   // Inter-view residual prediction
     95                                              // HHI_INTER_VIEW_RESIDUAL_PRED
    9596                                              // QC_SIMPLIFIEDIVRP_M24938
    96 #if HHI_INTER_VIEW_RESIDUAL_PRED       
    97 #define LG_RESTRICTEDRESPRED_M24766       1   // restricted inter-view residual prediction
     97#if H3D_IVRP       
     98#define LG_RESTRICTEDRESPRED_M24766       1   // Restricted inter-view residual prediction
    9899#define FIX_LG_RESTRICTEDRESPRED_M24766   1
    99100#else                                 
     
    101102#endif
    102103
    103 #define MTK_MDIVRP_C0138                  1   // mode-dependent inter-view residual prediction
    104 #define MTK_C0138_FIXED                   1   // fix for IBP coding structure in view direction (not CTC)
     104#define MTK_MDIVRP_C0138                  1   // Mode-dependent inter-view residual prediction
     105#define MTK_C0138_FIXED                   1   // Fix for IBP coding structure in view direction (not CTC)
    105106
    106107
     
    174175///// ***** VSP *********
    175176#define MERL_VSP_C0152                    1 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
    176 #define FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152 1
    177177#if MERL_VSP_C0152
    178178
     
    241241
    242242
    243 #if HHIQC_DMMFASTSEARCH_B0039
     243#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
    244244#define DMM3_SIMPLIFY_TR                  1
    245245#endif
     
    257257///// ***** HM 6.1 *********
    258258
    259 //// REMOVED HM 6.1 Guard macros
     259//// REMOVED HM 6.1 Guard macros (corresponding to macros removed in HM 6.3.1)
    260260/*
    261261#define SKIPFRAME_BUGFIX                  1 ///< bug fix to enable skipFrame at decoder
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r294 r295  
    14921492      pcSPS->setPredDepthMapGeneration( 0, false );
    14931493#endif
    1494 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1494#if H3D_IVRP
    14951495    pcSPS->setMultiviewResPredMode  ( 0 );
    14961496#endif
     
    15071507        pcSPS->setPredDepthMapGeneration( uiCode, true );
    15081508#endif
    1509 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1509#if H3D_IVRP
    15101510      pcSPS->setMultiviewResPredMode  ( 0 );
    15111511#endif
     
    15371537        UInt uiMultiviewMvPredMode = 0;
    15381538#endif
    1539 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1539#if H3D_IVRP
    15401540      UInt uiMultiviewResPredMode = 0;
    15411541#endif
     
    15521552          READ_UVLC( uiMultiviewMvPredMode, "multi_view_mv_pred_mode" );
    15531553#endif
    1554 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1554#if H3D_IVRP
    15551555          READ_FLAG( uiMultiviewResPredMode, "multi_view_residual_pred_mode" );
    15561556#endif
     
    15621562#endif
    15631563#endif
    1564 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1564#if H3D_IVRP
    15651565      pcSPS->setMultiviewResPredMode  ( uiMultiviewResPredMode );
    15661566#endif
     
    23812381}
    23822382
    2383 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2383#if H3D_IVRP
    23842384Void
    23852385TDecCavlc::parseResPredFlag( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth )
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.h

    r294 r295  
    141141  Void parseMergeFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    142142  Void parseMergeIndex      ( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth );
    143 #if HHI_INTER_VIEW_RESIDUAL_PRED
     143#if H3D_IVRP
    144144  Void parseResPredFlag     ( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth );
    145145#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecCu.cpp

    r294 r295  
    5454  m_ppcYuvResi = NULL;
    5555  m_ppcYuvReco = NULL;
    56 #if HHI_INTER_VIEW_RESIDUAL_PRED
     56#if H3D_IVRP
    5757  m_ppcYuvResPred = NULL;
    5858#endif
     
    8282  m_ppcYuvResi = new TComYuv*[m_uiMaxDepth-1];
    8383  m_ppcYuvReco = new TComYuv*[m_uiMaxDepth-1];
    84 #if HHI_INTER_VIEW_RESIDUAL_PRED
     84#if H3D_IVRP
    8585  m_ppcYuvResPred = new TComYuv*   [m_uiMaxDepth-1];
    8686#endif
     
    9696    m_ppcYuvResi[ui] = new TComYuv;    m_ppcYuvResi[ui]->create( uiWidth, uiHeight );
    9797    m_ppcYuvReco[ui] = new TComYuv;    m_ppcYuvReco[ui]->create( uiWidth, uiHeight );
    98 #if HHI_INTER_VIEW_RESIDUAL_PRED
     98#if H3D_IVRP
    9999    m_ppcYuvResPred[ui] = new TComYuv;    m_ppcYuvResPred[ui]->create( uiWidth, uiHeight );
    100100#endif
     
    120120    m_ppcYuvResi[ui]->destroy(); delete m_ppcYuvResi[ui]; m_ppcYuvResi[ui] = NULL;
    121121    m_ppcYuvReco[ui]->destroy(); delete m_ppcYuvReco[ui]; m_ppcYuvReco[ui] = NULL;
    122 #if HHI_INTER_VIEW_RESIDUAL_PRED
     122#if H3D_IVRP
    123123    m_ppcYuvResPred[ui]->destroy(); delete m_ppcYuvResPred[ui]; m_ppcYuvResPred[ui] = NULL;
    124124#endif
     
    128128  delete [] m_ppcYuvResi; m_ppcYuvResi = NULL;
    129129  delete [] m_ppcYuvReco; m_ppcYuvReco = NULL;
    130 #if HHI_INTER_VIEW_RESIDUAL_PRED
     130#if H3D_IVRP
    131131  delete [] m_ppcYuvResPred; m_ppcYuvResPred = NULL;
    132132#endif
     
    409409    }
    410410#endif
    411 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     411#if H3D_IVRP && !MTK_MDIVRP_C0138
    412412    m_pcEntropyDecoder->decodeResPredFlag( pcCU, uiAbsPartIdx, uiDepth, m_ppcCU[uiDepth], 0 );
    413413#endif
     
    460460#endif
    461461
    462 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     462#if H3D_IVRP && !MTK_MDIVRP_C0138
    463463  if( !pcCU->isIntra( uiAbsPartIdx ) )
    464464  {
     
    691691#endif
    692692
    693 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     693#if H3D_IVRP && !MTK_MDIVRP_C0138
    694694  if( pcCU->getResPredFlag( 0 ) )
    695695  {
     
    721721  else
    722722  {
    723 #if HHI_INTER_VIEW_RESIDUAL_PRED
     723#if H3D_IVRP
    724724#if MTK_MDIVRP_C0138
    725725    if (pcCU->getMergeFlag(0) && pcCU->getMergeIndex(0)==0 && pcCU->getResPredAvail(0))
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecCu.h

    r231 r295  
    6161  TComYuv**           m_ppcYuvResi;       ///< array of residual buffer
    6262  TComYuv**           m_ppcYuvReco;       ///< array of prediction & reconstruction buffer
    63 #if HHI_INTER_VIEW_RESIDUAL_PRED
     63#if H3D_IVRP
    6464  TComYuv**           m_ppcYuvResPred;    ///< residual prediction buffer
    6565#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

    r294 r295  
    108108}
    109109
    110 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     110#if H3D_IVRP && !MTK_MDIVRP_C0138
    111111Void
    112112TDecEntropy::decodeResPredFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, TComDataCU* pcSubCU, UInt uiPUIdx )
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecEntropy.h

    r294 r295  
    103103  virtual Void parseMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx ) = 0;
    104104  virtual Void parseMergeIndex    ( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    105 #if HHI_INTER_VIEW_RESIDUAL_PRED
     105#if H3D_IVRP
    106106  virtual Void parseResPredFlag   ( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    107107#endif
     
    198198  Void decodeMergeFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    199199  Void decodeMergeIndex        ( TComDataCU* pcSubCU, UInt uiPartIdx, UInt uiPartAddr, PartSize eCUMode, UChar* puhInterDirNeighbours, TComMvField* pcMvFieldNeighbours, UInt uiDepth );
    200 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     200#if H3D_IVRP && !MTK_MDIVRP_C0138
    201201  Void decodeResPredFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, TComDataCU* pcSubCU, UInt uiPUIdx );
    202202#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecGop.cpp

    r294 r295  
    9393                   ,TComDepthMapGenerator*  pcDepthMapGenerator
    9494#endif
    95 #if HHI_INTER_VIEW_RESIDUAL_PRED
     95#if H3D_IVRP
    9696                  ,TComResidualGenerator*  pcResidualGenerator
    9797#endif
     
    109109  m_pcDepthMapGenerator   = pcDepthMapGenerator;
    110110#endif
    111 #if HHI_INTER_VIEW_RESIDUAL_PRED
     111#if H3D_IVRP
    112112  m_pcResidualGenerator   = pcResidualGenerator;
    113113#endif
     
    298298      m_pcDepthMapGenerator->predictDepthMap  ( rpcPic );
    299299#endif
    300 #if HHI_INTER_VIEW_RESIDUAL_PRED
     300#if H3D_IVRP
    301301      m_pcResidualGenerator->initViewComponent( rpcPic );
    302302#endif
     
    331331  else
    332332  {
    333 #if HHI_INTER_VIEW_RESIDUAL_PRED
     333#if H3D_IVRP
    334334    // set residual picture
    335335    m_pcResidualGenerator->setRecResidualPic( rpcPic );
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecGop.h

    r294 r295  
    9090  TComDepthMapGenerator*  m_pcDepthMapGenerator;
    9191#endif
    92 #if HHI_INTER_VIEW_RESIDUAL_PRED
     92#if H3D_IVRP
    9393  TComResidualGenerator*  m_pcResidualGenerator;
    9494#endif
     
    118118                 ,TComDepthMapGenerator*  pcDepthMapGenerator
    119119#endif
    120 #if HHI_INTER_VIEW_RESIDUAL_PRED
     120#if H3D_IVRP
    121121                ,TComResidualGenerator*  pcResidualGenerator
    122122#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecSbac.cpp

    r294 r295  
    6262, m_cCUMergeFlagExtSCModel    ( 1,             1,               NUM_MERGE_FLAG_EXT_CTX        , m_contextModels + m_numContextModels, m_numContextModels)
    6363, m_cCUMergeIdxExtSCModel     ( 1,             1,               NUM_MERGE_IDX_EXT_CTX         , m_contextModels + m_numContextModels, m_numContextModels)
    64 #if HHI_INTER_VIEW_RESIDUAL_PRED
     64#if H3D_IVRP
    6565, m_cResPredFlagSCModel       ( 1,             1,               NUM_RES_PRED_FLAG_CTX         , m_contextModels + m_numContextModels, m_numContextModels)
    6666#endif
     
    159159  m_cCUMergeFlagExtSCModel.initBuffer    ( sliceType, qp, (UChar*)INIT_MERGE_FLAG_EXT );
    160160  m_cCUMergeIdxExtSCModel.initBuffer     ( sliceType, qp, (UChar*)INIT_MERGE_IDX_EXT );
    161 #if HHI_INTER_VIEW_RESIDUAL_PRED
     161#if H3D_IVRP
    162162  m_cResPredFlagSCModel.initBuffer       ( sliceType, qp, (UChar*)INIT_RES_PRED_FLAG );
    163163#endif
     
    246246  m_cCUMergeFlagExtSCModel.initBuffer    ( eSliceType, iQp, (UChar*)INIT_MERGE_FLAG_EXT );
    247247  m_cCUMergeIdxExtSCModel.initBuffer     ( eSliceType, iQp, (UChar*)INIT_MERGE_IDX_EXT );
    248 #if HHI_INTER_VIEW_RESIDUAL_PRED
     248#if H3D_IVRP
    249249  m_cResPredFlagSCModel.initBuffer       ( eSliceType, iQp, (UChar*)INIT_RES_PRED_FLAG );
    250250#endif
     
    670670}
    671671
    672 #if HHI_INTER_VIEW_RESIDUAL_PRED
     672#if H3D_IVRP
    673673Void
    674674TDecSbac::parseResPredFlag( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth )
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecSbac.h

    r294 r295  
    173173  Void parseMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    174174  Void parseMergeIndex    ( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth );
    175 #if HHI_INTER_VIEW_RESIDUAL_PRED
     175#if H3D_IVRP
    176176  Void parseResPredFlag   ( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth );
    177177#endif
     
    216216  ContextModel3DBuffer m_cCUMergeFlagExtSCModel;
    217217  ContextModel3DBuffer m_cCUMergeIdxExtSCModel;
    218 #if HHI_INTER_VIEW_RESIDUAL_PRED
     218#if H3D_IVRP
    219219  ContextModel3DBuffer m_cResPredFlagSCModel;
    220220#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecTop.cpp

    r294 r295  
    398398  m_cDepthMapGenerator.destroy();
    399399#endif
    400 #if HHI_INTER_VIEW_RESIDUAL_PRED
     400#if H3D_IVRP
    401401  m_cResidualGenerator.destroy();
    402402#endif
     
    415415                    , &m_cDepthMapGenerator
    416416#endif
    417 #if HHI_INTER_VIEW_RESIDUAL_PRED
     417#if H3D_IVRP
    418418                    , &m_cResidualGenerator
    419419#endif
     
    429429#endif
    430430#endif
    431 #if HHI_INTER_VIEW_RESIDUAL_PRED
     431#if H3D_IVRP
    432432  m_cResidualGenerator.init( &m_cTrQuant, &m_cDepthMapGenerator );
    433433#endif
     
    465465}
    466466
    467 #if HHI_INTER_VIEW_RESIDUAL_PRED
     467#if H3D_IVRP
    468468Void
    469469TDecTop::deleteExtraPicBuffers( Int iPoc )
     
    855855    }
    856856#endif
    857 #if HHI_INTER_VIEW_RESIDUAL_PRED
     857#if H3D_IVRP
    858858    m_cResidualGenerator.create( true, m_apcSlicePilot->getSPS()->getPicWidthInLumaSamples(), m_apcSlicePilot->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement );
    859859#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecTop.h

    r294 r295  
    213213  TComDepthMapGenerator   m_cDepthMapGenerator;
    214214#endif
    215 #if HHI_INTER_VIEW_RESIDUAL_PRED
     215#if H3D_IVRP
    216216  TComResidualGenerator   m_cResidualGenerator;
    217217#endif
     
    249249  Void      xCopyVPS( TComVPS* pVPSV0);
    250250#endif
    251 #if HHI_INTER_VIEW_RESIDUAL_PRED
     251#if H3D_IVRP
    252252  Void      deleteExtraPicBuffers   ( Int iPoc );
    253253#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

    r294 r295  
    694694        WRITE_UVLC( pcSPS->getMultiviewMvPredMode(), "multi_view_mv_pred_mode" );
    695695#endif
    696 #if HHI_INTER_VIEW_RESIDUAL_PRED
     696#if H3D_IVRP
    697697        WRITE_FLAG  ( pcSPS->getMultiviewResPredMode(), "multi_view_residual_pred_mode" );
    698698#endif
     
    12931293}
    12941294
    1295 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1295#if H3D_IVRP
    12961296Void
    12971297TEncCavlc::codeResPredFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCavlc.h

    r294 r295  
    157157  Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    158158  Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    159 #if HHI_INTER_VIEW_RESIDUAL_PRED
     159#if H3D_IVRP
    160160  Void codeResPredFlag   ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    161161#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCfg.h

    r294 r295  
    332332  Double      m_dMultiviewMvRegLambdaScale;
    333333#endif
    334 #if HHI_INTER_VIEW_RESIDUAL_PRED
     334#if H3D_IVRP
    335335  UInt        m_uiMultiviewResPredMode;
    336336#endif
     
    413413  Void      setMultiviewMvRegLambdaScale    ( Double d)      { m_dMultiviewMvRegLambdaScale = d; }
    414414#endif
    415 #if HHI_INTER_VIEW_RESIDUAL_PRED
     415#if H3D_IVRP
    416416  Void      setMultiviewResPredMode         ( UInt  u )      { m_uiMultiviewResPredMode     = u; }
    417417#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCu.cpp

    r294 r295  
    7272  m_ppcRecoYuvTemp = new TComYuv*[m_uhTotalDepth-1];
    7373  m_ppcOrigYuv     = new TComYuv*[m_uhTotalDepth-1];
    74 #if HHI_INTER_VIEW_RESIDUAL_PRED
     74#if H3D_IVRP
    7575  m_ppcResPredTmp  = new TComYuv*[m_uhTotalDepth-1];
    7676#endif
     
    101101   
    102102    m_ppcOrigYuv    [i] = new TComYuv; m_ppcOrigYuv    [i]->create(uiWidth, uiHeight);
    103 #if HHI_INTER_VIEW_RESIDUAL_PRED
     103#if H3D_IVRP
    104104    m_ppcResPredTmp [i] = new TComYuv; m_ppcResPredTmp [i]->create(uiWidth, uiHeight);
    105105#endif
     
    166166      m_ppcOrigYuv[i]->destroy();     delete m_ppcOrigYuv[i];     m_ppcOrigYuv[i] = NULL;
    167167    }
    168 #if HHI_INTER_VIEW_RESIDUAL_PRED
     168#if H3D_IVRP
    169169    if(m_ppcResPredTmp[i])
    170170    {
     
    219219    m_ppcOrigYuv = NULL;
    220220  }
    221 #if HHI_INTER_VIEW_RESIDUAL_PRED
     221#if H3D_IVRP
    222222  if(m_ppcResPredTmp)
    223223  {
     
    601601      if( rpcBestCU->getSlice()->getSliceType() != I_SLICE )
    602602      {
    603 #if HHI_INTER_VIEW_RESIDUAL_PRED
     603#if H3D_IVRP
    604604#if MTK_MDIVRP_C0138
    605605        Bool  bResPredAvailable   = false;
     
    627627#endif
    628628#endif
    629 #if HHI_INTER_VIEW_RESIDUAL_PRED
     629#if H3D_IVRP
    630630          rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    631631#endif
     
    658658          if ( !bEarlySkip )
    659659          {
    660 #if HHI_INTER_VIEW_RESIDUAL_PRED
     660#if H3D_IVRP
    661661            rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    662662#endif
     
    679679         }
    680680#endif
    681 #if HHI_INTER_VIEW_RESIDUAL_PRED
     681#if H3D_IVRP
    682682        } // uiResPrdId
    683683#endif
     
    738738      if( rpcBestCU->getSlice()->getSliceType() != I_SLICE )
    739739      {
    740 #if HHI_INTER_VIEW_RESIDUAL_PRED
     740#if H3D_IVRP
    741741#if MTK_MDIVRP_C0138
    742742        Bool  bResPredAvailable   = false;
     
    776776                {
    777777#endif
    778 #if HHI_INTER_VIEW_RESIDUAL_PRED
     778#if H3D_IVRP
    779779                  rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    780780#endif
     
    799799              if(doNotBlockPu)
    800800              {
    801 #if HHI_INTER_VIEW_RESIDUAL_PRED
     801#if H3D_IVRP
    802802                rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    803803#endif
     
    826826              if(doNotBlockPu)
    827827              {
    828 #if HHI_INTER_VIEW_RESIDUAL_PRED
     828#if H3D_IVRP
    829829                rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    830830#endif
     
    872872                if(doNotBlockPu)
    873873                {
    874 #if HHI_INTER_VIEW_RESIDUAL_PRED
     874#if H3D_IVRP
    875875                  rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    876876#endif
     
    891891                if(doNotBlockPu)
    892892                {
    893 #if HHI_INTER_VIEW_RESIDUAL_PRED
     893#if H3D_IVRP
    894894                  rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    895895#endif
     
    921921                if(doNotBlockPu)
    922922                {
    923 #if HHI_INTER_VIEW_RESIDUAL_PRED
     923#if H3D_IVRP
    924924                  rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    925925#endif
     
    940940                if(doNotBlockPu)
    941941                {
    942 #if HHI_INTER_VIEW_RESIDUAL_PRED
     942#if H3D_IVRP
    943943                  rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    944944#endif
     
    972972                if(doNotBlockPu)
    973973                {
    974 #if HHI_INTER_VIEW_RESIDUAL_PRED
     974#if H3D_IVRP
    975975                  rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    976976#endif
     
    991991                if(doNotBlockPu)
    992992                {
    993 #if HHI_INTER_VIEW_RESIDUAL_PRED
     993#if H3D_IVRP
    994994                  rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    995995#endif
     
    10171017                if(doNotBlockPu)
    10181018                {
    1019 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1019#if H3D_IVRP
    10201020                  rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    10211021#endif
     
    10361036                if(doNotBlockPu)
    10371037                {
    1038 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1038#if H3D_IVRP
    10391039                  rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    10401040#endif
     
    10561056
    10571057#else
    1058 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1058#if H3D_IVRP
    10591059            rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    10601060#endif
     
    10651065#endif
    10661066            rpcTempCU->initEstData( uiDepth, iQP );
    1067 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1067#if H3D_IVRP
    10681068            rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    10691069#endif
     
    10741074#endif
    10751075            rpcTempCU->initEstData( uiDepth, iQP );
    1076 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1076#if H3D_IVRP
    10771077            rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    10781078#endif
     
    10831083#endif
    10841084            rpcTempCU->initEstData( uiDepth, iQP );
    1085 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1085#if H3D_IVRP
    10861086            rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag );
    10871087#endif
     
    10991099         }
    11001100#endif
    1101 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1101#if H3D_IVRP
    11021102        } // uiResPrdId
    11031103#endif
     
    18051805        );
    18061806#endif
    1807 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     1807#if H3D_IVRP && !MTK_MDIVRP_C0138
    18081808    m_pcEntropyCoder->encodeResPredFlag( pcCU, uiAbsPartIdx, 0 );
    18091809#endif
     
    18401840        );
    18411841#endif
    1842 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     1842#if H3D_IVRP && !MTK_MDIVRP_C0138
    18431843    if( !pcCU->isIntra( uiAbsPartIdx ) )
    18441844    {
     
    18801880  Int numValidMergeCand = 0;
    18811881
    1882 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     1882#if H3D_IVRP && !MTK_MDIVRP_C0138
    18831883  Bool  bResPrdAvail  = rpcTempCU->getResPredAvail( 0 );
    18841884  Bool  bResPrdFlag   = rpcTempCU->getResPredFlag ( 0 );
     
    19771977          rpcTempCU->getCUMvField( REF_PIC_LIST_1 )->setAllMvField( cMvFieldNeighbours[1 + 2*uiMergeCand], SIZE_2Nx2N, 0, 0 ); // interprets depth relative to rpcTempCU level
    19781978
    1979 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1979#if H3D_IVRP
    19801980#if MTK_MDIVRP_C0138
    19811981          rpcTempCU->setResPredAvailSubParts(bResPredAvail, 0, 0, uhDepth);
     
    20552055            m_ppcResiYuvBest[uhDepth],
    20562056            m_ppcRecoYuvTemp[uhDepth],
    2057 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2057#if H3D_IVRP
    20582058                                                     m_ppcResPredTmp [uhDepth],
    20592059#endif
     
    21082108  rpcTempCU->setDepthSubParts( uhDepth, 0 );
    21092109 
    2110 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2110#if H3D_IVRP
    21112111  Bool  bResPrdAvail  = rpcTempCU->getResPredAvail( 0 );
    21122112  Bool  bResPrdFlag   = rpcTempCU->getResPredFlag ( 0 );
     
    21152115  rpcTempCU->setPartSizeSubParts  ( ePartSize,  0, uhDepth );
    21162116
    2117 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2117#if H3D_IVRP
    21182118  rpcTempCU->setResPredAvailSubParts( bResPrdAvail, 0, 0, uhDepth );
    21192119  rpcTempCU->setResPredFlagSubParts ( bResPrdFlag,  0, 0, uhDepth );
     
    21212121  rpcTempCU->setPredModeSubParts  ( MODE_INTER, 0, uhDepth );
    21222122 
    2123 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2123#if H3D_IVRP
    21242124#if !LG_RESTRICTEDRESPRED_M24766
    21252125  if( rpcTempCU->getResPredFlag( 0 ) )
     
    21492149#endif
    21502150
    2151 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2151#if H3D_IVRP
    21522152#if !LG_RESTRICTEDRESPRED_M24766
    21532153  if( rpcTempCU->getResPredFlag( 0 ) )
     
    21722172                                             m_ppcResiYuvBest[uhDepth],
    21732173                                             m_ppcRecoYuvTemp[uhDepth],
    2174 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2174#if H3D_IVRP
    21752175                                             m_ppcResPredTmp [uhDepth],
    21762176#endif
     
    21832183                                             m_ppcResiYuvBest[uhDepth],
    21842184                                             m_ppcRecoYuvTemp[uhDepth],
    2185 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2185#if H3D_IVRP
    21862186                                             m_ppcResPredTmp [uhDepth],
    21872187#endif
     
    28552855                                               m_ppcResiYuvBest[uhDepth],
    28562856                                               m_ppcRecoYuvTemp[uhDepth],
    2857 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2857#if H3D_IVRP
    28582858                                               m_ppcResPredTmp [uhDepth],
    28592859#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCu.h

    r294 r295  
    7878  TComYuv**               m_ppcRecoYuvTemp; ///< Temporary Reconstruction Yuv for each depth
    7979  TComYuv**               m_ppcOrigYuv;     ///< Original Yuv for each depth
    80 #if HHI_INTER_VIEW_RESIDUAL_PRED
     80#if H3D_IVRP
    8181  TComYuv**               m_ppcResPredTmp;  ///< Temporary residual prediction for each depth
    8282#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncEntropy.cpp

    r294 r295  
    455455}
    456456
    457 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     457#if H3D_IVRP && !MTK_MDIVRP_C0138
    458458Void
    459459TEncEntropy::encodeResPredFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiPUIdx, Bool bRD )
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncEntropy.h

    r294 r295  
    114114  virtual Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    115115  virtual Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    116 #if HHI_INTER_VIEW_RESIDUAL_PRED
     116#if H3D_IVRP
    117117  virtual Void codeResPredFlag   ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    118118#endif
     
    250250  Void encodeMergeFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiPUIdx );
    251251  Void encodeMergeIndex   ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiPUIdx, Bool bRD = false );
    252 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     252#if H3D_IVRP && !MTK_MDIVRP_C0138
    253253  Void encodeResPredFlag  ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiPUIdx, Bool bRD = false );
    254254#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

    r294 r295  
    7878  m_pcDepthMapGenerator = NULL;
    7979#endif
    80 #if HHI_INTER_VIEW_RESIDUAL_PRED
     80#if H3D_IVRP
    8181  m_pcResidualGenerator = NULL;
    8282#endif
     
    131131  m_pcDepthMapGenerator  = pcTEncTop->getDepthMapGenerator();
    132132#endif
    133 #if HHI_INTER_VIEW_RESIDUAL_PRED
     133#if H3D_IVRP
    134134  m_pcResidualGenerator  = pcTEncTop->getResidualGenerator();
    135135#endif
     
    736736      m_pcDepthMapGenerator->covertOrgDepthMap( pcPic );
    737737#endif
    738 #if HHI_INTER_VIEW_RESIDUAL_PRED
     738#if H3D_IVRP
    739739      m_pcResidualGenerator->initViewComponent( pcPic );
    740740#endif
     
    800800      pcSlice = pcPic->getSlice(0);
    801801
    802 #if HHI_INTER_VIEW_RESIDUAL_PRED
     802#if H3D_IVRP
    803803      // set residual picture
    804804      m_pcResidualGenerator->setRecResidualPic( pcPic );
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncGOP.h

    r189 r295  
    9797  TComDepthMapGenerator*  m_pcDepthMapGenerator;
    9898#endif
    99 #if HHI_INTER_VIEW_RESIDUAL_PRED
     99#if H3D_IVRP
    100100  TComResidualGenerator*  m_pcResidualGenerator;
    101101#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncSbac.cpp

    r294 r295  
    7070, m_cCUMergeFlagExtSCModel    ( 1,             1,               NUM_MERGE_FLAG_EXT_CTX        , m_contextModels + m_numContextModels, m_numContextModels)
    7171, m_cCUMergeIdxExtSCModel     ( 1,             1,               NUM_MERGE_IDX_EXT_CTX         , m_contextModels + m_numContextModels, m_numContextModels)
    72 #if HHI_INTER_VIEW_RESIDUAL_PRED
     72#if H3D_IVRP
    7373, m_cResPredFlagSCModel       ( 1,             1,               NUM_RES_PRED_FLAG_CTX         , m_contextModels + m_numContextModels, m_numContextModels)
    7474#endif
     
    155155  m_cCUMergeFlagExtSCModel.initBuffer    ( eSliceType, iQp, (UChar*)INIT_MERGE_FLAG_EXT);
    156156  m_cCUMergeIdxExtSCModel.initBuffer     ( eSliceType, iQp, (UChar*)INIT_MERGE_IDX_EXT);
    157 #if HHI_INTER_VIEW_RESIDUAL_PRED
     157#if H3D_IVRP
    158158  m_cResPredFlagSCModel.initBuffer       ( eSliceType, iQp, (UChar*)INIT_RES_PRED_FLAG );
    159159#endif
     
    241241      curCost += m_cCUMergeFlagExtSCModel.calcCost    ( curSliceType, qp, (UChar*)INIT_MERGE_FLAG_EXT);
    242242      curCost += m_cCUMergeIdxExtSCModel.calcCost     ( curSliceType, qp, (UChar*)INIT_MERGE_IDX_EXT);
    243 #if HHI_INTER_VIEW_RESIDUAL_PRED
     243#if H3D_IVRP
    244244      curCost += m_cResPredFlagSCModel.calcCost       ( curSliceType, qp, (UChar*)INIT_RES_PRED_FLAG);
    245245#endif
     
    308308  m_cCUMergeFlagExtSCModel.initBuffer    ( eSliceType, iQp, (UChar*)INIT_MERGE_FLAG_EXT);
    309309  m_cCUMergeIdxExtSCModel.initBuffer     ( eSliceType, iQp, (UChar*)INIT_MERGE_IDX_EXT);
    310 #if HHI_INTER_VIEW_RESIDUAL_PRED
     310#if H3D_IVRP
    311311  m_cResPredFlagSCModel.initBuffer       ( eSliceType, iQp, (UChar*)INIT_RES_PRED_FLAG );
    312312#endif
     
    835835}
    836836
    837 #if HHI_INTER_VIEW_RESIDUAL_PRED
     837#if H3D_IVRP
    838838Void
    839839TEncSbac::codeResPredFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncSbac.h

    r294 r295  
    206206  Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    207207  Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    208 #if HHI_INTER_VIEW_RESIDUAL_PRED
     208#if H3D_IVRP
    209209  Void codeResPredFlag   ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    210210#endif
     
    263263  ContextModel3DBuffer m_cCUMergeFlagExtSCModel;
    264264  ContextModel3DBuffer m_cCUMergeIdxExtSCModel;
    265 #if HHI_INTER_VIEW_RESIDUAL_PRED
     265#if H3D_IVRP
    266266  ContextModel3DBuffer m_cResPredFlagSCModel;
    267267#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

    r294 r295  
    47574757 * \returns Void
    47584758 */
    4759 #if HHI_INTER_VIEW_RESIDUAL_PRED
     4759#if H3D_IVRP
    47604760Void TEncSearch::encodeResAndCalcRdInterCU( TComDataCU* pcCU, TComYuv* pcYuvOrg, TComYuv* pcYuvPred, TComYuv*& rpcYuvResi, TComYuv*& rpcYuvResiBest, TComYuv*& rpcYuvRec, TComYuv*& rpcYuvResPrd, Bool bSkipRes )
    47614761#else
     
    47914791    }
    47924792#else
    4793 #if HHI_INTER_VIEW_RESIDUAL_PRED
     4793#if H3D_IVRP
    47944794    // add residual prediction
    47954795    if( pcCU->getResPredFlag( 0 ) )
     
    48534853      );
    48544854#endif
    4855 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     4855#if H3D_IVRP && !MTK_MDIVRP_C0138
    48564856    m_pcEntropyCoder->encodeResPredFlag( pcCU, 0, 0, true );
    48574857#endif
     
    49284928  rpcYuvResi->subtract( pcYuvOrg, pcYuvPred, 0, uiWidth );
    49294929#endif
    4930 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     4930#if H3D_IVRP && !MTK_MDIVRP_C0138
    49314931    // subtract residual prediction
    49324932    if( pcCU->getResPredFlag( 0 ) )
     
    49434943#else
    49444944  rpcYuvResi->subtract( pcYuvOrg, pcYuvPred, 0, uiWidth );
    4945 #if HHI_INTER_VIEW_RESIDUAL_PRED
     4945#if H3D_IVRP
    49464946  // add residual prediction
    49474947  if( pcCU->getResPredFlag( 0 ) )
     
    51345134#endif
    51355135  }
    5136 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     5136#if H3D_IVRP && !MTK_MDIVRP_C0138
    51375137  // add residual prediction
    51385138  if( pcCU->getResPredFlag( 0 ) )
     
    61706170      );
    61716171#endif
    6172 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     6172#if H3D_IVRP && !MTK_MDIVRP_C0138
    61736173    m_pcEntropyCoder->encodeResPredFlag( pcCU, 0, 0, true );
    61746174#endif
     
    61976197      );
    61986198#endif
    6199 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     6199#if H3D_IVRP && !MTK_MDIVRP_C0138
    62006200    m_pcEntropyCoder->encodeResPredFlag( pcCU, 0, 0, true );
    62016201#endif
     
    67926792  WedgeList* pacWedgeList = &g_aacWedgeLists[(g_aucConvertToBit[uiWidth])];
    67936793  Dist iDist = RDO_DIST_MAX;
    6794 #if HHIQC_DMMFASTSEARCH_B0039
    67956794  WedgeNodeList* pacWedgeNodeList = &g_aacWedgeNodeLists[(g_aucConvertToBit[uiWidth])];
    67966795  xSearchWedgeFullMinDistFast( pcCU, uiAbsPtIdx, pacWedgeNodeList, pacWedgeList, piOrig, uiStride, uiWidth, uiHeight, ruiTabIdx, iDist );
    6797 #else
    6798   xSearchWedgeFullMinDist( pcCU, uiAbsPtIdx, pacWedgeList, piOrig, uiStride, uiWidth, uiHeight, ruiTabIdx, iDist );
    6799 #endif
    68006796
    68016797  TComWedgelet* pcBestWedgelet = &(pacWedgeList->at(ruiTabIdx));
     
    69086904}
    69096905
    6910 #if HHIQC_DMMFASTSEARCH_B0039
    69116906Void TEncSearch::xSearchWedgeFullMinDistFast( TComDataCU* pcCU, UInt uiAbsPtIdx, WedgeNodeList* pacWedgeNodeList, WedgeList* pacWedgeList, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, Dist& riDist )
    69126907{
     
    70277022  return;
    70287023}
    7029 #endif
    70307024
    70317025Void TEncSearch::xSearchWedgePredDirMinDist( TComDataCU* pcCU, UInt uiAbsPtIdx, WedgeList* pacWedgeList, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, Int& riWedgeDeltaEnd )
     
    71187112  return;
    71197113}
    7120 #endif
     7114#endif //  HHI_DMM_WEDGE_INTRA
     7115
    71217116#if HHI_DMM_PRED_TEX
    71227117Void TEncSearch::findWedgeTexMinDist( TComDataCU*  pcCU,
     
    71717166  delete pcContourWedge;
    71727167}
    7173 #endif
     7168#endif // HHI_DMM_PRED_TEX
    71747169
    71757170#if LGE_EDGE_INTRA_A0070
     
    82718266    iDeltaDC1 = iFullDeltaDC1;
    82728267  }
    8273 #endif
     8268#endif // HHI_VSO
    82748269
    82758270  xDeltaDCQuantScaleDown( pcCU, iDeltaDC0 );
     
    82798274  pcCU->setEdgeDeltaDC1( uiAbsPartIdx, iDeltaDC1 );
    82808275}
    8281 #endif
    8282 #endif
     8276#endif // LGE_EDGE_INTRA_DELTA_DC
     8277#endif // LGE_EDGE_INTRA_A0070
    82838278 
    82848279#if RWTH_SDC_DLT_B0036
     
    83138308    pMask  += uiMaskStride*subSamplePix;
    83148309  }
    8315 #else
     8310#else //HS_REFERENCE_SUBSAMPLE_C0154
    83168311  for (Int y=0; y<uiSize; y++)
    83178312  {
     
    83288323    pMask  += uiMaskStride;
    83298324  }
    8330 #endif
     8325#endif // HS_REFERENCE_SUBSAMPLE_C0154
    83318326  // compute mean for each segment
    83328327  for( UChar ucSeg = 0; ucSeg < uiNumSegments; ucSeg++ )
     
    83388333  }
    83398334}
    8340 #endif
     8335#endif // RWTH_SDC_DLT_B0036
    83418336
    83428337//! \}
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncSearch.h

    r294 r295  
    208208                                );
    209209 
    210 #if HHI_INTER_VIEW_RESIDUAL_PRED
     210#if H3D_IVRP
    211211  /// encode residual and compute rd-cost for inter mode
    212212  Void encodeResAndCalcRdInterCU( TComDataCU* pcCU,
     
    401401                                    UInt&          ruiTabIdx,
    402402                                    Dist&          riDist );
    403 #if HHIQC_DMMFASTSEARCH_B0039
     403
    404404  Void xSearchWedgeFullMinDistFast( TComDataCU*    pcCU,
    405405                                    UInt           uiAbsPtIdx,
     
    412412                                    UInt&          ruiTabIdx,
    413413                                    Dist&          riDist );
    414 #endif
    415414  Void xSearchWedgePredDirMinDist ( TComDataCU*    pcCU,
    416415                                    UInt           uiAbsPtIdx,
     
    422421                                    UInt&          ruiTabIdx,
    423422                                    Int&           riWedgeDeltaEnd );
    424 #endif
     423#endif // HHI_DMM_WEDGE_INTRA
    425424#if HHI_DMM_PRED_TEX
    426425  Void findWedgeTexMinDist        ( TComDataCU*    pcCU,
     
    451450                                    Bool           bAboveAvail,
    452451                                    Bool           bLeftAvail );
    453 #endif
     452#endif // HHI_DMM_PRED_TEX
    454453
    455454  // -------------------------------------------------------------------------------------------------------------------
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncTop.cpp

    r294 r295  
    120120  m_cDepthMapGenerator. create( false, getSourceWidth(), getSourceHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement, PDM_SUB_SAMP_EXP_X(m_uiPredDepthMapGeneration), PDM_SUB_SAMP_EXP_Y(m_uiPredDepthMapGeneration) );
    121121#endif
    122 #if HHI_INTER_VIEW_RESIDUAL_PRED
     122#if H3D_IVRP
    123123  m_cResidualGenerator. create( false, getSourceWidth(), getSourceHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement );
    124124#endif
     
    251251  m_cDepthMapGenerator. destroy();
    252252#endif
    253 #if HHI_INTER_VIEW_RESIDUAL_PRED
     253#if H3D_IVRP
    254254  m_cResidualGenerator. destroy();
    255255#endif
     
    347347#endif
    348348#endif
    349 #if HHI_INTER_VIEW_RESIDUAL_PRED
     349#if H3D_IVRP
    350350  m_cResidualGenerator.init( &m_cTrQuant, &m_cDepthMapGenerator );
    351351#endif
     
    473473
    474474
    475 #if HHI_INTERVIEW_SKIP || H3D_IVMP || HHI_INTER_VIEW_RESIDUAL_PRED
     475#if HHI_INTERVIEW_SKIP || H3D_IVMP || H3D_IVRP
    476476Void
    477477TEncTop::deleteExtraPicBuffers( Int iPoc )
     
    494494    pcPic->removeOrgDepthMapBuffer();
    495495#endif
    496 #if HHI_INTER_VIEW_RESIDUAL_PRED
     496#if H3D_IVRP
    497497    pcPic->removeResidualBuffer   ();
    498498#endif
     
    716716    m_cSPS.setPredDepthMapGeneration( m_viewId, true );
    717717#endif
    718 #if HHI_INTER_VIEW_RESIDUAL_PRED
     718#if H3D_IVRP
    719719    m_cSPS.setMultiviewResPredMode  ( 0 );
    720720#endif
     
    736736#endif
    737737#endif
    738 #if HHI_INTER_VIEW_RESIDUAL_PRED
     738#if H3D_IVRP
    739739      m_cSPS.setMultiviewResPredMode  ( m_uiMultiviewResPredMode );
    740740#endif
     
    745745      m_cSPS.setPredDepthMapGeneration( m_viewId, false );
    746746#endif
    747 #if HHI_INTER_VIEW_RESIDUAL_PRED
     747#if H3D_IVRP
    748748      m_cSPS.setMultiviewResPredMode  ( 0 );
    749749#endif
  • branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncTop.h

    r292 r295  
    103103  TComDepthMapGenerator   m_cDepthMapGenerator;           ///< depth map generator
    104104#endif
    105 #if HHI_INTER_VIEW_RESIDUAL_PRED
     105#if H3D_IVRP
    106106  TComResidualGenerator   m_cResidualGenerator;           ///< generator for residual pictures
    107107#endif
     
    173173    }
    174174  }
    175 #if HHI_INTERVIEW_SKIP || H3D_IVMP || HHI_INTER_VIEW_RESIDUAL_PRED
     175#if HHI_INTERVIEW_SKIP || H3D_IVMP || H3D_IVRP
    176176  Void      deleteExtraPicBuffers   ( Int iPoc );
    177177#endif
     
    234234  TComDepthMapGenerator*  getDepthMapGenerator  () { return  &m_cDepthMapGenerator;   }
    235235#endif
    236 #if HHI_INTER_VIEW_RESIDUAL_PRED
     236#if H3D_IVRP
    237237  TComResidualGenerator*  getResidualGenerator  () { return  &m_cResidualGenerator;   }
    238238#endif
Note: See TracChangeset for help on using the changeset viewer.