Ticket #1101: SVN_HEVCSoftware_10.0_dev_multiple_cvs_fix.patch

source/Lib/TLibDecoder/TDecTop.cpp

@@ -70 +70 @@
   m_cGopDecoder.create();
   m_apcSlicePilot = new TComSlice;
   m_uiSliceIdx = 0;
+  m_lastNALSkipped = false;
 }
 
 Void TDecTop::destroy()
@@ -320 +321 @@
     m_uiSliceIdx     = 0;
   }
   m_apcSlicePilot->setSliceIdx(m_uiSliceIdx);
-  if (!m_bFirstSliceInPicture)
+  if (!m_bFirstSliceInPicture && !m_lastNALSkipped)
   {
     m_apcSlicePilot->copySliceInfo( pcPic->getPicSym()->getSlice(m_uiSliceIdx-1) );
   }
@@ -338 +339 @@
 
   m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder);
 
+  if (m_apcSlicePilot->getSliceCurStartCUAddr() == 0 && 
+          m_apcSlicePilot->getSliceSegmentCurStartCUAddr() == 0 &&
+          (nalu.m_nalUnitType==NAL_UNIT_CODED_SLICE_BLA_W_LP ||
+          nalu.m_nalUnitType==NAL_UNIT_CODED_SLICE_BLA_W_RADL ||
+          nalu.m_nalUnitType==NAL_UNIT_CODED_SLICE_BLA_N_LP ||
+          nalu.m_nalUnitType==NAL_UNIT_CODED_SLICE_IDR_W_RADL ||
+          nalu.m_nalUnitType==NAL_UNIT_CODED_SLICE_IDR_N_LP)) {
+                  m_pocRandomAccess=MAX_INT;
+  }
+
   // Skip pictures due to random access
-  if (isRandomAccessSkipPicture(iSkipFrame, iPOCLastDisplay))
-  {
-    return false;
-  }
   // Skip TFD pictures associated with BLA/BLANT pictures
-  if (isSkipPictureForBLA(iPOCLastDisplay))
+  if (isRandomAccessSkipPicture(iSkipFrame, iPOCLastDisplay) || isSkipPictureForBLA(iPOCLastDisplay))
   {
+        m_lastNALSkipped=true;
     return false;
   }
+  else m_lastNALSkipped=false;
 
   //we should only get a different poc for a new picture (with CTU address==0)
   if (m_apcSlicePilot->isNextSlice() && m_apcSlicePilot->getPOC()!=m_prevPOC && !m_bFirstSliceInSequence && (!m_apcSlicePilot->getSliceCurStartCUAddr()==0))
@@ -357 +366 @@
   // exit when a new picture is found
   if (m_apcSlicePilot->isNextSlice() && (m_apcSlicePilot->getSliceCurStartCUAddr() == 0 && !m_bFirstSliceInPicture) && !m_bFirstSliceInSequence )
   {
-    if (m_prevPOC >= m_pocRandomAccess)
+        if (m_prevPOC >= m_pocRandomAccess || m_apcSlicePilot->getPOC()==m_pocRandomAccess)
     {
       m_prevPOC = m_apcSlicePilot->getPOC();
       return true;
@@ -642 +651 @@
 {
   if(nalUnitType == NAL_UNIT_SUFFIX_SEI)
   {
-    m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder.getActiveSPS() );
+        if (!m_lastNALSkipped)
+          m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder.getActiveSPS() );
   }
   else
   {
@@ -686 +696 @@
       xDecodeSEI( nalu.m_Bitstream, nalu.m_nalUnitType );
       return false;
 
+        case NAL_UNIT_EOS:
+                m_pocRandomAccess=MAX_INT;
+                break;
     case NAL_UNIT_CODED_SLICE_TRAIL_R:
     case NAL_UNIT_CODED_SLICE_TRAIL_N:
     case NAL_UNIT_CODED_SLICE_TLA_R:
     case NAL_UNIT_CODED_SLICE_TSA_N:
     case NAL_UNIT_CODED_SLICE_STSA_R:
     case NAL_UNIT_CODED_SLICE_STSA_N:
-    case NAL_UNIT_CODED_SLICE_BLA_W_LP:
+        case NAL_UNIT_CODED_SLICE_BLA_W_LP:
     case NAL_UNIT_CODED_SLICE_BLA_W_RADL:
     case NAL_UNIT_CODED_SLICE_BLA_N_LP:
     case NAL_UNIT_CODED_SLICE_IDR_W_RADL:
@@ -701 +714 @@
     case NAL_UNIT_CODED_SLICE_RADL_N:
     case NAL_UNIT_CODED_SLICE_RADL_R:
     case NAL_UNIT_CODED_SLICE_RASL_N:
-    case NAL_UNIT_CODED_SLICE_RASL_R:
+        case NAL_UNIT_CODED_SLICE_RASL_R:
       return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay);
       break;
     default:

source/Lib/TLibDecoder/TDecTop.h

@@ -94 +94 @@
   Bool isRandomAccessSkipPicture(Int& iSkipFrame,  Int& iPOCLastDisplay);
   TComPic*                m_pcPic;
   UInt                    m_uiSliceIdx;
+  Bool                    m_lastNALSkipped;
   Int                     m_prevPOC;
   Bool                    m_bFirstSliceInPicture;
   Bool                    m_bFirstSliceInSequence;