Changeset 422 in SHVCSoftware

Timestamp:

8 Oct 2013, 23:53:14 (11 years ago)

Author:

qualcomm

Message:

Fix for N0147.

Location:

branches/SHM-3.1-dev/source/Lib

Files:

• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

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

@@ -1176 +1176 @@
     if(  m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
     {
-      for( Int i = 0; i < pcPic->getSlice(0)->getActiveNumILRRefIdx(); i++ )
-      {
-        Int refLayerIdc = pcPic->getSlice(0)->getInterLayerPredLayerIdc(i);
-
-        if(m_cIlpPic[refLayerIdc] && pcSlice->isIRAP())
+      for(Int dependentLayerIdx = 0; dependentLayerIdx < pcSlice->getVPS()->getNumDirectRefLayers(m_layerId); dependentLayerIdx++)
+      {
+        TComList<TComPic*> *cListPic = getRefLayerDec( dependentLayerIdx )->getListPic();
+        TComPic* refpicLayer = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
+        if(refpicLayer && pcSlice->isIRAP())
         {                 
-          assert(pcSlice->getNalUnitType() == m_cIlpPic[refLayerIdc]->getSlice(0)->getNalUnitType());
+          assert(pcSlice->getNalUnitType() == refpicLayer->getSlice(0)->getNalUnitType());
         }
       }

branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -777 +777 @@
           TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
           TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
-          if( picLayer0->getSlice(0)->isIRAP())
+          if( picLayer0->getSlice(0)->isIRAP() && picLayer0)
           {
             pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());