Changeset 1090 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

Timestamp:

1 Jul 2015, 00:53:31 (9 years ago)

Author:

seregin

Message:

cleanup macros: Q0120_PHASE_CALCULATION, P0312_VERT_PHASE_ADJ, Q0200_CONFORMANCE_BL_SIZE, R0220_REMOVE_EL_CLIP, MOVE_SCALED_OFFSET_TO_PPS, R0209_GENERIC_PHASE, REF_REGION_OFFSET, O0215_PHASE_ALIGNMENT_REMOVAL, O0215_PHASE_ALIGNMENT, RESAMPLING_FIX

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h (modified) (3 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

@@ -101 +101 @@
   Int       m_scaledRefLayerRightOffset [MAX_LAYERS];
   Int       m_scaledRefLayerBottomOffset[MAX_LAYERS];
-#if REF_REGION_OFFSET
   Bool      m_scaledRefLayerOffsetPresentFlag [MAX_LAYERS];
   Bool      m_refRegionOffsetPresentFlag      [MAX_LAYERS];
@@ -108 +107 @@
   Int       m_refRegionRightOffset [MAX_LAYERS];
   Int       m_refRegionBottomOffset[MAX_LAYERS];
-#endif
-#if P0312_VERT_PHASE_ADJ
-  Bool      m_vertPhasePositionEnableFlag[MAX_LAYERS];
-#endif
-#if R0209_GENERIC_PHASE
   Int       m_phaseHorLuma  [MAX_LAYERS];
   Int       m_phaseVerLuma  [MAX_LAYERS];
@@ -118 +112 @@
   Int       m_phaseVerChroma[MAX_LAYERS];
   Bool      m_resamplePhaseSetPresentFlag [MAX_LAYERS];
-#endif
 
   Int       m_inputBitDepth   [MAX_NUM_CHANNEL_TYPE];         ///< bit-depth of input file