Changeset 865 in SHVCSoftware

Timestamp:

13 Aug 2014, 01:39:59 (10 years ago)

Author:

qualcomm

Message:

Derivation of NecessaryLayerFlag (Macro: NECESSARY_LAYER_FLAG)

Derive NecessaryLayerFlag and check the condition specified w.r.t that flag.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComSlice.cpp (modified) (5 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (3 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -1455 +1455 @@
     for( Int olsCtr = 0; olsCtr < vps->getNumLayerSets(); olsCtr ++ ) // Default output layer sets
     {
-      vps->setOutputLayerSetIdx(i, i);
+      vps->setOutputLayerSetIdx(olsCtr, olsCtr);
     }
     for( Int olsCtr = vps->getNumLayerSets(); olsCtr < vps->getNumOutputLayerSets(); olsCtr ++ )  // Non-default output layer sets
     {
-      vps->setOutputLayerSetIdx(i, m_outputLayerSetIdx[olsCtr - vps->getNumLayerSets()]);
+      vps->setOutputLayerSetIdx(olsCtr, m_outputLayerSetIdx[olsCtr - vps->getNumLayerSets()]);
     }
   }
@@ -1551 +1551 @@
   }
 #endif
-
+#if NECESSARY_LAYER_FLAG
+  vps->deriveNecessaryLayerFlag();
+  vps->checkNecessaryLayerFlagCondition();
+#endif
   // Initialize dpb_size_table() for all ouput layer sets in the VPS extension
   for(i = 1; i < vps->getNumOutputLayerSets(); i++)

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

@@ -36 +36 @@
 */
 
+#include <numeric>
 #include "CommonDef.h"
 #include "TComSlice.h"
@@ -2439 +2440 @@
   ::memset(m_directDependencyType, 0, sizeof(m_directDependencyType));
 #endif
+#if !NECESSARY_LAYER_FLAG
 #if DERIVE_LAYER_ID_LIST_VARIABLES
   ::memset(m_layerSetLayerIdList,  0, sizeof(m_layerSetLayerIdList));
   ::memset(m_numLayerInIdList,     0, sizeof(m_numLayerInIdList   )); 
+#endif
 #endif
   ::memset(m_profileLevelTierIdx,  0, sizeof(m_profileLevelTierIdx));
@@ -2562 +2565 @@
 {
   // For layer 0
+#if NECESSARY_LAYER_FLAG
+  m_numLayerInIdList.push_back(1);
+  m_layerSetLayerIdList.resize(m_numLayerSets);
+  m_layerSetLayerIdList[0].push_back(0);
+#else
   m_numLayerInIdList[0] = 1;
   m_layerSetLayerIdList[0][0] = 0;
+#endif
   
   // For other layers
@@ -2574 +2583 @@
       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
   }
 }
@@ -2993 +3010 @@
       hrd->setCbrFlag( i, j, 1, ( j == 0 ) );
     }
+  }
+}
+#endif
+#if NECESSARY_LAYER_FLAG
+Void TComVPS::deriveNecessaryLayerFlag()
+{
+  m_necessaryLayerFlag.empty();
+  m_numNecessaryLayers.empty();
+  // Assumed that output layer sets and variables RecursiveRefLayer are already derived
+  for( Int olsIdx = 0; olsIdx < getNumOutputLayerSets(); olsIdx++)
+  {
+    deriveNecessaryLayerFlag(olsIdx);
+  }
+}
+Void TComVPS::deriveNecessaryLayerFlag(Int const olsIdx)
+{
+  Int lsIdx = this->getOutputLayerSetIdx( olsIdx );
+  Int numLayersInLs = this->getNumLayersInIdList( lsIdx );
+  assert( m_necessaryLayerFlag.size() == olsIdx );   // Function should be called in the correct order.
+  m_necessaryLayerFlag.push_back( std::vector<Bool>( numLayersInLs, false ) ); // Initialize to false
+  for( Int lsLayerIdx = 0; lsLayerIdx < numLayersInLs; lsLayerIdx++ )
+  {
+    if( this->m_outputLayerFlag[olsIdx][lsLayerIdx] )
+    {
+      m_necessaryLayerFlag[olsIdx][lsLayerIdx] = true;
+      Int currNuhLayerId = this->m_layerSetLayerIdList[lsIdx][lsLayerIdx];
+      for( Int rLsLayerIdx = 0; rLsLayerIdx < lsLayerIdx; rLsLayerIdx++ )
+      {
+        Int refNuhLayerId = this->m_layerSetLayerIdList[lsIdx][rLsLayerIdx];
+        if( this->m_recursiveRefLayerFlag[currNuhLayerId][refNuhLayerId] )
+        {
+          m_necessaryLayerFlag[olsIdx][rLsLayerIdx] = true;
+        }
+      }
+    }
+  }
+  m_numNecessaryLayers.push_back(std::accumulate(m_necessaryLayerFlag[olsIdx].begin(), m_necessaryLayerFlag[olsIdx].end(), 0));
+}
+Void TComVPS::checkNecessaryLayerFlagCondition()
+{
+  /* It is a requirement of bitstream conformance that for each layer index layerIdx in the range of 
+  ( vps_base_layer_internal_flag ? 0 : 1 ) to MaxLayersMinus1, inclusive, there shall be at least one OLS with index olsIdx such that 
+  NecessaryLayerFlag[ olsIdx ][ lsLayerIdx ] is equal to 1 for the value of lsLayerIdx 
+  for which LayerSetLayerIdList[ OlsIdxToLsIdx[ olsIdx ] ][ lsLayerIdx ] is equal to layer_id_in_nuh[ layerIdx ]. */
+  for(Int layerIdx = this->getBaseLayerInternalFlag() ? 0 : 1; layerIdx < this->getMaxLayers(); layerIdx++)
+  {
+    Bool layerFoundNecessaryLayerFlag = false;
+    for(Int olsIdx = 0; olsIdx < this->getNumOutputLayerSets(); olsIdx++)
+    {
+      Int lsIdx = this->getOutputLayerSetIdx( olsIdx );
+      Int currNuhLayerId = this->getLayerIdInNuh( layerIdx );
+      std::vector<Int>::iterator iter = std::find( m_layerSetLayerIdList[lsIdx].begin(), m_layerSetLayerIdList[lsIdx].end(), currNuhLayerId );
+      if( iter != m_layerSetLayerIdList[lsIdx].end() ) // Layer present in layer set
+      {
+        size_t positionLayer = iter - m_layerSetLayerIdList[lsIdx].begin();
+        if( *(m_necessaryLayerFlag[olsIdx].begin() + positionLayer) == true )
+        {
+          layerFoundNecessaryLayerFlag = true;
+          break;
+        }
+      }
+    }
+    assert( layerFoundNecessaryLayerFlag );
   }
 }

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

