Ticket #1244: FixCRAPocWhenNoRaslOutputFlagIsTrue.patch

source/Lib/TLibCommon/TypeDef.h

@@ -53 +53 @@
 #define FIX_WRITING_OUTPUT          1
 #define FIX_OUTPUT_EOS              1
 
+#define FIX_POC_CRA_NORASL_OUTPUT   1
+
 #define MAX_NUM_PICS_IN_SOP           1024
 
 #define MAX_NESTING_NUM_OPS         1024

source/Lib/TLibDecoder/TDecTop.cpp

@@ -411 +411 @@
   }
 #endif
 
+#if FIX_POC_CRA_NORASL_OUTPUT
+  if (m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA && m_craNoRaslOutputFlag) //Reset POC MSB when CRA has NoRaslOutputFlag equal to 1
+  {
+    Int iMaxPOClsb = 1 << m_apcSlicePilot->getSPS()->getBitsForPOC();
+    m_apcSlicePilot->setPOC( m_apcSlicePilot->getPOC() & (iMaxPOClsb - 1) );
+  }
+#endif
+
   // Skip pictures due to random access
   if (isRandomAccessSkipPicture(iSkipFrame, iPOCLastDisplay))
   {