Changeset 1525 in SHVCSoftware for branches

Timestamp:

9 Feb 2016, 03:08:50 (9 years ago)

Author:

seregin

Message:

copy list modification information from the precious slice at encoder

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -411 +411 @@
 
 #if SVC_EXTENSION
-  if( m_layerId == 0 || ( m_layerId > 0 && ( m_activeNumILRRefIdx == 0 || !((getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) && (getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA)) ) ) )
+  if( m_layerId == 0 || ( m_layerId > 0 && ( m_activeNumILRRefIdx == 0 || !(m_eNalUnitType >= NAL_UNIT_CODED_SLICE_BLA_W_LP && m_eNalUnitType <= NAL_UNIT_CODED_SLICE_CRA) ) ) )
   {
 #endif
@@ -1000 +1000 @@
   m_pcVPS                      = pSrc->m_pcVPS;
   m_layerId                    = pSrc->m_layerId;
+
+  // SHM: copy inter-layer prediction settings and list modification information from the previous slice. Actually, it can vary on a slice basis, but it is not supported by the current encoder.
   m_activeNumILRRefIdx         = pSrc->m_activeNumILRRefIdx;
   m_interLayerPredEnabledFlag  = pSrc->m_interLayerPredEnabledFlag;
   memcpy( m_interLayerPredLayerIdc, pSrc->m_interLayerPredLayerIdc, sizeof( m_interLayerPredLayerIdc ) );
+  m_RefPicListModification     = pSrc->m_RefPicListModification;
 #endif
   m_pRPS                = pSrc->m_pRPS;