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


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/App
Files:
4 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      {
Note: See TracChangeset for help on using the changeset viewer.