Changeset 1122 in SHVCSoftware for branches

Timestamp:

7 Jul 2015, 02:07:05 (9 years ago)

Author:

seregin

Message:

macro cleanup: RESAMPLING_CONSTRAINT_BUG_FIX

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

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

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

@@ -512 +512 @@
       memset( refResamplingLayer, 0, sizeof( refResamplingLayer ) );
 #endif
-#if !RESAMPLING_CONSTRAINT_BUG_FIX
-      const Window &scalEL = getSPS()->getScaledRefLayerWindow(m_interLayerPredLayerIdc[i]);
-      Int scalingOffset = ((scalEL.getWindowLeftOffset()   == 0 ) && 
-                           (scalEL.getWindowRightOffset()  == 0 ) && 
-                           (scalEL.getWindowTopOffset()    == 0 ) && 
-                           (scalEL.getWindowBottomOffset() == 0 ) 
-                          );
-#endif
 
       for( i=0; i < m_activeNumILRRefIdx; i++ )
@@ -525 +517 @@
         UInt refLayerIdc = m_interLayerPredLayerIdc[i];
         UInt refLayerId = m_pcVPS->getRefLayerId( m_layerId, refLayerIdc );
-#if RESAMPLING_CONSTRAINT_BUG_FIX
+
 #if O0098_SCALED_REF_LAYER_ID
         const Window &scalEL = getPPS()->getScaledRefLayerWindowForLayer(refLayerId);
@@ -536 +528 @@
                              (scalEL.getWindowBottomOffset() == 0 ) 
                             );
-#endif
+
 #if O0194_DIFFERENT_BITDEPTH_EL_BL
         Bool sameBitDepths = ( g_bitDepthLayer[CHANNEL_TYPE_LUMA][m_layerId] == g_bitDepthLayer[CHANNEL_TYPE_LUMA][refLayerId] ) && ( g_bitDepthLayer[CHANNEL_TYPE_CHROMA][m_layerId] == g_bitDepthLayer[CHANNEL_TYPE_CHROMA][refLayerId] );

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

@@ -188 +188 @@
 #define O0096_DEFAULT_DEPENDENCY_TYPE    1      ///< JCTVC-O0096: specify default dependency type for all direct reference layers
 
-#define RESAMPLING_CONSTRAINT_BUG_FIX    1
 #define O0098_SCALED_REF_LAYER_ID        1      ///< JCTVC-O0098: signal scaled reference id