Ignore:
Timestamp:
19 Oct 2013, 17:30:33 (11 years ago)
Author:
tech
Message:

Macro removal part 2.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.cpp

    r646 r647  
    28432843    {
    28442844
    2845 #if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
     2845#if H_3D_FAST_DEPTH_INTRA
    28462846      Int  threshold    = max(((pcCU->getQP(0))>>3)-1,3);
    28472847      Int  varThreshold = (Int)( threshold * threshold - 8 );
     
    28512851#if H_3D_DIM_DMM
    28522852      if( m_pcEncCfg->getUseDMM()
    2853 #if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
     2853#if H_3D_FAST_DEPTH_INTRA
    28542854         && (uiRdModeList[0] != PLANAR_IDX || varCU >= varThreshold)
    28552855#endif
     
    28582858        for( UInt dmmType = 0; dmmType < DMM_NUM_TYPE; dmmType++ )
    28592859        {
    2860 #if H_3D_FCO_E0163
     2860#if H_3D_FCO
    28612861            TComPic* picTexture  = pcCU->getSlice()->getIvPic(false, pcCU->getSlice()->getViewIndex() );
    28622862            if ( !picTexture->getReconMark() && (DMM3_IDX == dmmType || DMM4_IDX == dmmType ) )
     
    28782878          case( DMM3_IDX ):
    28792879            {
    2880 #if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
     2880
    28812881              TComPic*      pcPicTex = pcCU->getSlice()->getTexturePic();
    28822882              TComDataCU* pcColTexCU = pcPicTex->getCU( pcCU->getAddr() );
     
    28862886              if( uiColTexIntraDir > DC_IDX && uiColTexIntraDir < 35 )
    28872887              {
    2888 #endif
    2889               UInt uiIntraTabIdx = 0;
    2890 #if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
     2888             UInt uiIntraTabIdx = 0;
    28912889              xSearchDmm3Wedge( pcCU, uiPartOffset, piOrg, uiStride, uiWidth, uiHeight, uiTabIdx, uiIntraTabIdx, uiColTexIntraDir );
    2892 #else
    2893               xSearchDmm3Wedge( pcCU, uiPartOffset, piOrg, uiStride, uiWidth, uiHeight, uiTabIdx, uiIntraTabIdx );
    2894 #endif
    28952890              pcCU->setDmmWedgeTabIdxSubParts( uiTabIdx, dmmType, uiPartOffset, uiDepth + uiInitTrDepth );
    28962891              pcCU->setDmm3IntraTabIdxSubParts( uiIntraTabIdx, uiPartOffset, uiDepth + uiInitTrDepth );
    28972892              biSegmentation = &(g_dmmWedgeLists[(g_aucConvertToBit[uiWidth])][uiTabIdx]);
    2898 #if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
    28992893              }
    2900 #endif
    29012894            } break;
    29022895          case( DMM4_IDX ):
     
    29272920#if H_3D_DIM_RBC
    29282921      if( m_pcEncCfg->getUseRBC()
    2929 #if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
     2922#if H_3D_FAST_DEPTH_INTRA
    29302923          && (uiRdModeList[0] != PLANAR_IDX || varCU >= varThreshold)
    29312924#endif
     
    37103703 */
    37113704#if AMP_MRG
    3712 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     3705#if  H_3D_FAST_TEXTURE_ENCODIN
    37133706Void TEncSearch::predInterSearch( TComDataCU* pcCU, TComYuv* pcOrgYuv, TComYuv*& rpcPredYuv, TComYuv*& rpcResiYuv, TComYuv*& rpcRecoYuv, Bool bFMD, Bool bUseRes, Bool bUseMRG )
    37143707#else
     
    38223815#if AMP_MRG
    38233816    Bool bTestNormalMC = true;
    3824 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     3817#if  H_3D_FAST_TEXTURE_ENCODIN
    38253818    if (bFMD||( bUseMRG && pcCU->getWidth( 0 ) > 8 && iNumPart == 2 ))
    38263819#else           
     
    73077300}
    73087301
    7309 #if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
    73107302Void TEncSearch::xSearchDmm3Wedge( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, UInt& ruiIntraTabIdx, UInt colTexIntraDir )
    73117303{
     
    73447336  cPredYuv.destroy();
    73457337}
    7346 #else
    7347 Void TEncSearch::xSearchDmm3Wedge( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, UInt& ruiIntraTabIdx )
    7348 {
    7349   ruiTabIdx       = 0;
    7350   ruiIntraTabIdx  = 0;
    7351 
    7352   // local pred buffer
    7353   TComYuv cPredYuv;
    7354   cPredYuv.create( uiWidth, uiHeight );
    7355   cPredYuv.clear();
    7356   Pel* piPred = cPredYuv.getLumaAddr();
    7357   UInt uiPredStride = cPredYuv.getStride();
    7358 
    7359   // wedge search
    7360   UInt uiBestDist = MAX_UINT;
    7361   WedgeList* pacWedgeList = &g_dmmWedgeLists[(g_aucConvertToBit[uiWidth])];
    7362   Pel refDC1 = 0; Pel refDC2 = 0;
    7363 
    7364   TComPic*      pcPicTex = pcCU->getSlice()->getTexturePic();
    7365   assert( pcPicTex != NULL );
    7366   TComDataCU* pcColTexCU = pcPicTex->getCU(pcCU->getAddr());
    7367   UInt      uiTexPartIdx = pcCU->getZorderIdxInCU() + uiAbsPtIdx;
    7368   Int   uiColTexIntraDir = pcColTexCU->isIntra( uiTexPartIdx ) ? pcColTexCU->getLumaIntraDir( uiTexPartIdx ) : 255;
    7369 
    7370   std::vector< std::vector<UInt> > pauiWdgLstSz = g_aauiWdgLstM3[g_aucConvertToBit[uiWidth]];
    7371   if( uiColTexIntraDir > DC_IDX && uiColTexIntraDir < 35 )
    7372   {
    7373     std::vector<UInt>* pauiWdgLst = &pauiWdgLstSz[uiColTexIntraDir-2];
    7374     for( UInt uiIdxW = 0; uiIdxW < pauiWdgLst->size(); uiIdxW++ )
    7375     {
    7376       UInt uiIdx     =   pauiWdgLst->at(uiIdxW);
    7377       TComWedgelet* pcWedgelet = &(pacWedgeList->at(uiIdx));
    7378       xCalcBiSegDCs  ( piRef,  uiRefStride,  pcWedgelet->getPattern(), pcWedgelet->getStride(), refDC1, refDC2 );
    7379       xAssignBiSegDCs( piPred, uiPredStride, pcWedgelet->getPattern(), pcWedgelet->getStride(), refDC1, refDC2 );
    7380 
    7381       UInt uiActDist = m_pcRdCost->getDistPart( g_bitDepthY, piPred, uiPredStride, piRef, uiRefStride, uiWidth, uiHeight, TEXT_LUMA, DF_SAD );
    7382       if( uiActDist < uiBestDist || uiBestDist == MAX_UINT )
    7383       {
    7384         uiBestDist     = uiActDist;
    7385         ruiTabIdx      = uiIdx;
    7386         ruiIntraTabIdx = uiIdxW;
    7387       }
    7388     }
    7389   }
    7390   else
    7391   {
    7392     WedgeNodeList* pacWedgeNodeList = &g_dmmWedgeNodeLists[(g_aucConvertToBit[uiWidth])];
    7393     UInt uiBestNodeDist = MAX_UINT;
    7394     UInt uiBestNodeId   = 0;
    7395     for( UInt uiNodeId = 0; uiNodeId < pacWedgeNodeList->size(); uiNodeId++ )
    7396     {
    7397       TComWedgelet* pcWedgelet = &(pacWedgeList->at(pacWedgeNodeList->at(uiNodeId).getPatternIdx()));
    7398       xCalcBiSegDCs  ( piRef,  uiRefStride,  pcWedgelet->getPattern(), pcWedgelet->getStride(), refDC1, refDC2 );
    7399       xAssignBiSegDCs( piPred, uiPredStride, pcWedgelet->getPattern(), pcWedgelet->getStride(), refDC1, refDC2 );
    7400 
    7401       UInt uiActDist = m_pcRdCost->getDistPart( g_bitDepthY, piPred, uiPredStride, piRef, uiRefStride, uiWidth, uiHeight, TEXT_LUMA, DF_SAD );
    7402       if( uiActDist < uiBestNodeDist || uiBestNodeDist == MAX_UINT )
    7403       {
    7404         uiBestNodeDist = uiActDist;
    7405         uiBestNodeId   = uiNodeId;
    7406         ruiIntraTabIdx = uiNodeId;
    7407       }
    7408     }
    7409     ruiTabIdx = pacWedgeNodeList->at(uiBestNodeId).getPatternIdx();
    7410   }
    7411 
    7412   cPredYuv.destroy();
    7413 }
    7414 #endif
     7338
    74157339#endif
    74167340#if H_3D_DIM_RBC
Note: See TracChangeset for help on using the changeset viewer.