Changeset 879 in SHVCSoftware for branches

Timestamp:

28 Aug 2014, 20:58:03 (10 years ago)

Author:

seregin

Message:

unroll layer set init

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (3 diffs)
• TComSlice.h (modified) (1 diff)

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

@@ -2770 +2770 @@
 Void TComVPS::setPredictedLayerIds()
 {
-  for (UInt i = 0; i < getMaxLayers() - 1; i++)
-  {
-    UInt iNuhLId = getLayerIdInNuh(i);
+  for (UInt i = 0; i < m_uiMaxLayers - 1; i++)
+  {
+    UInt iNuhLId = m_layerIdInNuh[i];
     UInt predIdx = 0;
     for (UInt j = iNuhLId + 1; j < MAX_NUM_LAYER_IDS; j++)
     {
-      if (getRecursiveRefLayerFlag(j, iNuhLId))
-      {
-        setPredictedLayerId(i, predIdx, j);
+      if( m_recursiveRefLayerFlag[j][iNuhLId] )
+      {
+        m_predictedLayerId[i][predIdx] = j;
         predIdx++;
       }
     }
-    setNumPredictedLayers(iNuhLId, predIdx);
+    m_numPredictedLayers[iNuhLId] = predIdx;
   }
 }
@@ -2789 +2789 @@
 {
   Bool countedLayerIdxFlag[MAX_NUM_LAYER_IDS];
-
-  for (UInt i = 0; i <= getMaxLayers() - 1; i++)
-  {
-    countedLayerIdxFlag[i] = false;
-  }
+  memset( countedLayerIdxFlag, 0, sizeof(countedLayerIdxFlag) );
 
   Int numIndependentLayers = 0;
 
-  for (UInt i = 0; i <= getMaxLayers() - 1; i++)
-  {
-    UInt iNuhLId = getLayerIdInNuh(i);
-    if (getNumDirectRefLayers(iNuhLId) == 0)
-    {
-      setTreePartitionLayerId(numIndependentLayers, 0, iNuhLId);
-      setNumLayersInTreePartition(numIndependentLayers, 1);
-      for (UInt j = 0; j < getNumPredictedLayers(iNuhLId); j++)
-      {
-        if (!countedLayerIdxFlag[getLayerIdInVps(iNuhLId)])
-        {
-          setTreePartitionLayerId(numIndependentLayers, getNumLayersInTreePartition(numIndependentLayers), getPredictedLayerId(iNuhLId, j));
-          setNumLayersInTreePartition(numIndependentLayers, getNumLayersInTreePartition(numIndependentLayers) + 1);
-          countedLayerIdxFlag[getLayerIdInVps(getPredictedLayerId(iNuhLId, j))] = true;
+  for (UInt i = 0; i < m_uiMaxLayers; i++)
+  {
+    UInt iNuhLId = m_layerIdInNuh[i];
+    if( m_numDirectRefLayers[iNuhLId] == 0 )
+    {
+      m_treePartitionLayerIdList[numIndependentLayers][0] = iNuhLId;
+      m_numLayersInTreePartition[numIndependentLayers] = 1;
+      for( UInt j = 0; j < m_numPredictedLayers[iNuhLId]; j++ )
+      {
+        if( !countedLayerIdxFlag[m_layerIdInVps[iNuhLId]] )
+        {
+          m_treePartitionLayerIdList[numIndependentLayers][m_numLayersInTreePartition[numIndependentLayers]] = m_predictedLayerId[iNuhLId][j];
+          m_numLayersInTreePartition[numIndependentLayers] = m_numLayersInTreePartition[numIndependentLayers] + 1;
+          countedLayerIdxFlag[m_layerIdInVps[m_predictedLayerId[iNuhLId][j]]] = true;
         }
       }
@@ -2817 +2813 @@
   }
 
-  setNumIndependentLayers(numIndependentLayers);
+  m_numIndependentLayers = numIndependentLayers;
 }
 
 void TComVPS::setLayerIdIncludedFlagsForAddLayerSets()
 {
-  for (UInt i = 0; i < getNumAddLayerSets(); i++)
-  {
-    for (UInt j = 1; j < getNumIndependentLayers(); j++)
+  for (UInt i = 0; i < m_numAddLayerSets; i++)
+  {
+    for (UInt j = 1; j < m_numIndependentLayers; j++)
     {
       Int layerNum = 0;
-      Int lsIdx = getVpsNumLayerSetsMinus1() + 1 + i;
+      Int lsIdx = m_vpsNumLayerSetsMinus1 + 1 + i;
       for (Int layerId = 0; layerId < MAX_VPS_LAYER_ID_PLUS1; layerId++)
       {
-        setLayerIdIncludedFlag(false, lsIdx, layerId);
-      }
-      for (Int treeIdx = 1; treeIdx < getNumIndependentLayers(); treeIdx++)
-      {
-        for (Int layerCnt = 0; layerCnt < getHighestLayerIdxPlus1(i, j); layerCnt++)
-        {
-          setLayerSetLayerIdList(lsIdx, layerNum, getTreePartitionLayerId(treeIdx, layerCnt));
-          setLayerIdIncludedFlag(true, lsIdx, getTreePartitionLayerId(treeIdx, layerCnt));
+        m_layerIdIncludedFlag[lsIdx][layerId] = false;
+      }
+      for (Int treeIdx = 1; treeIdx < m_numIndependentLayers; treeIdx++)
+      {
+        for (Int layerCnt = 0; layerCnt < m_highestLayerIdxPlus1[i][j]; layerCnt++)
+        {
+          m_layerSetLayerIdList[lsIdx][layerNum] = m_treePartitionLayerIdList[treeIdx][layerCnt];
+          m_layerIdIncludedFlag[lsIdx][m_treePartitionLayerIdList[treeIdx][layerCnt]] = true;
           layerNum++;
         }
       }
-      setNumLayersInIdList(lsIdx, layerNum);
+      m_numLayerInIdList[lsIdx] = layerNum;
     }
   }

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

@@ -925 +925 @@
 #if DERIVE_LAYER_ID_LIST_VARIABLES
   Int     getLayerSetLayerIdList(Int set, Int layerId)          { return m_layerSetLayerIdList[set][layerId]; }
-  Void    setLayerSetLayerIdList(Int set, Int layerId, Int x)   { m_layerSetLayerIdList[set][layerId] = x   ; }
+  Void    setLayerSetLayerIdList(Int set, Int layerId, Int x)   { m_layerSetLayerIdList[set][layerId] = x;    }
 
   Int     getNumLayersInIdList(Int set)                          { return m_numLayerInIdList[set]; }
-  Void    setNumLayersInIdList(Int set, Int x)                   { m_numLayerInIdList[set] = x   ; }
+  Void    setNumLayersInIdList(Int set, Int x)                   { m_numLayerInIdList[set] = x;    }
 
   Void    deriveLayerIdListVariables();