Changeset 1140 in SHVCSoftware

Timestamp:

7 Jul 2015, 23:26:39 (9 years ago)

Author:

seregin

Message:

macro cleanup: TSLAYERS_IL_RPS

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -151 +151 @@
 #define O0225_TID_BASED_IL_RPS_DERIV     1
 #define VPS_TSLAYERS                     1      ///< JCTVC-O0120 signal max temporal sub-layers for each layer
-#define TSLAYERS_IL_RPS                  1      ///< JCTVC-O0120 IL RPS based on max temporal sub-layers
 #define P0079_DERIVE_NUMACTIVE_REF_PICS  1      ///< JCTVC-P0079 Modification of derivation of variable NumActiveRefLayerPics
 #define Q0060_MAX_TID_REF_EQUAL_TO_ZERO  1      ///< JCTVC-Q0060 handling the case max_tid_il_ref_pics_plus1 is equal to 0.

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

@@ -1571 +1571 @@
         else
         {
-#if O0225_TID_BASED_IL_RPS_DERIV && TSLAYERS_IL_RPS
+#if O0225_TID_BASED_IL_RPS_DERIV
           Int refLayerId = pcSlice->getVPS()->getRefLayerId(pcSlice->getLayerId(), 0);
           Int refLayerIdx = pcSlice->getVPS()->getLayerIdxInVps(refLayerId);
@@ -1585 +1585 @@
             pcSlice->setActiveNumILRRefIdx(1);
             pcSlice->setInterLayerPredLayerIdc(0, 0);
-#if O0225_TID_BASED_IL_RPS_DERIV && TSLAYERS_IL_RPS
+#if O0225_TID_BASED_IL_RPS_DERIV
           }
 #endif
@@ -1595 +1595 @@
       pcSlice->setInterLayerPredEnabledFlag(true);
 
-#if O0225_TID_BASED_IL_RPS_DERIV && TSLAYERS_IL_RPS
+#if O0225_TID_BASED_IL_RPS_DERIV
       Int   numRefLayerPics = 0;
       Int   i = 0;