Changeset 380 in SHVCSoftware

Timestamp:

4 Sep 2013, 09:46:07 (11 years ago)

Author:

nokia

Message:

updated decoder random access in accordance with HM12.0 and fixed related SEI crash problem

Location:

branches/SHM-3.1-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (4 diffs)
• TLibDecoder/TDecTop.h (modified) (1 diff)

branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -42 +42 @@
 
 #define SYNTAX_BYTES                     10      ///< number of bytes taken by syntaxes per 4x4 block [RefIdxL0(1byte), RefIdxL1(1byte), MVxL0(2bytes), MVyL0(2bytes), MVxL1(2bytes), MVyL1(2bytes)]
+
+#define HM12_RANDOM_ACCESS               1
+#define RANDOM_ACCESS_SEI_FIX            1
 
 #if SVC_EXTENSION

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

@@ -77 +77 @@
   m_pBLSyntaxFile = NULL;
 #endif
-
+#if HM12_RANDOM_ACCESS
+  m_prevSliceSkipped = false;
+  m_skippedPOC = 0;
+#endif
 }
 
@@ -620 +623 @@
 #endif
 
+#if HM12_RANDOM_ACCESS
+  // set POC for dependent slices in skipped pictures
+  if(m_apcSlicePilot->getDependentSliceSegmentFlag() && m_prevSliceSkipped) 
+  {
+    m_apcSlicePilot->setPOC(m_skippedPOC);
+  }
+#endif
+
   // Skip pictures due to random access
   if (isRandomAccessSkipPicture(iSkipFrame, iPOCLastDisplay))
   {
+#if HM12_RANDOM_ACCESS
+    m_prevSliceSkipped = true;
+    m_skippedPOC = m_apcSlicePilot->getPOC();
+#endif
     return false;
   }
@@ -628 +643 @@
   if (isSkipPictureForBLA(iPOCLastDisplay))
   {
+#if HM12_RANDOM_ACCESS
+    m_prevSliceSkipped = true;
+    m_skippedPOC = m_apcSlicePilot->getPOC();
+#endif
     return false;
   }
+
+#if HM12_RANDOM_ACCESS
+  // clear previous slice skipped flag
+  m_prevSliceSkipped = false;
+#endif
 
   // exit when a new picture is found
@@ -1135 +1159 @@
   if(nalUnitType == NAL_UNIT_SUFFIX_SEI)
   {
+#if RANDOM_ACCESS_SEI_FIX
+    if (m_prevSliceSkipped) // No need to decode SEI messages of a skipped access unit
+    {
+      return;
+    }
+#endif
 #if M0043_LAYERS_PRESENT_SEI
     m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder[m_layerId].getActiveVPS(), m_parameterSetManagerDecoder[m_layerId].getActiveSPS() );

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

@@ -107 +107 @@
   Bool                    m_bFirstSliceInSequence;
 #endif
+#if HM12_RANDOM_ACCESS
+  Bool                    m_prevSliceSkipped;
+  Int                     m_skippedPOC;
+#endif
 
 #if SVC_EXTENSION