Changeset 1196 in SHVCSoftware

Timestamp:

8 Jul 2015, 19:37:47 (9 years ago)

Author:

seregin

Message:

macro cleanup: MAX_ONE_RESAMPLING_DIRECT_LAYERS

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -495 +495 @@
       m_activeNumILRRefIdx = numInterLayerRPSPics;
     }
-#if MAX_ONE_RESAMPLING_DIRECT_LAYERS
+
+    // max one resampling direct layer
     if( m_pcVPS->getScalabilityMask( SCALABILITY_ID ) )
     {
@@ -565 +566 @@
 #endif
     }
-#endif
   }
   Int numPocTotalCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + m_activeNumILRRefIdx;

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

@@ -90 +90 @@
 
 #define REF_IDX_MFM                      1      ///< JCTVC-L0336: motion vector mapping of inter-layer reference picture
-#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 AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers