Ticket #1101: SVN_HEVCSoftware_trunk_multiple_cvs_fix_additional.patch

C:/Users/JSH/Documents/SVN/P8005_Hevc/trunk/hm/source/App/TAppDecoder/TAppDecTop.cpp

@@ -109 +109 @@
 
   // main decoder loop
   Bool recon_opened = false; // reconstruction file not yet opened. (must be performed after SPS is seen)
+  Bool bEOS=false;
 
   while (!!bitstreamFile)
   {
@@ -138 +139 @@
     else
     {
       read(nalu, nalUnit);
+          if (nalu.m_nalUnitType==NAL_UNIT_EOS) bEOS=true;
       if( (m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) || !isNaluWithinTargetDecLayerIdSet(&nalu)  )
       {
         if(bPreviousPictureDecoded)
@@ -186 +188 @@
             || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP
             || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_N_LP
             || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_RADL
-            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP ) )
+                        || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP 
+                        || (bEOS && nalu.m_nalUnitType==NAL_UNIT_CODED_SLICE_CRA) ))
+                        
       {
+                  bEOS=false;
         xFlushOutput( pcListPic );
       }
       // write reconstruction to file

C:/Users/JSH/Documents/SVN/P8005_Hevc/trunk/hm/source/Lib/TLibDecoder/TDecTop.cpp

@@ -257 +257 @@
   std::tr1::shared_ptr<TComSPS> sps = m_parameterSetManagerDecoder.getSPS(pps->getSPSId());
   assert (sps);
 
-  Bool spsChanged=sps!=m_parameterSetManagerDecoder.getActiveSPS(); 
   if (false == m_parameterSetManagerDecoder.activatePPS(m_apcSlicePilot->getPPSId(),m_apcSlicePilot->isIRAP()))
   {
     printf ("Parameter set activation failed!");
@@ -294 +293 @@
   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() );