Changeset 1039 in SHVCSoftware for branches/SHM-dev

Timestamp:

2 Mar 2015, 19:26:17 (10 years ago)

Author:

interdigital

Message:

1. fixed if statement with fixed "m_layerId == 1" as test condition
2. fixed assert bug of O0092_0094_DEPENDENCY_CONSTRAINT which mistakenly use PPS Id instead of PPS layer_id for constraint check.

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (4 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -960 +960 @@
 
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE
-    if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && ((m_layerId == 1 && pocCurr < m_pcEncTop->getAdaptiveResolutionChange()) ||
+    if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && ((m_layerId > 0 && pocCurr < m_pcEncTop->getAdaptiveResolutionChange()) ||
                                                           (m_layerId == 0 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())) )
     {
@@ -1182 +1182 @@
 #endif
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE
-    if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && m_layerId == 1 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())
+    if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && m_layerId > 0 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())
     {
       pcSlice->setActiveNumILRRefIdx(0);
@@ -2371 +2371 @@
 #if AVC_BASE
 #if VPS_AVC_BL_FLAG_REMOVAL
-      if( ( m_layerId == 1 && m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) )
-#else
-      if( ( m_layerId == 1 && m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) )
+      if( ( m_layerId > 0 && m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) )
+#else
+      if( ( m_layerId > 0 && m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) )
 #endif
 #else
@@ -2459 +2459 @@
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
 #if O0092_0094_DEPENDENCY_CONSTRAINT
-      assert( pcSlice->getPPS()->getPPSId() == 0 || pcSlice->getPPS()->getPPSId() == m_layerId || m_pcEncTop->getVPS()->getRecursiveRefLayerFlag(m_layerId, pcSlice->getPPS()->getPPSId()) );
+      assert( pcSlice->getPPS()->getLayerId() == 0 || pcSlice->getPPS()->getLayerId() == m_layerId || m_pcEncTop->getVPS()->getRecursiveRefLayerFlag(m_layerId, pcSlice->getPPS()->getLayerId()) );
 #endif
 #if Q0048_CGS_3D_ASYMLUT