Changeset 1385 in SHVCSoftware

Timestamp:

31 Jul 2015, 22:59:44 (9 years ago)

Author:

seregin

Message:

build the list and check for layers needed to be decoded

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecTop.cpp (modified) (5 diffs)
• TDecTop.h (modified) (1 diff)

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

@@ -54 +54 @@
 Int   TDecTop::m_crossLayerPocResetPeriodId    = -1;
 Int   TDecTop::m_crossLayerPocResetIdc         = -1;
+std::vector<UInt> TDecTop::m_targetDecLayerIdList; // list of layers to be decoded according to the OLS index
 #endif
 
@@ -1956 +1957 @@
   if( nalu.m_nuhLayerId == 63 )
   {  
+    return false;
+  }
+
+  // skip NAL units of the layers not needed to be decoded specified by OLS
+  if( nalu.m_nalUnitType != NAL_UNIT_VPS && nalu.m_nalUnitType != NAL_UNIT_SPS && nalu.m_nalUnitType != NAL_UNIT_PPS &&
+      m_targetDecLayerIdList.size() && std::find( m_targetDecLayerIdList.begin(), m_targetDecLayerIdList.end(), nalu.m_nuhLayerId ) == m_targetDecLayerIdList.end() )
+  {
     return false;
   }
@@ -2382 +2390 @@
     if( vps->getOutputLayerFlag( targetOlsIdx, i ) )
     {
-      this->getLayerDec( vps->getLayerSetLayerIdList( targetLsIdx, i ) )->m_isOutputLayerFlag = true;
+      m_ppcTDecTop[vps->getLayerSetLayerIdList( targetLsIdx, i )]->m_isOutputLayerFlag = true;
     }
   }
@@ -2520 +2528 @@
   assert( targetOlsIdx >= 0 );
 
+  // list of layers to be decoded is not built yet
+  m_targetDecLayerIdList.resize(0);
+
   UInt targetDecLayerSetIdx = vps->getOutputLayerSetIdx(targetOlsIdx);
   UInt lsIdx = targetDecLayerSetIdx;
-  UInt targetDecLayerIdList[MAX_LAYERS] = {0};
-
-  for (UInt i = 0, j = 0; i < vps->getNumLayersInIdList(lsIdx); i++)
+  
+  for (UInt i = 0; i < vps->getNumLayersInIdList(lsIdx); i++)
   {
     if (vps->getNecessaryLayerFlag(targetOlsIdx, i))
     {
-      targetDecLayerIdList[j++] = vps->getLayerSetLayerIdList(lsIdx, i);
+      m_targetDecLayerIdList.push_back( vps->getLayerSetLayerIdList(lsIdx, i) );
     }
   }
@@ -2542 +2552 @@
   else
   {
-    smallestLayerId = targetDecLayerIdList[0];
+    smallestLayerId = m_targetDecLayerIdList[0];
   }
 

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -162 +162 @@
 #endif
   Bool                    m_isOutputLayerFlag;
+  static std::vector<UInt> m_targetDecLayerIdList; // list of layers to be decoded according to the OLS index
 #endif //SVC_EXTENSION