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

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.cpp (modified) (3 diffs)

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

@@ -72 +72 @@
   ::memset(m_scaledRefLayerRightOffset,  0, sizeof(m_scaledRefLayerRightOffset));
   ::memset(m_scaledRefLayerBottomOffset, 0, sizeof(m_scaledRefLayerBottomOffset));
-#if REF_REGION_OFFSET
   ::memset(m_scaledRefLayerOffsetPresentFlag, 0, sizeof(m_scaledRefLayerOffsetPresentFlag));
   ::memset(m_refRegionOffsetPresentFlag, 0, sizeof(m_refRegionOffsetPresentFlag));
@@ -79 +78 @@
   ::memset(m_refRegionRightOffset,  0, sizeof(m_refRegionRightOffset));
   ::memset(m_refRegionBottomOffset, 0, sizeof(m_refRegionBottomOffset));
-#endif
-#if R0209_GENERIC_PHASE
   ::memset(m_resamplePhaseSetPresentFlag, 0, sizeof(m_resamplePhaseSetPresentFlag));
   ::memset(m_phaseHorLuma,   0, sizeof(m_phaseHorLuma));
@@ -86 +83 @@
   ::memset(m_phaseHorChroma, 0, sizeof(m_phaseHorChroma));
   ::memset(m_phaseVerChroma, 0, sizeof(m_phaseVerChroma));
-#else
-#if P0312_VERT_PHASE_ADJ 
-  ::memset(m_vertPhasePositionEnableFlag, 0, sizeof(m_vertPhasePositionEnableFlag));
-#endif
-#endif
 }