Changeset 870 in SHVCSoftware

Timestamp:

14 Aug 2014, 00:08:31 (11 years ago)

Author:

seregin

Message:

fix compiler warning

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -2608 +2608 @@
 }
 #if DERIVE_LAYER_ID_LIST_VARIABLES
+#if NECESSARY_LAYER_FLAG
 Void TComVPS::deriveLayerIdListVariables()
 {
   // For layer 0
-#if NECESSARY_LAYER_FLAG
   m_numLayerInIdList.push_back(1);
   m_layerSetLayerIdList.resize(m_numLayerSets);
   m_layerSetLayerIdList[0].push_back(0);
-#else
+  
+  // For other layers
+  for( Int i = 1; i < m_numLayerSets; i++ )
+  {
+    for( Int m = 0; m <= m_maxLayerId; m++)
+    {
+      if( m_layerIdIncludedFlag[i][m] )
+      {
+        m_layerSetLayerIdList[i].push_back(m);
+      }
+    }
+    m_numLayerInIdList.push_back(m_layerSetLayerIdList[i].size());
+  }
+}
+#else
+Void TComVPS::deriveLayerIdListVariables()
+{
+  // For layer 0
   m_numLayerInIdList[0] = 1;
   m_layerSetLayerIdList[0][0] = 0;
-#endif
   
   // For other layers
@@ -2629 +2645 @@
       if( m_layerIdIncludedFlag[i][m] )
       {
-#if NECESSARY_LAYER_FLAG
-        m_layerSetLayerIdList[i].push_back(m);
-#else
         m_layerSetLayerIdList[i][n++] = m;
-#endif
-      }
-    }
-#if NECESSARY_LAYER_FLAG
-    m_numLayerInIdList.push_back(m_layerSetLayerIdList[i].size());
-#else
+      }
+    }
     m_numLayerInIdList[i] = n;
-#endif
-  }
-}
+  }
+}
+#endif
 #endif
 #if !RESOLUTION_BASED_DPB

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -56 +56 @@
 #if PTL_SIGNALLING
 #define LIST_OF_PTL                      1      ///< JCTVC-R0272: Signalling the PTL for the 0-th OLS
-#define NECESSARY_LAYER_FLAG                   1      ////< Derivation of NecessaryLayerFlag
+#define NECESSARY_LAYER_FLAG             1      ////< Derivation of NecessaryLayerFlag
 #define PER_LAYER_PTL                    1      ///< Signal profile-tier-level information for each layer.
 #endif