Ticket #1101: SVN_HEVCSoftware_trunk_multiple_cvs_fix.patch

source/Lib/TLibDecoder/TDecTop.cpp

@@ -54 +54 @@
   m_prevRAPisBLA = false;
   m_pocRandomAccess = MAX_INT;          
   m_prevPOC                = MAX_INT;
+  m_prevSuppressOutput      = false;
   m_bFirstSliceInPicture    = true;
   m_bFirstSliceInSequence   = true;
+  m_bLastNALSkipped         = false;
 }
 
 TDecTop::~TDecTop()
@@ -255 +257 @@
   TComSPS *sps = m_parameterSetManagerDecoder.getSPS(pps->getSPSId());
   assert (sps != 0);
 
+  Bool spsChanged=sps!=m_parameterSetManagerDecoder.getActiveSPS(); 
   if (false == m_parameterSetManagerDecoder.activatePPS(m_apcSlicePilot->getPPSId(),m_apcSlicePilot->isIRAP()))
   {
     printf ("Parameter set activation failed!");
@@ -291 +294 @@
   g_uiMaxCUDepth  = sps->getMaxCUDepth();
   g_uiAddCUDepth  = max (0, sps->getLog2MinCodingBlockSize() - (Int)sps->getQuadtreeTULog2MinSize() );
 
+  if (spsChanged)
+  {
+    for (TComList<TComPic *>::iterator It=m_cListPic.begin(); It!=m_cListPic.end(); ) {
+      TComList<TComPic *>::iterator CIt=It++;
+      (*CIt)->destroy();
+      delete *CIt;
+      m_cListPic.erase(CIt);
+    }
+  }
+
   for (Int i = 0; i < sps->getLog2DiffMaxMinCodingBlockSize(); i++)
   {
     sps->setAMPAcc( i, sps->getUseAMP() );
@@ -316 +329 @@
     m_uiSliceIdx     = 0;
   }
   m_apcSlicePilot->setSliceIdx(m_uiSliceIdx);
-  if (!m_bFirstSliceInPicture)
+  if (!m_bFirstSliceInPicture && !m_bLastNALSkipped)
   {
     m_apcSlicePilot->copySliceInfo( pcPic->getPicSym()->getSlice(m_uiSliceIdx-1) );
   }
@@ -334 +347 @@
 
   m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder);
 
+  if (m_apcSlicePilot->getSliceCurStartCUAddr() == 0 &&  
+      m_apcSlicePilot->getSliceSegmentCurStartCUAddr() == 0) {
+      if (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_bLastNALSkipped=true;
     return false;
   }
-
+  else m_bLastNALSkipped=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))
   {
@@ -353 +374 @@
   // 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_prevSuppressOutput)
     {
       m_prevPOC = m_apcSlicePilot->getPOC();
+          m_prevSuppressOutput = m_apcSlicePilot->getPOC() < m_pocRandomAccess && (m_apcSlicePilot->getNalUnitType()==NAL_UNIT_CODED_SLICE_RASL_N || m_apcSlicePilot->getNalUnitType()==NAL_UNIT_CODED_SLICE_RASL_R);
       return true;
     }
     m_prevPOC = m_apcSlicePilot->getPOC();
+        m_prevSuppressOutput = m_apcSlicePilot->getPOC() < m_pocRandomAccess && (m_apcSlicePilot->getNalUnitType()==NAL_UNIT_CODED_SLICE_RASL_N || m_apcSlicePilot->getNalUnitType()==NAL_UNIT_CODED_SLICE_RASL_R);
   }
   // actual decoding starts here
   xActivateParameterSets();
@@ -366 +389 @@
   if (m_apcSlicePilot->isNextSlice()) 
   {
     m_prevPOC = m_apcSlicePilot->getPOC();
+        m_prevSuppressOutput = m_apcSlicePilot->getPOC() < m_pocRandomAccess && (m_apcSlicePilot->getNalUnitType()==NAL_UNIT_CODED_SLICE_RASL_N || m_apcSlicePilot->getNalUnitType()==NAL_UNIT_CODED_SLICE_RASL_R);
   }
   m_bFirstSliceInSequence = false;
   //detect lost reference picture and insert copy of earlier frame.
@@ -620 +644 @@
 {
   if(nalUnitType == NAL_UNIT_SUFFIX_SEI)
   {
-    m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder.getActiveSPS() );
+    if (!m_bLastNALSkipped) {
+      m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder.getActiveSPS() );
+        }
   }
   else
   {
@@ -664 +690 @@
       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:

source/Lib/TLibDecoder/TDecTop.h

@@ -95 +95 @@
   TComPic*                m_pcPic;
   UInt                    m_uiSliceIdx;
   Int                     m_prevPOC;
+  Bool                    m_prevSuppressOutput;
   Bool                    m_bFirstSliceInPicture;
   Bool                    m_bFirstSliceInSequence;
+  Bool                    m_bLastNALSkipped;
 
 public:
   TDecTop();