Changeset 410 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

Timestamp:

8 Oct 2013, 02:34:31 (11 years ago)

Author:

qualcomm

Message:

Integration of N0147 and removal of IDR_ALIGNMENT (as per N0373)

File:

• branches/SHM-3.1-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)

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

@@ -1110 +1110 @@
     if(  m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
     {
-      if(pcSlice->isIRAP())
-      {
-        for(Int depedentLayerId = 0; depedentLayerId < pcSlice->getVPS()->getNumDirectRefLayers(m_layerId); depedentLayerId++)
-          assert(pcSlice->getNalUnitType() == pcSlice->getBaseColPic(depedentLayerId)->getSlice(0)->getNalUnitType());
-      }
+      for( Int i = 0; i < pcPic->getSlice(0)->getActiveNumILRRefIdx(); i++ )
+      {
+        Int refLayerIdc = pcPic->getSlice(0)->getInterLayerPredLayerIdc(i);
+
+        if(m_cIlpPic[refLayerIdc] && m_cIlpPic[refLayerIdc]->getSlice(0)->isIRAP())
+        {                 
+          assert(pcSlice->getNalUnitType() == m_cIlpPic[refLayerIdc]->getSlice(0)->getNalUnitType());
+      }
+    }
     }
 #endif 
+    
     // For generalized B
     // note: maybe not existed case (always L0 is copied to L1 if L1 is empty)