Changeset 1321 in SHVCSoftware

Timestamp:

21 Jul 2015, 23:39:48 (9 years ago)

Author:

seregin

Message:

port rev 4396, 4397, 4398

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -645 +645 @@
     {
       // Check if any new Picture Timing SEI has arrived
-      SEIMessages pictureTimingSEIs = extractSeisByType (m_SEIs, SEI::PICTURE_TIMING);
+      SEIMessages pictureTimingSEIs = getSeisByType(m_SEIs, SEI::PICTURE_TIMING);
       if (pictureTimingSEIs.size()>0)
       {

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

@@ -452 +452 @@
   xWriteSEISeparately(NAL_UNIT_PREFIX_SEI, localMessages, accessUnit, itNalu, temporalId, sps);
 #endif
-  xClearSEIs(currentMessages, !testWrite);
+  xClearSEIs(localMessages, !testWrite);
 
   if (!testWrite)
@@ -504 +504 @@
   xWriteSEISeparately(NAL_UNIT_SUFFIX_SEI, seiMessages, accessUnit, pos, temporalId, sps);
 #endif
+  deleteSEIs(seiMessages);
 }
 
@@ -1707 +1708 @@
       pcSlice->setMFMEnabledFlag(false);
     }
-#endif //SVC_EXTENSION
-
+#endif //SVC_EXTENSION    
     pcSlice->setLastIDR(m_iLastIDR);
     pcSlice->setSliceIdx(0);
@@ -2575 +2575 @@
 
       // create prefix SEI messages at the beginning of the sequence
-      leadingSeiMessages.clear();
+      assert(leadingSeiMessages.empty());
       xCreateIRAPLeadingSEIMessages(leadingSeiMessages, pcSlice->getSPS(), pcSlice->getPPS());
 
@@ -2794 +2794 @@
     xWriteTrailingSEIMessages(trailingSeiMessages, accessUnit, pcSlice->getTLayer(), pcSlice->getSPS());
 #endif
-    trailingSeiMessages.clear();
 
     m_pcCfg->setEncodedFlag(iGOPid, true);
@@ -2850 +2849 @@
 #if O0164_MULTI_LAYER_HRD
     xWriteLeadingSEIMessages(leadingSeiMessages, duInfoSeiMessages, accessUnit, pcSlice->getTLayer(), pcSlice->getVPS(), pcSlice->getSPS(), duData);
+    xWriteDuSEIMessages(duInfoSeiMessages, accessUnit, pcSlice->getTLayer(), pcSlice->getVPS(), pcSlice->getSPS(), duData);
 #else
     xWriteLeadingSEIMessages(leadingSeiMessages, duInfoSeiMessages, accessUnit, pcSlice->getTLayer(), pcSlice->getSPS(), duData);
-#endif
-    leadingSeiMessages.clear();
-#if O0164_MULTI_LAYER_HRD
-    xWriteDuSEIMessages(duInfoSeiMessages, accessUnit, pcSlice->getTLayer(), pcSlice->getVPS(), pcSlice->getSPS(), duData);
-#else
     xWriteDuSEIMessages(duInfoSeiMessages, accessUnit, pcSlice->getTLayer(), pcSlice->getSPS(), duData);
 #endif