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

Macro removal part 2.

Location:
branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.cpp

    r646 r647  
    517517  if(!bSliceEnd && !bSliceStart && bInsidePicture )
    518518  {
    519 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     519#if  H_3D_FAST_TEXTURE_ENCODIN
    520520    Bool bIVFMerge = false;
    521521    Int  iIVFMaxD = 0;
    … …  
    588588        }
    589589      }
    590 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     590#if  H_3D_FAST_TEXTURE_ENCODIN
    591591      if(rpcTempCU->getSlice()->getViewIndex() && !rpcTempCU->getSlice()->getIsDepth())
    592592      {
    … …  
    612612          rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
    613613#endif
    614 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     614#if  H_3D_FAST_TEXTURE_ENCODIN
    615615          xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bFMD );  rpcTempCU->initEstData( uiDepth, iQP );//by Competition for inter_2Nx2N
    616616#else
    … …  
    626626#endif
    627627        xCheckRDCostMerge2Nx2N( rpcBestCU, rpcTempCU, &earlyDetectionSkipMode );//by Merge for inter_2Nx2N
    628 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     628#if  H_3D_FAST_TEXTURE_ENCODIN
    629629        bFMD = bIVFMerge && rpcBestCU->isSkipped(0);
    630630#endif
    … …  
    652652            rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
    653653#endif
    654 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     654#if  H_3D_FAST_TEXTURE_ENCODIN
    655655            xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bFMD );  rpcTempCU->initEstData( uiDepth, iQP );
    656656#else
    … …  
    760760                )
    761761              {
    762 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     762#if  H_3D_FAST_TEXTURE_ENCODIN
    763763                xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_NxN, bFMD  );
    764764#else
    … …  
    780780            )
    781781          {
    782 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     782#if  H_3D_FAST_TEXTURE_ENCODIN
    783783            xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_Nx2N, bFMD  );
    784784#else
    … …  
    800800            )
    801801          {
    802 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     802#if  H_3D_FAST_TEXTURE_ENCODIN
    803803            xCheckRDCostInter      ( rpcBestCU, rpcTempCU, SIZE_2NxN, bFMD  );
    804804#else
    … …  
    839839                )
    840840              {
    841 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     841#if  H_3D_FAST_TEXTURE_ENCODIN
    842842                xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU, bFMD );
    843843#else
    … …  
    859859                )
    860860              {
    861 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     861#if  H_3D_FAST_TEXTURE_ENCODIN
    862862                xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD, bFMD );
    863863#else
    … …  
    883883                )
    884884              {
    885 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     885#if  H_3D_FAST_TEXTURE_ENCODIN
    886886                xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU, bFMD, true );
    887887#else
    … …  
    903903                )
    904904              {
    905 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     905#if  H_3D_FAST_TEXTURE_ENCODIN
    906906                xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD, bFMD, true );
    907907#else
    … …  
    929929                )
    930930              {
    931 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     931#if  H_3D_FAST_TEXTURE_ENCODIN
    932932                xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nLx2N, bFMD );
    933933#else
    … …  
    949949                )
    950950              {
    951 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     951#if  H_3D_FAST_TEXTURE_ENCODIN
    952952                xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nRx2N, bFMD );
    953953#else
    … …  
    969969                )
    970970              {
    971 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     971#if  H_3D_FAST_TEXTURE_ENCODIN
    972972                xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nLx2N, bFMD, true );
    973973#else
    … …  
    989989                )
    990990              {
    991 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     991#if  H_3D_FAST_TEXTURE_ENCODIN
    992992                xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nRx2N, bFMD, true );
    993993#else
    … …  
    10401040#endif
    10411041        }
    1042 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     1042#if  H_3D_FAST_TEXTURE_ENCODIN
    10431043        if(!bFMD)
    10441044        {
    … …  
    11221122          }
    11231123        }
    1124 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     1124#if  H_3D_FAST_TEXTURE_ENCODIN
    11251125        }
    11261126#endif
    … …  
    11671167      bSubBranch = true;
    11681168    }
    1169 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     1169#if  H_3D_FAST_TEXTURE_ENCODIN
    11701170    if(rpcBestCU->getSlice()->getViewIndex() && !rpcBestCU->getSlice()->getIsDepth() && (uiDepth >=iIVFMaxD) && rpcBestCU->isSkipped(0))
    11711171    {
    … …  
    20442044
    20452045#if AMP_MRG
    2046 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     2046#if  H_3D_FAST_TEXTURE_ENCODIN
    20472047Void TEncCu::xCheckRDCostInter( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize, Bool bFMD, Bool bUseMRG)
    20482048#else
    … …  
    20532053#endif
    20542054{
    2055 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     2055#if  H_3D_FAST_TEXTURE_ENCODIN
    20562056  if(!(bFMD && (ePartSize == SIZE_2Nx2N)))  //have  motion estimation or merge check
    20572057  {
    … …  
    21302130#if AMP_MRG
    21312131  rpcTempCU->setMergeAMP (true);
    2132 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     2132#if  H_3D_FAST_TEXTURE_ENCODIN
    21332133  m_pcPredSearch->predInterSearch ( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcRecoYuvTemp[uhDepth], bFMD, false, bUseMRG );
    21342134#else
    … …  
    22452245  }
    22462246#endif
    2247 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     2247#if  H_3D_FAST_TEXTURE_ENCODIN
    22482248  }
    22492249#endif

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.h

    r639 r647  
    160160
    161161#if AMP_MRG
    162 #if  MTK_FAST_TEXTURE_ENCODING_E0173
     162#if  H_3D_FAST_TEXTURE_ENCODIN
    163163  Void  xCheckRDCostInter   ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize,  Bool bFMD, Bool bUseMRG = false  ) ;
    164164#else

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncGOP.cpp

    r646 r647  
    917917
    918918    // SAIT_VSO_EST_A0033
    919 #if H_3D_FCO_E0163
     919#if H_3D_FCO
    920920    Bool flagRec;
    921921    flagRec =  ((m_pcEncTop->getIvPicLists()->getPicYuv( pcSlice->getViewIndex(), false, pcSlice->getPOC(), true) == NULL) ? false: true);
    … …  
    11871187        pcPic->setNumDdvCandPics(pcPic->getDisCandRefPictures(iColPoc));
    11881188      }
     1189#endif
    11891190#if H_3D
    11901191      pcSlice->setDepthToDisparityLUTs();
    11911192
    11921193#endif
    1193 #endif
    1194 #if MTK_NBDV_TN_FIX_E0172
     1194
     1195#if H_3D_NBDV
    11951196      if(pcSlice->getViewIndex() && !pcSlice->getIsDepth() && !pcSlice->isIntra()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.
    11961197      {
    11971198        pcPic->checkTemporalIVRef();
    11981199      }
    1199 #endif
    1200 #if MTK_TEXTURE_MRGCAND_BUGFIX_E0182
     1200
    12011201      if(pcSlice->getIsDepth())
    12021202      {
    … …  
    19301930          digestStr = digestToString(sei_recon_picture_digest.digest, 4);
    19311931        }
    1932 #if H_MV_FIX_LID_PIC_HASH_SEI_T40
     1932#if H_MV
    19331933        OutputNALUnit nalu(NAL_UNIT_SUFFIX_SEI, pcSlice->getTLayer(), getLayerId() );
    19341934#else

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSbac.cpp

    r646 r647  
    12741274    case DMM4_IDX: codeIdx = 4; break;
    12751275    case DMM3_IDX: codeIdx = 5; break;
    1276 #if LGE_SDC_REMOVE_DC_E0158
    12771276    case  RBC_IDX: codeIdx = 6; break;
    1278 #else
    1279     case  RBC_IDX: codeIdx = 7; break;
    1280 #endif
    12811277    default:                    break;
    12821278    }
    … …  
    12891285    {
    12901286      case PLANAR_IDX:  codeIdx = 0; break;
    1291 #if !LGE_SDC_REMOVE_DC_E0158
    1292       case DC_IDX:      codeIdx = 6; break;
    1293 #endif
    12941287      default:          codeIdx = 2; break;
    12951288    }

  • 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

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.h

    r646 r647  
    196196                                  TComYuv*&   rpcResiYuv,
    197197                                  TComYuv*&   rpcRecoYuv,
    198 #if MTK_FAST_TEXTURE_ENCODING_E0173
     198#if H_3D_FAST_TEXTURE_ENCODIN
    199199                                  Bool        bFMD,
    200200#endif
    … …  
    352352  Void xSearchDmmDeltaDCs         ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piOrig, Pel* piPredic, UInt uiStride, Bool* biSegPattern, Int patternStride, UInt uiWidth, UInt uiHeight, Pel& rDeltaDC1, Pel& rDeltaDC2 );
    353353  Void xSearchDmm1Wedge           ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx );
    354 #if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
    355354  Void xSearchDmm3Wedge           ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, UInt& ruiIntraTabIdx, UInt colTexIntraDir );
    356 #else
    357   Void xSearchDmm3Wedge           ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, UInt& ruiIntraTabIdx );
    358 #endif
    359355#endif
    360356#if H_3D_DIM_RBC
Note: See TracChangeset for help on using the changeset viewer.