@@ -489 +489 @@
 #if DERIVE_LAYER_ID_LIST_VARIABLES
 #if Q0078_ADD_LAYER_SETS
+#if NECESSARY_LAYER_FLAG
+  std::vector< std::vector<Int> >     m_layerSetLayerIdList;
+  std::vector<Int>                      m_numLayerInIdList;;
+#else
   Int         m_layerSetLayerIdList[MAX_VPS_LAYER_SETS_PLUS1 + MAX_NUM_ADD_LAYER_SETS][MAX_VPS_LAYER_ID_PLUS1];
   Int         m_numLayerInIdList[MAX_VPS_LAYER_SETS_PLUS1 + MAX_NUM_ADD_LAYER_SETS];
+#endif
 #else
   Int         m_layerSetLayerIdList[MAX_VPS_LAYER_SETS_PLUS1][MAX_VPS_LAYER_ID_PLUS1];
@@ -747 +752 @@
 #if RESOLUTION_BASED_DPB
   Int        m_subDpbAssigned            [MAX_VPS_LAYER_SETS_PLUS1][MAX_LAYERS];
+#endif
+#if NECESSARY_LAYER_FLAG
+  std::vector< std::vector<Bool> > m_necessaryLayerFlag;
+  std::vector<Int>               m_numNecessaryLayers;
 #endif
 #endif //SVC_EXTENSION
@@ -1216 +1225 @@
   Void setBspHrdParameters( UInt hrdIdx, UInt frameRate, UInt numDU, UInt bitRate, Bool randomAccess );
 #endif
+#if NECESSARY_LAYER_FLAG
+  Void  deriveNecessaryLayerFlag();
+  Void  deriveNecessaryLayerFlag(Int const olsIdx);
+  Void  checkNecessaryLayerFlagCondition();
+#endif
 #endif //SVC_EXTENSION
 };

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
 #endif
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1467 +1467 @@
 #endif
   vps->setNumOutputLayerSets( numOutputLayerSets );
-
+#if NECESSARY_LAYER_FLAG
+  // Default output layer set
+  vps->setOutputLayerSetIdx(0, 0);
+  vps->setOutputLayerFlag(0, 0, true);
+  vps->deriveNecessaryLayerFlag(0);
+#endif
   for(i = 1; i < numOutputLayerSets; i++)
   {
@@ -1519 +1524 @@
       }
     }
+#if NECESSARY_LAYER_FLAG
+    vps->deriveNecessaryLayerFlag(i);  
+#endif
     Int numBits = 1;
     while ((1 << numBits) < (vps->getNumProfileTierLevel()))
@@ -1547 +1555 @@
 #endif
   }
+#if NECESSARY_LAYER_FLAG
+  vps->checkNecessaryLayerFlagCondition();  
+#endif
 #else
   if( numOutputLayerSets > 1 )

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

@@ -831 +831 @@
     }
   }
+#if !NECESSARY_FLAG   // Already called once in TAppEncTop.cpp
 #if DERIVE_LAYER_ID_LIST_VARIABLES
   pcVPS->deriveLayerIdListVariables();
+#endif
 #endif
   TimingInfo *timingInfo = pcVPS->getTimingInfo();