Changeset 332 in 3DVCSoftware for trunk/source/App


Ignore:
Timestamp:
21 Apr 2013, 19:13:11 (11 years ago)
Author:
tech
Message:

Merged branch 6.1-Cleanup@329.

Location:
trunk/source/App/TAppEncoder
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/App/TAppEncoder/TAppEncCfg.cpp

    r296 r332  
    368368#endif
    369369
    370 #if OL_QTLIMIT_PREDCODING_B0068
     370#if H3D_QTL
    371371  ("QTLPC",                           m_bUseQTLPC               , true         , "Use depth Quadtree Limitation + Predictive Coding" )
    372372#endif
     
    16951695  printf("WVSO:%d ", m_bUseWVSO );
    16961696#endif
    1697 #if OL_QTLIMIT_PREDCODING_B0068
     1697#if H3D_QTL
    16981698  printf("QTLPC:%d ", m_bUseQTLPC);
    16991699#endif
  • trunk/source/App/TAppEncoder/TAppEncCfg.h

    r296 r332  
    313313#endif
    314314
    315 #if OL_QTLIMIT_PREDCODING_B0068
     315#if H3D_QTL
    316316  Bool      m_bUseQTLPC;                                      ///< flag for using depth QuadTree Limitation + Predictive Coding
    317317#endif
  • trunk/source/App/TAppEncoder/TAppEncTop.cpp

    r313 r332  
    357357    m_acTEncTopList[iViewIdx]->setUseDMM                     ( false );
    358358#endif
    359 #if OL_QTLIMIT_PREDCODING_B0068
     359#if H3D_QTL
    360360    m_acTEncTopList[iViewIdx]->setUseQTLPC                   ( false );
    361361#endif
     
    595595      m_acTEncDepthTopList[iViewIdx]->setUseSAO               ( m_abUseSAO[1]     );
    596596#if LGE_ILLUCOMP_B0045
     597#if LGE_ILLUCOMP_DEPTH_C0046
     598      m_acTEncDepthTopList[iViewIdx]->setUseIC                ( m_abUseIC[1] );
     599#else
    597600      m_acTEncDepthTopList[iViewIdx]->setUseIC                ( false     );
     601#endif
    598602#endif
    599603#if INTER_VIEW_VECTOR_SCALING_C0115
     
    659663#endif
    660664
    661 #if OL_QTLIMIT_PREDCODING_B0068
     665#if H3D_QTL
    662666    m_acTEncDepthTopList[iViewIdx]->setUseQTLPC                   (m_bUseQTLPC);
    663667#endif
Note: See TracChangeset for help on using the changeset viewer.