Changeset 1522 in SHVCSoftware

Timestamp:

27 Jan 2016, 19:19:24 (8 years ago)

Author:

seregin

Message:

move temporal layer conditions to conformance bitstream checks to match the spec, it also solves segmentation fault from the ticket #94

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (3 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -464 +464 @@
   TComPic*  rpsCurrList1[MAX_NUM_REF+1];
 #if SVC_EXTENSION
-  Int numInterLayerRPSPics = 0;
   if( m_layerId > 0 && m_activeNumILRRefIdx > 0 )
   {
-    for( i=0; i < m_pcVPS->getNumDirectRefLayers( m_layerId ); i++ )
-    {
-      Int maxTidIlRefPicsPlus1 = getVPS()->getMaxTidIlRefPicsPlus1(ilpPic[i]->getSlice(0)->getLayerIdx(), getLayerIdx());
-
-      if( ((Int)(ilpPic[i]->getSlice(0)->getTLayer())<= maxTidIlRefPicsPlus1-1) || (maxTidIlRefPicsPlus1==0 && ilpPic[i]->getSlice(0)->getRapPicFlag() ) )
-      {
-        numInterLayerRPSPics++;
-
-        assert( ilpPic[i]->getSlice(0)->getDiscardableFlag() == 0 );    // Inter-layer RPS shall not contain picture with discardable_flag = 1.
-      }
-    }
-    if (numInterLayerRPSPics < m_activeNumILRRefIdx)
-    {
-      m_activeNumILRRefIdx = numInterLayerRPSPics;
-    }
-
     // max one resampling direct layer
     if( m_pcVPS->getScalabilityMask( SCALABILITY_ID ) )
@@ -587 +570 @@
     if( m_layerId > 0 )
     {      
-      for( i = 0; i < m_activeNumILRRefIdx && cIdx < numPicTotalCurr; cIdx ++, i ++)      
+      for( i = 0; i < m_activeNumILRRefIdx && cIdx < numPicTotalCurr; cIdx++, i++ )      
       {
         Int refLayerIdc = m_interLayerPredLayerIdc[i];
-        Int maxTidIlRefPicsPlus1 = getVPS()->getMaxTidIlRefPicsPlus1(ilpPic[refLayerIdc]->getSlice(0)->getLayerIdx(), getLayerIdx());
-        if( ((Int)(ilpPic[refLayerIdc]->getSlice(0)->getTLayer())<=maxTidIlRefPicsPlus1-1) || (maxTidIlRefPicsPlus1==0 && ilpPic[refLayerIdc]->getSlice(0)->getRapPicFlag()) )
-        {
-          rpsCurrList0[cIdx] = ilpPic[refLayerIdc];
-        }
+        Int maxTidIlRefPicsPlus1 = m_pcVPS->getMaxTidIlRefPicsPlus1(ilpPic[refLayerIdc]->getSlice(0)->getLayerIdx(), getLayerIdx());
+
+        // SHM: ILP is not valid due to temporal layer restriction, bitstream is not conformant
+        assert( Int(ilpPic[refLayerIdc]->getSlice(0)->getTLayer()) < maxTidIlRefPicsPlus1 || (maxTidIlRefPicsPlus1==0 && ilpPic[refLayerIdc]->getSlice(0)->getRapPicFlag()) );
+
+        // SHM: Inter-layer RPS shall not contain picture with discardable_flag = 1.
+        assert( ilpPic[refLayerIdc]->getSlice(0)->getDiscardableFlag() == 0 );
+
+        rpsCurrList0[cIdx] = ilpPic[refLayerIdc];
       }
     }
@@ -628 +615 @@
     if( m_layerId > 0 )
     {
-      for( i = 0; i < m_activeNumILRRefIdx && cIdx < numPicTotalCurr; cIdx ++, i ++)
+      for( i = 0; i < m_activeNumILRRefIdx && cIdx < numPicTotalCurr; cIdx++, i++ )
       {
         Int refLayerIdc = m_interLayerPredLayerIdc[i];
-        Int maxTidIlRefPicsPlus1 = getVPS()->getMaxTidIlRefPicsPlus1( ilpPic[refLayerIdc]->getSlice(0)->getLayerIdx(), getLayerIdx() );
-        if( ((Int)(ilpPic[refLayerIdc]->getSlice(0)->getTLayer())<=maxTidIlRefPicsPlus1-1) || (maxTidIlRefPicsPlus1==0 && ilpPic[refLayerIdc]->getSlice(0)->getRapPicFlag()) )
-        {
-          rpsCurrList1[cIdx] = ilpPic[refLayerIdc];
-        }
+        Int maxTidIlRefPicsPlus1 = m_pcVPS->getMaxTidIlRefPicsPlus1( ilpPic[refLayerIdc]->getSlice(0)->getLayerIdx(), getLayerIdx() );
+
+        // SHM: ILP is not valid due to temporal layer restriction, bitstream is not conformant
+        assert( Int(ilpPic[refLayerIdc]->getSlice(0)->getTLayer()) < maxTidIlRefPicsPlus1 || (maxTidIlRefPicsPlus1==0 && ilpPic[refLayerIdc]->getSlice(0)->getRapPicFlag()) );
+
+        // SHM: Inter-layer RPS shall not contain picture with discardable_flag = 1.
+        assert( ilpPic[refLayerIdc]->getSlice(0)->getDiscardableFlag() == 0 );
+
+        rpsCurrList1[cIdx] = ilpPic[refLayerIdc];
       }
     }

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

@@ -1606 +1606 @@
       Int   numRefLayerPics = 0;
       Int   i = 0;
-      Int   refLayerPicIdc  [MAX_VPS_LAYER_IDX_PLUS1];
+      Int   refLayerPicIdc[MAX_VPS_LAYER_IDX_PLUS1];
       for(i = 0, numRefLayerPics = 0;  i < pcSlice->getNumILRRefIdx(); i++ ) 
       {
         if( ( vps->getMaxTidIlRefPicsPlus1(vps->getLayerIdxInVps(i), pcSlice->getLayerIdx()) > pcSlice->getTLayer() || pcSlice->getTLayer()==0 ) &&
-              vps->getMaxTSLayersMinus1(vps->getLayerIdxInVps(i)) >=  pcSlice->getTLayer() )
-        {          
+              vps->getMaxTSLayersMinus1(vps->getLayerIdxInVps(i)) >= pcSlice->getTLayer() )
+        {
           refLayerPicIdc[ numRefLayerPics++ ] = i;
         }

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

@@ -1608 +1608 @@
         // Apply temporal layer restriction to inter-layer prediction
         Int maxTidIlRefPicsPlus1 = m_pcEncTop->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getLayerIdx(), pcSlice->getLayerIdx());
-        if( ((Int)(pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getTLayer())<=maxTidIlRefPicsPlus1-1) || (maxTidIlRefPicsPlus1==0 && pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getRapPicFlag()) )
+        if( ((Int)(pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getTLayer()) < maxTidIlRefPicsPlus1) || (maxTidIlRefPicsPlus1==0 && pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getRapPicFlag()) )
         {
           interLayerPredLayerIdcTmp[activeNumILRRefIdxTmp++] = refLayerIdc; // add picture to the list of valid inter-layer pictures
@@ -1614 +1614 @@
         else
         {
-          continue; // ILP is not valid due to temporal layer restriction
+          continue; // SHM: ILP is not valid due to temporal layer restriction
         }