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


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

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

Location:
branches/HTM-5.1-dev0/source/Lib/TLibCommon
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.