Changeset 650 in 3DVCSoftware


Ignore:
Timestamp:
21 Oct 2013, 11:18:36 (11 years ago)
Author:
tech
Message:

Fixed H_3D_FAST_TEXTURE_ENCODING macro.

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

Legend:

Unmodified
Added
Removed

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

    r648 r650  
    58695869}
    58705870#endif
    5871 #if  H_3D_FAST_TEXTURE_ENCODIN
     5871#if  H_3D_FAST_TEXTURE_ENCODING
    58725872Void
    58735873TComDataCU::getIVNStatus       ( UInt uiPartIdx,  DisInfo* pDInfo, Bool& bIVFMerge, Int& iIVFMaxD)

  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.h

    r647 r650  
    498498#endif //H_3D_NBDV_REF
    499499#endif
    500 #if  H_3D_FAST_TEXTURE_ENCODIN
     500#if  H_3D_FAST_TEXTURE_ENCODING
    501501  Void          getIVNStatus       ( UInt uiPartIdx,  DisInfo* pDInfo, Bool& bIVFMerge,  Int& iIVFMaxD);
    502502#endif

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

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

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

    r647 r650  
    160160
    161161#if AMP_MRG
    162 #if  H_3D_FAST_TEXTURE_ENCODIN
     162#if  H_3D_FAST_TEXTURE_ENCODING
    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/TEncSearch.cpp

    r647 r650  
    37033703 */
    37043704#if AMP_MRG
    3705 #if  H_3D_FAST_TEXTURE_ENCODIN
     3705#if  H_3D_FAST_TEXTURE_ENCODING
    37063706Void TEncSearch::predInterSearch( TComDataCU* pcCU, TComYuv* pcOrgYuv, TComYuv*& rpcPredYuv, TComYuv*& rpcResiYuv, TComYuv*& rpcRecoYuv, Bool bFMD, Bool bUseRes, Bool bUseMRG )
    37073707#else
    … …  
    38153815#if AMP_MRG
    38163816    Bool bTestNormalMC = true;
    3817 #if  H_3D_FAST_TEXTURE_ENCODIN
     3817#if  H_3D_FAST_TEXTURE_ENCODING
    38183818    if (bFMD||( bUseMRG && pcCU->getWidth( 0 ) > 8 && iNumPart == 2 ))
    38193819#else           

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

    r647 r650  
    196196                                  TComYuv*&   rpcResiYuv,
    197197                                  TComYuv*&   rpcRecoYuv,
    198 #if H_3D_FAST_TEXTURE_ENCODIN
     198#if H_3D_FAST_TEXTURE_ENCODING
    199199                                  Bool        bFMD,
    200200#endif
Note: See TracChangeset for help on using the changeset viewer.