Changeset 596 in SHVCSoftware for branches/SHM-5.0-dev/source

Timestamp:

2 Feb 2014, 19:30:45 (11 years ago)

Author:

seregin

Message:

fix LayerIdIncludedFlag setting

Location:

branches/SHM-5.0-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)

branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -977 +977 @@
       g_uiPCMBitDepthChroma = m_bPCMInputBitDepthFlag ? m_acLayerCfg[layerId].m_inputBitDepthC : m_acLayerCfg[layerId].m_internalBitDepthC;
 #endif
-      vps->setLayerIdIncludedFlag(true, setId, layerId);
+      if( layerId <= setId )
+      {
+        vps->setLayerIdIncludedFlag(true, setId, layerId);
+      }
+      else
+      {
+        vps->setLayerIdIncludedFlag(false, setId, layerId);
+      }
     }
   }

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

@@ -2189 +2189 @@
   // For other layers
   Int i, m, n;
-  for( i = 1; i <= m_numLayerSets - 1; i++ )
+  for( i = 1; i < m_numLayerSets; i++ )
   {
     n = 0;
@@ -2196 +2196 @@
       if( m_layerIdIncludedFlag[i][m] )
       {
-        m_layerSetLayerIdList[i][n] = m;
-        n++;
+        m_layerSetLayerIdList[i][n++] = m;
       }
     }