Changeset 1085 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

26 Mar 2015, 04:33:14 (11 years ago)

Author:

seregin

Message:

fix for getMaxTidIlRefPicsPlus1 and remove O0225_MAX_TID_FOR_REF_LAYERS

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (9 diffs)
• TDecTop.cpp (modified) (1 diff)

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

@@ -1610 +1610 @@
             {
 #if Q0060_MAX_TID_REF_EQUAL_TO_ZERO
-              if((pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getVPS()->getLayerIdxInVps(i),pcSlice->getLayerId()) >  pcSlice->getTLayer() || pcSlice->getTLayer()==0) &&
+              if((pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getVPS()->getLayerIdxInVps(i), pcSlice->getLayerIdx()) >  pcSlice->getTLayer() || pcSlice->getTLayer()==0) &&
                 (pcSlice->getVPS()->getMaxTSLayersMinus1(pcSlice->getVPS()->getLayerIdxInVps(i)) >=  pcSlice->getTLayer()) )
 #else 
-              if(pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getVPS()->getLayerIdxInVps(i),pcSlice->getLayerId()) >  pcSlice->getTLayer() &&
+              if(pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getVPS()->getLayerIdxInVps(i), pcSlice->getLayerIdx()) >  pcSlice->getTLayer() &&
                 (pcSlice->getVPS()->getMaxTSLayersMinus1(pcSlice->getVPS()->getLayerIdxInVps(i)) >=  pcSlice->getTLayer()) )
 #endif 
@@ -1638 +1638 @@
             {
               READ_CODE( numBits,uiCode,"inter_layer_pred_layer_idc[i]" );
-              pcSlice->setInterLayerPredLayerIdc(uiCode,i);
+              pcSlice->setInterLayerPredLayerIdc(uiCode, i);
             }
           }
@@ -1645 +1645 @@
         {
 #if O0225_TID_BASED_IL_RPS_DERIV && TSLAYERS_IL_RPS
+          Int refLayerId = pcSlice->getVPS()->getRefLayerId(pcSlice->getLayerId(), 0);
+          Int refLayerIdx = pcSlice->getVPS()->getLayerIdxInVps(refLayerId);
 #if Q0060_MAX_TID_REF_EQUAL_TO_ZERO
-          if((pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(0,pcSlice->getLayerId()) >  pcSlice->getTLayer() || pcSlice->getTLayer()==0) &&
-            (pcSlice->getVPS()->getMaxTSLayersMinus1(0) >=  pcSlice->getTLayer()) )
-#else
-          if( (pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(0,pcSlice->getLayerId()) >  pcSlice->getTLayer()) &&
-            (pcSlice->getVPS()->getMaxTSLayersMinus1(0) >=  pcSlice->getTLayer()) )
+          if((pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(refLayerIdx, pcSlice->getLayerIdx()) >  pcSlice->getTLayer() || pcSlice->getTLayer()==0) &&
+            (pcSlice->getVPS()->getMaxTSLayersMinus1(refLayerIdx) >=  pcSlice->getTLayer()) )
+#else
+          if( (pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(refLayerIdx,pcSlice->getLayerIdx()) >  pcSlice->getTLayer()) &&
+            (pcSlice->getVPS()->getMaxTSLayersMinus1(refLayerIdx) >=  pcSlice->getTLayer()) )
 #endif 
           {
 #endif
             pcSlice->setActiveNumILRRefIdx(1);
-            pcSlice->setInterLayerPredLayerIdc(0,0);
+            pcSlice->setInterLayerPredLayerIdc(0, 0);
 #if O0225_TID_BASED_IL_RPS_DERIV && TSLAYERS_IL_RPS
           }
@@ -1673 +1675 @@
       {
 #if Q0060_MAX_TID_REF_EQUAL_TO_ZERO
-        if((pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getVPS()->getLayerIdxInVps(i),pcSlice->getLayerId()) >  pcSlice->getTLayer() || pcSlice->getTLayer()==0) &&
+        if((pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getVPS()->getLayerIdxInVps(i), pcSlice->getLayerIdx()) >  pcSlice->getTLayer() || pcSlice->getTLayer()==0) &&
           (pcSlice->getVPS()->getMaxTSLayersMinus1(pcSlice->getVPS()->getLayerIdxInVps(i)) >=  pcSlice->getTLayer()) )
 #else 
-        if(pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getVPS()->getLayerIdxInVps(i),pcSlice->getLayerId()) >  pcSlice->getTLayer() &&
+        if(pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getVPS()->getLayerIdxInVps(i), pcSlice->getLayerIdx()) >  pcSlice->getTLayer() &&
           (pcSlice->getVPS()->getMaxTSLayersMinus1(pcSlice->getVPS()->getLayerIdxInVps(i)) >=  pcSlice->getTLayer()) )
 #endif 
@@ -1686 +1688 @@
       for( i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ )
       {
-        pcSlice->setInterLayerPredLayerIdc(refLayerPicIdc[i],i);
-      }      
+        pcSlice->setInterLayerPredLayerIdc(refLayerPicIdc[i], i);
+      }
 #else
       pcSlice->setActiveNumILRRefIdx(pcSlice->getNumILRRefIdx());
@@ -2999 +3001 @@
     for(i = 0; i < vps->getMaxLayers() - 1; i++)
     {
-#if O0225_MAX_TID_FOR_REF_LAYERS
       for( j = i+1; j < vps->getMaxLayers(); j++)
       {
@@ -3007 +3008 @@
         }
       }
-#else
-      READ_CODE( 3, uiCode, "max_tid_il_ref_pics_plus1[i]" ); vps->setMaxTidIlRefPicsPlus1(i, uiCode);
-      assert( uiCode <= vps->getMaxTLayers());
-#endif 
     }
   }
@@ -3017 +3014 @@
     for(i = 0; i < vps->getMaxLayers() - 1; i++)
     {
-#if O0225_MAX_TID_FOR_REF_LAYERS
       for( j = i+1; j < vps->getMaxLayers(); j++)
       {
         vps->setMaxTidIlRefPicsPlus1(i, j, 7);
       }
-#else
-      vps->setMaxTidIlRefPicsPlus1(i, 7);
-#endif
     }
   }
@@ -3691 +3684 @@
   for( i = 0; i < vps->getMaxLayers() - 1; i++ )
   {
-#if O0225_MAX_TID_FOR_REF_LAYERS
     for( j = i + 1; j < vps->getMaxLayers(); j++ )
     {
       vps->setMaxTidIlRefPicsPlus1(i, j, 7);
     }
-#else
-    vps->setMaxTidIlRefPicsPlus1(i, 7);
-#endif
   }
 

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

@@ -2848 +2848 @@
 
   Int remainingInterLayerReferencesFlag = 0;
-#if O0225_MAX_TID_FOR_REF_LAYERS
   for ( Int j = latestDecIdx + 1; j < numTargetDecLayers; j++ )
   {
     Int jLidx = pcSlice->getVPS()->getLayerIdxInVps(targetDecLayerIdList[j]);
-    if ( currTid <= pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(latestDecLayerId,jLidx) - 1 )
-    {
-#else
-  if ( currTid <= pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(latestDecLayerId) - 1 )
-  {
-    for ( Int j = latestDecIdx + 1; j < numTargetDecLayers; j++ )
-    {
-#endif 
+    if ( currTid <= pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getVPS()->getLayerIdxInVps(latestDecLayerId),jLidx) - 1 )
+    {
       for ( Int k = 0; k < m_ppcTDecTop[targetDecLayerIdList[j]]->getNumDirectRefLayers(); k++ )
       {