Changeset 1493 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

3 Dec 2015, 01:26:25 (9 years ago)

Author:

seregin

Message:

revert last commit, and invoke checkThatAllRefPicsAreAvailable earlier

File:

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

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

@@ -611 +611 @@
 #if ALIGNED_BUMPING
     m_apcSlicePilot->checkLeadingPictureRestrictions(m_cListPic);
-
-    if( m_parseIdc == 1 || m_parseIdc == 3 )
-    {
-      m_apcSlicePilot->applyReferencePictureSet(m_cListPic, m_apcSlicePilot->getRPS());
-    }
 #else
     m_apcSlicePilot->applyReferencePictureSet(m_cListPic, m_apcSlicePilot->getRPS());
@@ -1254 +1249 @@
 #endif
 
+  //detect lost reference picture and insert copy of earlier frame.
+  {
+    Int lostPoc;
+    while((lostPoc=m_apcSlicePilot->checkThatAllRefPicsAreAvailable(m_cListPic, m_apcSlicePilot->getRPS(), true, m_pocRandomAccess)) > 0)
+    {
+      xCreateLostPicture(lostPoc-1);
+    }
+  }
+
   if( m_parseIdc == 1 || m_parseIdc == 3)
   {
@@ -1283 +1287 @@
       }
     }
+    m_apcSlicePilot->applyReferencePictureSet(m_cListPic, m_apcSlicePilot->getRPS());
   }
 
@@ -1346 +1351 @@
     m_prevPOC = m_apcSlicePilot->getPOC();
   }
-#endif //SVC_EXTENSION
 
   //detect lost reference picture and insert copy of earlier frame.
@@ -1356 +1360 @@
     }
   }
+#endif //SVC_EXTENSION
 
   if (!m_apcSlicePilot->getDependentSliceSegmentFlag())