Ticket #1101: hevc_software_10.1_dev_multiple_cvs.patch

source/Lib/TLibDecoder/TDecTop.cpp

@@ -62 +62 @@
   m_prevPOC                = MAX_INT;
   m_bFirstSliceInPicture    = true;
   m_bFirstSliceInSequence   = true;
-  m_digestCanBeChecked      = false;
+  m_lastNALSkipped      = false;
 }
 
 TDecTop::~TDecTop()
@@ -192 +192 @@
   // Execute Deblock + Cleanup
 
   m_cGopDecoder.filterPicture(pcPic);
-  m_digestCanBeChecked = true;
   TComSlice::sortPicList( m_cListPic ); // sorting for application output
   poc                 = pcPic->getSlice(m_uiSliceIdx-1)->getPOC();
   rpcListPic          = &m_cListPic;  
@@ -276 +275 @@
   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!");
@@ -312 +312 @@
   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() );
@@ -331 +340 @@
 {
   TComPic*&   pcPic         = m_pcPic;
 
-  if (isRandomAccessSkipPicture(iSkipFrame, iPOCLastDisplay))
-  {
-    m_digestCanBeChecked = false;
-    return false;
-  }
-  // Skip TFD pictures associated with BLA/BLANT pictures
-  if (isSkipPictureForBLA(iPOCLastDisplay))
-  {
-    m_digestCanBeChecked = false;
-    return false;
-  }
   m_apcSlicePilot->initSlice();
 
   if (m_bFirstSliceInPicture)
@@ -349 +347 @@
     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) );
   }
@@ -367 +365 @@
 
   m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder);
 
-  // Skip pictures due to random access
-  if (isRandomAccessSkipPicture(iSkipFrame, iPOCLastDisplay))
-  {
-    return false;
+  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
   // 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))
   {
@@ -386 +390 @@
   // 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;
@@ -622 +626 @@
   m_cGopDecoder.decompressSlice(nalu.m_Bitstream, pcPic, bPicComplete);
   
   m_bFirstSliceInPicture = false;
-  m_digestCanBeChecked = false;
   m_uiSliceIdx++;
 
   return false;
@@ -655 +658 @@
   if(nalUnitType == NAL_UNIT_SUFFIX_SEI)
   {
     m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder.getActiveSPS() );
-    if (m_decodedPictureHashSEIEnabled && m_digestCanBeChecked)
+    if (m_decodedPictureHashSEIEnabled && !m_lastNALSkipped)
     {
       SEIMessages pictureHashes = getSeisByType(m_pcPic->getSEIs(), SEI::DECODED_PICTURE_HASH );
       const SEIDecodedPictureHash *hash = ( pictureHashes.size() > 0 ) ? (SEIDecodedPictureHash*) *(pictureHashes.begin()) : NULL;
@@ -708 +711 @@
       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

@@ -98 +98 @@
   Bool                    m_bFirstSliceInPicture;
   Bool                    m_bFirstSliceInSequence;
   Int                     m_decodedPictureHashSEIEnabled;  ///< Checksum(3)/CRC(2)/MD5(1)/disable(0) acting on decoded picture hash SEI message
-  Bool                    m_digestCanBeChecked;
+  Bool                    m_lastNALSkipped;
 
 public:
   TDecTop();