Changeset 533 in SHVCSoftware for branches/SHM-4.1-dev/source/Lib/TLibDecoder

Timestamp:

2 Jan 2014, 07:28:26 (11 years ago)

Author:

seregin

Message:

fix xGetRefPic in case there is no picture with requested POC in the list

File:

• branches/SHM-4.1-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)

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

@@ -1309 +1309 @@
 #if AVC_BASE
         if( pcSlice->getVPS()->getRefLayerId( m_layerId, refLayerIdc ) == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getAvcBaseLayerFlag() )
-        {
-          pcSlice->setBaseColPic ( refLayerIdc, *m_ppcTDecTop[0]->getListPic()->begin() );
+        {          
+          TComPic* pic = *m_ppcTDecTop[0]->getListPic()->begin();
+
+          if( pic )
+          {
+            pcSlice->setBaseColPic ( refLayerIdc, pic );
+          }
+          else
+          {
+            continue;
+          }
 #if AVC_SYNTAX
           TComPic* pBLPic = pcSlice->getBaseColPic(refLayerIdc);
@@ -1332 +1341 @@
 #endif
           TComList<TComPic*> *cListPic = pcTDecTop->getListPic();
-          pcSlice->setBaseColPic ( *cListPic, refLayerIdc );
+          if( !pcSlice->setBaseColPic ( *cListPic, refLayerIdc ) )
+          {
+            continue;
+          }
         }
 #else