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

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

Location:

branches/SHM-4.1-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (2 diffs)
• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)

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

@@ -277 +277 @@
     }
     iterPic++;
+#if SVC_EXTENSION
+    // return NULL, if picture with requested POC is not in the list, otherwise iterator goes outside of the list
+    if( iterPic == rcListPic.end() )
+    {
+      return NULL;
+    }
+#endif
     pcPic = *(iterPic);
   }
@@ -3237 +3244 @@
   {
     memset( m_pcBaseColPic, 0, sizeof( m_pcBaseColPic ) );
-    return;
+    return false;
   }        
 #if POC_RESET_FLAG

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

@@ -2113 +2113 @@
 
 #if SVC_EXTENSION
-  Void      setBaseColPic       ( TComList<TComPic*>& rcListPic , UInt refLayerIdc );
+  Bool      setBaseColPic       ( TComList<TComPic*>& rcListPic , UInt refLayerIdc );
   Void      setBaseColPic       (UInt refLayerIdc, TComPic* p)     { m_pcBaseColPic[refLayerIdc] = p; }
   TComPic*  getBaseColPic       (UInt refLayerIdc)                { return m_pcBaseColPic[refLayerIdc]; }

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