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

Timestamp:

16 Nov 2013, 00:32:03 (11 years ago)

Author:

qualcomm

Message:

Integration of O0225 proposal 2 for all reference layers.

Location:

branches/SHM-4.0-dev/source/Lib/TLibDecoder

Files:

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

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

@@ -1098 +1098 @@
     for(i = 0; i < vps->getMaxLayers() - 1; i++)
     {
+#if O0225_MAX_TID_FOR_REF_LAYERS
+       for( j = i+1; j <= vps->getMaxLayers() - 1; j++)
+       {
+         if(vps->getDirectDependencyFlag(j, i))
+         {
+           READ_CODE( 3, uiCode, "max_tid_il_ref_pics_plus1[i][j]" ); vps->setMaxTidIlRefPicsPlus1(i, j, uiCode);
+           assert( uiCode <= vps->getMaxTLayers());
+         }
+       }
+#else
       READ_CODE( 3, uiCode, "max_tid_il_ref_pics_plus1[i]" ); vps->setMaxTidIlRefPicsPlus1(i, uiCode);
 #if N0120_MAX_TID_REF_CFG
@@ -1104 +1114 @@
       assert( uiCode <= vps->getMaxTLayers()+ 1 );
 #endif
+#endif 
     }
   }
@@ -1110 +1121 @@
     for(i = 0; i < vps->getMaxLayers() - 1; i++)
     {
+#if O0225_MAX_TID_FOR_REF_LAYERS
+       for( j = i+1; j <= vps->getMaxLayers() - 1; j++)
+       {
+          vps->setMaxTidIlRefPicsPlus1(i, j, 7);
+       }
+#else
       vps->setMaxTidIlRefPicsPlus1(i, 7);
+#endif
     }
   }
@@ -1116 +1134 @@
   for(i = 0; i < vps->getMaxLayers() - 1; i++)
   {
+#if O0225_MAX_TID_FOR_REF_LAYERS
+       for( j = i+1; j <= vps->getMaxLayers() - 1; j++)
+       {
+         if(vps->getDirectDependencyFlag(j, i))
+         {
+           READ_CODE( 3, uiCode, "max_tid_il_ref_pics_plus1[i][j]" ); vps->setMaxTidIlRefPicsPlus1(i, j, uiCode);
+           assert( uiCode <= vps->getMaxTLayers() );
+         }
+       }
+#else
     READ_CODE( 3, uiCode, "max_tid_il_ref_pics_plus1[i]" ); vps->setMaxTidIlRefPicsPlus1(i, uiCode);
     assert( uiCode <= vps->getMaxTLayers() );
+#endif   
   }
 #endif

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

@@ -498 +498 @@
 
   Int remainingInterLayerReferencesFlag = 0;
+#if O0225_MAX_TID_FOR_REF_LAYERS
+  for ( Int j = latestDecIdx + 1; j < numTargetDecLayers; j++ )
+  {
+    Int jLidx = pcSlice->getVPS()->getLayerIdInVps(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 
       for ( Int k = 0; k < m_ppcTDecTop[targetDecLayerIdList[j]]->getNumDirectRefLayers(); k++ )
       {