Changeset 253 in 3DVCSoftware for branches/HTM-5.1-dev1-LG/source/App


Ignore:
Timestamp:
4 Feb 2013, 02:57:15 (12 years ago)
Author:
lg
Message:

Integration of JCT3V-C0046

Location:
branches/HTM-5.1-dev1-LG/source/App/TAppEncoder
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev1-LG/source/App/TAppEncoder/TAppEncCfg.cpp

    r210 r253  
    340340  ("LoopFilterTcOffset_div2", m_loopFilterTcOffsetDiv2, 0 )
    341341#if LGE_ILLUCOMP_B0045
     342#if LGE_ILLUCOMP_DEPTH_C0046
     343  ("IlluCompEnable", m_abUseIC, std::vector<Bool>(2, true), "Enable illumination compensation for inter-view prediction")
     344#else
    342345  ("IlluCompEnable",                  m_bUseIC                  , true         , "Use illumination compensation for inter-view prediction" )
     346#endif
    343347#endif
    344348#if DBL_CONTROL
     
    18041808#endif
    18051809#if LGE_ILLUCOMP_B0045
     1810#if LGE_ILLUCOMP_DEPTH_C0046
     1811  printf("IlluCompEnable: %d %d", m_abUseIC[0] ? 1 : 0, m_abUseIC[1] ? 1 : 0);
     1812#else
    18061813  printf("IlluCompEnable: %d ", m_bUseIC);
     1814#endif
    18071815#endif
    18081816
  • branches/HTM-5.1-dev1-LG/source/App/TAppEncoder/TAppEncCfg.h

    r210 r253  
    170170  vector<Bool> m_abUseSAO;
    171171#if LGE_ILLUCOMP_B0045
     172#if LGE_ILLUCOMP_DEPTH_C0046
     173  vector<Bool> m_abUseIC;                                    ///< flag for using illumination compensation for inter-view prediction
     174#else
    172175  Bool      m_bUseIC;                                     ///< flag for using illumination compensation for inter-view prediction
     176#endif
    173177#endif
    174178#if SAO_UNIT_INTERLEAVING
  • branches/HTM-5.1-dev1-LG/source/App/TAppEncoder/TAppEncTop.cpp

    r210 r253  
    315315    m_acTEncTopList[iViewIdx]->setUseSAO               ( m_abUseSAO[0]     );
    316316#if LGE_ILLUCOMP_B0045
     317#if LGE_ILLUCOMP_DEPTH_C0046
     318    m_acTEncTopList[iViewIdx]->setUseIC                ( m_abUseIC[0]      );
     319#else
    317320    m_acTEncTopList[iViewIdx]->setUseIC                ( m_bUseIC          );
     321#endif
    318322#endif
    319323#if SAO_UNIT_INTERLEAVING
     
    637641      m_acTEncDepthTopList[iViewIdx]->setUseSAO               ( m_abUseSAO[1]     );
    638642#if LGE_ILLUCOMP_B0045
     643#if LGE_ILLUCOMP_DEPTH_C0046
     644      m_acTEncDepthTopList[iViewIdx]->setUseIC                ( m_abUseIC[1] );
     645#else
    639646      m_acTEncDepthTopList[iViewIdx]->setUseIC                ( false     );
     647#endif
    640648#endif
    641649#if SAO_UNIT_INTERLEAVING
Note: See TracChangeset for help on using the changeset viewer.