Changeset 923 in SHVCSoftware for branches

Timestamp:

14 Nov 2014, 12:22:31 (10 years ago)

Author:

nokia

Message:

Port the STSA bug fix in HM to SHM.

Location:

branches/SHM-dev/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (6 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -770 +770 @@
   {
     READ_CODE( 3,  uiCode, "sps_ext_or_max_sub_layers_minus1" );     uiTmp = uiCode;
+    if(!( pcSPS->getLayerId() != 0 && uiTmp == 7 ))
+    {
+      pcSPS->setMaxTLayers(uiTmp+1);
+    }
   }
 #endif

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1631 +1631 @@
           {
             TComReferencePictureSet* nRPS = pcSlice->getSPS()->getRPSList()->getReferencePictureSet(ii);
-            for(Int jj=0;jj<nRPS->getNumberOfPictures();jj++)
+            for(Int jj=0;(jj<nRPS->getNumberOfPictures() && isSTSA==true);jj++)
             {
               if(nRPS->getUsed(jj)) 
@@ -1637 +1637 @@
                 Int tPoc=m_pcCfg->getGOPEntry(ii).m_POC+nRPS->getDeltaPOC(jj);
                 Int kk=0;
-                for(kk=0;kk<m_pcCfg->getGOPSize();kk++)
+                for(kk=0;kk<iGOPid;kk++)
                 {
                   if(m_pcCfg->getGOPEntry(kk).m_POC==tPoc)
+                  {
+                    isSTSA=false;
                     break;
+                  }
                 }
                 Int tTid=m_pcCfg->getGOPEntry(kk).m_temporalId;
@@ -1790 +1793 @@
         )
     {
+      if(pcSlice->isStepwiseTemporalLayerSwitchingPointCandidate(rcListPic))
+      {
         Bool isSTSA=true;
         Bool isIntra=false;
@@ -1812 +1817 @@
           {
             TComReferencePictureSet* nRPS = pcSlice->getSPS()->getRPSList()->getReferencePictureSet(ii);
-            for(Int jj=0; jj<nRPS->getNumberOfPictures(); jj++)
+            for(Int jj=0;(jj<nRPS->getNumberOfPictures() && isSTSA==true);jj++)
             {
               if(nRPS->getUsed(jj)) 
@@ -1818 +1823 @@
                 Int tPoc=m_pcCfg->getGOPEntry(ii).m_POC+nRPS->getDeltaPOC(jj);
                 Int kk=0;
-                for(kk=0; kk<m_pcCfg->getGOPSize(); kk++)
+                for(kk=0;kk<iGOPid;kk++)
                 {
                   if(m_pcCfg->getGOPEntry(kk).m_POC==tPoc)
                   {
+                    isSTSA=false;
                     break;
                   }
@@ -1846 +1852 @@
           }
         }
+      }
     }
 #endif