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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: O0225_TID_BASED_IL_RPS_DERIV

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -149 +149 @@
 #define MAX_ONE_RESAMPLING_DIRECT_LAYERS 1      ///< Allow maximum of one resampling process for direct reference layers
 #define MOTION_RESAMPLING_CONSTRAINT     1      ///< JCTVC-N0108: Allow maximum of one motion resampling process for direct reference layers, and use motion inter-layer prediction from the same layer as texture inter-layer prediction.
-#define O0225_TID_BASED_IL_RPS_DERIV     1
 #define VPS_TSLAYERS                     1      ///< JCTVC-O0120 signal max temporal sub-layers for each layer
 #define P0079_DERIVE_NUMACTIVE_REF_PICS  1      ///< JCTVC-P0079 Modification of derivation of variable NumActiveRefLayerPics

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

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

@@ -1449 +1449 @@
         }
 #endif
-#if SVC_EXTENSION
+
         if( pcPic->isSpatialEnhLayer(refLayerIdc) )
         {
@@ -1467 +1467 @@
         }
         pcSlice->setFullPelBaseRec ( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc) );
-#endif //SVC_EXTENSION
       }
 
@@ -1476 +1475 @@
       }
 
-#if !O0225_TID_BASED_IL_RPS_DERIV || Q0060_MAX_TID_REF_EQUAL_TO_ZERO
       pcSlice->setActiveNumILRRefIdx( activeNumILRRefIdxTmp );
-#endif 
+
       if ( pcSlice->getActiveNumILRRefIdx() == 0 )
       {