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

Timestamp:

7 Jul 2015, 23:29:44 (10 years ago)

Author:

seregin

Message:

macro cleanup: O0225_TID_BASED_IL_RPS_DERIV

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (4 diffs)

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

@@ -1571 +1571 @@
         else
         {
-#if O0225_TID_BASED_IL_RPS_DERIV
           Int refLayerId = pcSlice->getVPS()->getRefLayerId(pcSlice->getLayerId(), 0);
           Int refLayerIdx = pcSlice->getVPS()->getLayerIdxInVps(refLayerId);
@@ -1582 +1581 @@
 #endif 
           {
-#endif
             pcSlice->setActiveNumILRRefIdx(1);
             pcSlice->setInterLayerPredLayerIdc(0, 0);
-#if O0225_TID_BASED_IL_RPS_DERIV
           }
-#endif
         }
       }
@@ -1595 +1591 @@
       pcSlice->setInterLayerPredEnabledFlag(true);
 
-#if O0225_TID_BASED_IL_RPS_DERIV
       Int   numRefLayerPics = 0;
       Int   i = 0;
@@ -1617 +1612 @@
         pcSlice->setInterLayerPredLayerIdc(refLayerPicIdc[i], i);
       }
-#else
-      pcSlice->setActiveNumILRRefIdx(pcSlice->getNumILRRefIdx());
-      for( Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ )
-      {
-        pcSlice->setInterLayerPredLayerIdc(i,i);
-      }
-#endif 
     }
 #endif //SVC_EXTENSION