Changeset 715 in SHVCSoftware for branches

Timestamp:

21 Apr 2014, 18:56:13 (11 years ago)

Author:

seregin

Message:

fix m_numberRefLayers derivation

Location:

branches/SHM-6-dev/source

Files:

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

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

@@ -1320 +1320 @@
 
 #if O0092_0094_DEPENDENCY_CONSTRAINT
-  for(UInt layerCtr = 1;layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
-  {
-    vps->setNumRefLayers(vps->getLayerIdInNuh(layerCtr));   // identify the number of direct and indirect reference layers of current layer and set recursiveRefLayersFlags
-  }
+  vps->setNumRefLayers();
+
   if(vps->getMaxLayers() > MAX_REF_LAYERS)
   {

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

@@ -2526 +2526 @@
 }
 
-Void TComVPS::setNumRefLayers(Int currLayerId)
-{
+Void TComVPS::setNumRefLayers()
+{
+  memset( m_numberRefLayers, 0, sizeof( m_numberRefLayers ) );
+
   for (Int i = 0; i < m_uiMaxLayers; i++)
   {

branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h

@@ -798 +798 @@
   Void    setRecursiveRefLayerFlag(Int currLayerId, Int refLayerId, Bool x)      { m_recursiveRefLayerFlag[currLayerId][refLayerId] = x;   }
   Int     getNumRefLayers(Int currLayerId)                                       { return m_numberRefLayers[currLayerId];                  }
-  Void    setNumRefLayers(Int currLayerId);
+  Void    setNumRefLayers();
 #endif
 #if VPS_RENAME