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

Added missing parts of merge.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncTop.cpp

    r651 r653  
    923923#endif
    924924  m_cPPS.setSignHideFlag(getSignHideFlag());
    925   m_cPPS.setDeblockingFilterControlPresentFlag (m_DeblockingFilterControlPresent );
     925  if ( getDeblockingFilterMetric() )
     926  {
     927    m_cPPS.setDeblockingFilterControlPresentFlag (true);
     928    m_cPPS.setDeblockingFilterOverrideEnabledFlag(true);
     929    m_cPPS.setPicDisableDeblockingFilterFlag(false);
     930    m_cPPS.setDeblockingFilterBetaOffsetDiv2(0);
     931    m_cPPS.setDeblockingFilterTcOffsetDiv2(0);
     932  }
     933  else
     934  {
     935    m_cPPS.setDeblockingFilterControlPresentFlag (m_DeblockingFilterControlPresent );
     936  }
    926937  m_cPPS.setLog2ParallelMergeLevelMinus2   (m_log2ParallelMergeLevelMinus2 );
    927938  m_cPPS.setCabacInitPresentFlag(CABAC_INIT_PRESENT_FLAG);
Note: See TracChangeset for help on using the changeset viewer.