Index: branches/SHM-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp (revision 1089) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp (revision 1090) @@ -690,9 +690,5 @@ TComSlice * pSlice = pCurPic->getSlice(pCurPic->getCurrSliceIdx()); UInt refLayerId = pSlice->getVPS()->getRefLayerId(pSlice->getLayerId(), refLayerIdc); -#if MOVE_SCALED_OFFSET_TO_PPS const Window &scalEL = pSlice->getPPS()->getScaledRefLayerWindowForLayer(refLayerId); -#else - const Window &scalEL = pSlice->getSPS()->getScaledRefLayerWindowForLayer(refLayerId); -#endif TComPicYuv *pcRecPicBL = pSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(); // borders of down-sampled picture Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 1089) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 1090) @@ -316,5 +316,4 @@ #endif -#if REF_REGION_OFFSET WRITE_UVLC( pcPPS->getNumRefLayerLocationOffsets(), "num_ref_loc_offsets" ); for(Int k = 0; k < pcPPS->getNumRefLayerLocationOffsets(); k++) @@ -339,5 +338,4 @@ WRITE_SVLC( refWindow.getWindowBottomOffset() >> 1, "ref_region_bottom_offset" ); } -#if R0209_GENERIC_PHASE WRITE_FLAG( pcPPS->getResamplePhaseSetPresentFlag(k) ? 1 : 0, "resample_phase_set_present_flag" ); if (pcPPS->getResamplePhaseSetPresentFlag(k)) @@ -348,22 +346,5 @@ WRITE_UVLC( pcPPS->getPhaseVerChroma(k) + 8, "phase_ver_chroma_plus8" ); } -#endif } -#else -#if MOVE_SCALED_OFFSET_TO_PPS - WRITE_UVLC( pcPPS->getNumScaledRefLayerOffsets(), "num_scaled_ref_layer_offsets" ); - for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++) - { - Window scaledWindow = pcPPS->getScaledRefLayerWindow(k); -#if O0098_SCALED_REF_LAYER_ID - WRITE_CODE( pcPPS->getScaledRefLayerId(k), 6, "scaled_ref_layer_id" ); -#endif - WRITE_SVLC( scaledWindow.getWindowLeftOffset() >> 1, "scaled_ref_layer_left_offset" ); - WRITE_SVLC( scaledWindow.getWindowTopOffset() >> 1, "scaled_ref_layer_top_offset" ); - WRITE_SVLC( scaledWindow.getWindowRightOffset() >> 1, "scaled_ref_layer_right_offset" ); - WRITE_SVLC( scaledWindow.getWindowBottomOffset() >> 1, "scaled_ref_layer_bottom_offset" ); - } -#endif -#endif #if Q0048_CGS_3D_ASYMLUT bits = getNumberOfWrittenBits(); @@ -1268,14 +1249,4 @@ } } -#if P0312_VERT_PHASE_ADJ - for(Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ ) - { - UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i); - if( pcSlice->getSPS()->getVertPhasePositionEnableFlag(refLayerIdc) ) - { - WRITE_FLAG( pcSlice->getVertPhasePositionFlag(refLayerIdc), "vert_phase_position_flag" ); - } - } -#endif #endif //SVC_EXTENSION @@ -2549,7 +2520,4 @@ } #endif -#if O0215_PHASE_ALIGNMENT - WRITE_FLAG(vps->getPhaseAlignFlag(), "cross_layer_phase_alignment_flag" ); -#endif #if !IRAP_ALIGN_FLAG_IN_VPS_VUI WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag"); @@ -2993,7 +2961,4 @@ WRITE_FLAG(vps->getHigherLayerIrapSkipFlag(), "higher_layer_irap_skip_flag" ); #endif -#endif -#if P0312_VERT_PHASE_ADJ - WRITE_FLAG( vps->getVpsVuiVertPhaseInUseFlag(), "vps_vui_vert_phase_in_use_flag" ); #endif #if N0160_VUI_EXT_ILP_REF @@ -3122,25 +3087,4 @@ // Vertical MV component restriction is not used in SHVC CTC WRITE_FLAG( 0, "inter_view_mv_vert_constraint_flag" ); - -#if !MOVE_SCALED_OFFSET_TO_PPS - if( pcSPS->getLayerId() > 0 ) - { - WRITE_UVLC( pcSPS->getNumScaledRefLayerOffsets(), "num_scaled_ref_layer_offsets" ); - for(Int i = 0; i < pcSPS->getNumScaledRefLayerOffsets(); i++) - { - Window scaledWindow = pcSPS->getScaledRefLayerWindow(i); -#if O0098_SCALED_REF_LAYER_ID - WRITE_CODE( pcSPS->getScaledRefLayerId(i), 6, "scaled_ref_layer_id" ); -#endif - WRITE_SVLC( scaledWindow.getWindowLeftOffset() >> 1, "scaled_ref_layer_left_offset" ); - WRITE_SVLC( scaledWindow.getWindowTopOffset() >> 1, "scaled_ref_layer_top_offset" ); - WRITE_SVLC( scaledWindow.getWindowRightOffset() >> 1, "scaled_ref_layer_right_offset" ); - WRITE_SVLC( scaledWindow.getWindowBottomOffset() >> 1, "scaled_ref_layer_bottom_offset" ); -#if P0312_VERT_PHASE_ADJ - WRITE_FLAG( scaledWindow.getVertPhasePositionEnableFlag(), "vert_phase_position_enable_flag" ); -#endif - } - } -#endif } #endif //SVC_EXTENSION Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h (revision 1089) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h (revision 1090) @@ -489,9 +489,5 @@ Window &getConformanceWindow() { return m_conformanceWindow; } -#if P0312_VERT_PHASE_ADJ && !R0209_GENERIC_PHASE - Void setConformanceWindow (Int confLeft, Int confRight, Int confTop, Int confBottom ) { m_conformanceWindow.setWindow (confLeft, confRight, confTop, confBottom, false); } -#else Void setConformanceWindow (Int confLeft, Int confRight, Int confTop, Int confBottom ) { m_conformanceWindow.setWindow (confLeft, confRight, confTop, confBottom); } -#endif Void setFramesToBeEncoded ( Int i ) { m_framesToBeEncoded = i; } Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (revision 1089) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (revision 1090) @@ -1477,23 +1477,10 @@ #endif -#if REF_REGION_OFFSET const Window &windowRL = m_pcEncTop->getRefLayerWindowForLayer(pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc)); Int widthBL = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getWidth(COMPONENT_Y) - windowRL.getWindowLeftOffset() - windowRL.getWindowRightOffset(); Int heightBL = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight(COMPONENT_Y) - windowRL.getWindowTopOffset() - windowRL.getWindowBottomOffset(); -#else - Int widthBL = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getWidth(COMPONENT_Y); - Int heightBL = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight(COMPONENT_Y); -#if Q0200_CONFORMANCE_BL_SIZE - Int chromaFormatIdc = pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getChromaFormatIdc(); - const Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getConformanceWindow(); - widthBL -= ( confBL.getWindowLeftOffset() + confBL.getWindowRightOffset() ) * TComSPS::getWinUnitX( chromaFormatIdc ); - heightBL -= ( confBL.getWindowTopOffset() + confBL.getWindowBottomOffset() ) * TComSPS::getWinUnitY( chromaFormatIdc ); -#endif -#endif Int widthEL = pcPic->getPicYuvRec()->getWidth(COMPONENT_Y) - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset(); Int heightEL = pcPic->getPicYuvRec()->getHeight(COMPONENT_Y) - scalEL.getWindowTopOffset() - scalEL.getWindowBottomOffset(); -#if RESAMPLING_FIX -#if REF_REGION_OFFSET // conformance check: the values of RefLayerRegionWidthInSamplesY, RefLayerRegionHeightInSamplesY, ScaledRefRegionWidthInSamplesY and ScaledRefRegionHeightInSamplesY shall be greater than 0 assert(widthEL > 0 && heightEL > 0 && widthBL > 0 && widthEL > 0); @@ -1502,5 +1489,4 @@ assert(widthEL >= widthBL && heightEL >= heightBL); -#if R0209_GENERIC_PHASE // conformance check: when ScaledRefRegionWidthInSamplesY is equal to RefLayerRegionWidthInSamplesY, PhaseHorY shall be equal to 0, when ScaledRefRegionWidthInSamplesC is equal to RefLayerRegionWidthInSamplesC, PhaseHorC shall be equal to 0, when ScaledRefRegionHeightInSamplesY is equal to RefLayerRegionHeightInSamplesY, PhaseVerY shall be equal to 0, and when ScaledRefRegionHeightInSamplesC is equal to RefLayerRegionHeightInSamplesC, PhaseVerC shall be equal to 0. Bool phaseSetPresentFlag; @@ -1510,7 +1496,4 @@ assert( ( (widthEL != widthBL) || (phaseHorLuma == 0 && phaseHorChroma == 0) ) && ( (heightEL != heightBL) || (phaseVerLuma == 0 && phaseVerChroma == 0) ) ); -#endif -#endif -#endif g_mvScalingFactor[refLayerIdc][0] = widthEL == widthBL ? 4096 : Clip3(-4096, 4095, ((widthEL << 8) + (widthBL >> 1)) / widthBL); @@ -1556,48 +1539,5 @@ if( pcSlice->getVPS()->isSamplePredictionType( pcSlice->getVPS()->getLayerIdxInVps(m_layerId), pcSlice->getVPS()->getLayerIdxInVps(refLayerId) ) ) { -#if P0312_VERT_PHASE_ADJ - //when PhasePositionEnableFlag is equal to 1, set vertPhasePositionFlag to 0 if BL is top field and 1 if bottom - if( scalEL.getVertPhasePositionEnableFlag() ) - { - pcSlice->setVertPhasePositionFlag( pcSlice->getPOC()%2, refLayerIdc ); - } -#endif -#if O0215_PHASE_ALIGNMENT_REMOVAL m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec() ); -#else -#if O0215_PHASE_ALIGNMENT -#if O0194_JOINT_US_BITSHIFT -#if Q0048_CGS_3D_ASYMLUT - m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() ); -#else - m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() ); -#endif -#else -#if Q0048_CGS_3D_ASYMLUT - m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL, pcSlice->getVPS()->getPhaseAlignFlag() ); -#else - m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL, pcSlice->getVPS()->getPhaseAlignFlag() ); -#endif -#endif -#else -#if O0194_JOINT_US_BITSHIFT -#if Q0048_CGS_3D_ASYMLUT -#if REF_REGION_OFFSET - m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL, altRL ); -#else - m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL ); -#endif -#else - m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL ); -#endif -#else -#if Q0048_CGS_3D_ASYMLUT - m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL ); -#else - m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL ); -#endif -#endif -#endif -#endif } } Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (revision 1089) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (revision 1090) @@ -619,5 +619,4 @@ for(UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ ) { -#if MOVE_SCALED_OFFSET_TO_PPS #if O0098_SCALED_REF_LAYER_ID const Window scalEL = getPPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i)); @@ -625,25 +624,7 @@ const Window scalEL = getPPS()->getScaledRefLayerWindow(i); #endif -#else -#if O0098_SCALED_REF_LAYER_ID - const Window scalEL = getSPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i)); -#else - const Window scalEL = getSPS()->getScaledRefLayerWindow(i); -#endif -#endif -#if REF_REGION_OFFSET const Window altRL = getPPS()->getRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i)); -#if RESAMPLING_FIX Bool equalOffsets = scalEL.hasEqualOffset(altRL); -#if R0209_GENERIC_PHASE Bool zeroPhase = getPPS()->hasZeroResamplingPhase(m_cVPS.getRefLayerId(m_layerId, i)); -#endif -#else - Bool zeroOffsets = ( scalEL.getWindowLeftOffset() == 0 && scalEL.getWindowRightOffset() == 0 && scalEL.getWindowTopOffset() == 0 && scalEL.getWindowBottomOffset() == 0 - && altRL.getWindowLeftOffset() == 0 && altRL.getWindowRightOffset() == 0 && altRL.getWindowTopOffset() == 0 && altRL.getWindowBottomOffset() == 0); -#endif -#else - Bool zeroOffsets = ( scalEL.getWindowLeftOffset() == 0 && scalEL.getWindowRightOffset() == 0 && scalEL.getWindowTopOffset() == 0 && scalEL.getWindowBottomOffset() == 0 ); -#endif #if VPS_EXTN_DIRECT_REF_LAYERS @@ -665,12 +646,6 @@ #else if( m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !sameBitDepths -#if REF_REGION_OFFSET && RESAMPLING_FIX || !equalOffsets -#if R0209_GENERIC_PHASE || !zeroPhase -#endif -#else - || !zeroOffsets -#endif #endif #if Q0048_CGS_3D_ASYMLUT @@ -683,12 +658,6 @@ #else if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() -#if REF_REGION_OFFSET && RESAMPLING_FIX || !equalOffsets -#if R0209_GENERIC_PHASE || !zeroPhase -#endif -#else - || !zeroOffsets -#endif ) #endif @@ -720,5 +689,4 @@ for(UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ ) { -#if MOVE_SCALED_OFFSET_TO_PPS #if O0098_SCALED_REF_LAYER_ID const Window scalEL = getPPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i)); @@ -726,25 +694,7 @@ const Window scalEL = getPPS()->getScaledRefLayerWindow(i); #endif -#else -#if O0098_SCALED_REF_LAYER_ID - const Window scalEL = getSPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i)); -#else - const Window scalEL = getSPS()->getScaledRefLayerWindow(i); -#endif -#endif -#if REF_REGION_OFFSET const Window altRL = getPPS()->getRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i)); -#if RESAMPLING_FIX Bool equalOffsets = scalEL.hasEqualOffset(altRL); -#if R0209_GENERIC_PHASE Bool zeroPhase = getPPS()->hasZeroResamplingPhase(m_cVPS.getRefLayerId(m_layerId, i)); -#endif -#else - Bool zeroOffsets = ( scalEL.getWindowLeftOffset() == 0 && scalEL.getWindowRightOffset() == 0 && scalEL.getWindowTopOffset() == 0 && scalEL.getWindowBottomOffset() == 0 - && altRL.getWindowLeftOffset() == 0 && altRL.getWindowRightOffset() == 0 && altRL.getWindowTopOffset() == 0 && altRL.getWindowBottomOffset() == 0); -#endif -#else - Bool zeroOffsets = ( scalEL.getWindowLeftOffset() == 0 && scalEL.getWindowRightOffset() == 0 && scalEL.getWindowTopOffset() == 0 && scalEL.getWindowBottomOffset() == 0 ); -#endif #if VPS_EXTN_DIRECT_REF_LAYERS @@ -758,12 +708,6 @@ if( m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !sameBitDepths -#if REF_REGION_OFFSET && RESAMPLING_FIX || !equalOffsets -#if R0209_GENERIC_PHASE || !zeroPhase -#endif -#else - || !zeroOffsets -#endif #if Q0048_CGS_3D_ASYMLUT || m_cPPS.getCGSFlag() > 0 @@ -775,12 +719,6 @@ #else if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() -#if REF_REGION_OFFSET && RESAMPLING_FIX || !equalOffsets -#if R0209_GENERIC_PHASE || !zeroPhase -#endif -#else - || !zeroOffsets -#endif ) #endif @@ -832,17 +770,4 @@ #else m_cSPS.setLayerId(m_layerId); -#endif -#if !MOVE_SCALED_OFFSET_TO_PPS - m_cSPS.setNumScaledRefLayerOffsets(m_numScaledRefLayerOffsets); - for(Int i = 0; i < m_cSPS.getNumScaledRefLayerOffsets(); i++) - { -#if O0098_SCALED_REF_LAYER_ID - m_cSPS.setScaledRefLayerId(i, m_scaledRefLayerId[i]); -#endif - m_cSPS.getScaledRefLayerWindow(i) = m_scaledRefLayerWindow[i]; -#if P0312_VERT_PHASE_ADJ - m_cSPS.setVertPhasePositionEnableFlag( m_scaledRefLayerId[i], m_scaledRefLayerWindow[i].getVertPhasePositionEnableFlag() ); -#endif - } #endif #endif //SVC_EXTENSION @@ -1149,5 +1074,4 @@ } #endif -#if MOVE_SCALED_OFFSET_TO_PPS m_cPPS.setNumRefLayerLocationOffsets(m_numRefLayerLocationOffsets); for(Int i = 0; i < m_cPPS.getNumRefLayerLocationOffsets(); i++) @@ -1157,10 +1081,7 @@ #endif m_cPPS.getScaledRefLayerWindow(i) = m_scaledRefLayerWindow[i]; -#if REF_REGION_OFFSET m_cPPS.getRefLayerWindow(i) = m_refLayerWindow[i]; m_cPPS.setScaledRefLayerOffsetPresentFlag( i, m_scaledRefLayerOffsetPresentFlag[i] ); m_cPPS.setRefRegionOffsetPresentFlag( i, m_refRegionOffsetPresentFlag[i] ); -#endif -#if R0209_GENERIC_PHASE m_cPPS.setResamplePhaseSetPresentFlag( i, m_resamplePhaseSetPresentFlag[i] ); m_cPPS.setPhaseHorLuma( m_refLocationOffsetLayerId[i], m_phaseHorLuma[i] ); @@ -1168,10 +1089,5 @@ m_cPPS.setPhaseHorChroma( m_refLocationOffsetLayerId[i], m_phaseHorChroma[i] ); m_cPPS.setPhaseVerChroma( m_refLocationOffsetLayerId[i], m_phaseVerChroma[i] ); -#endif -#if P0312_VERT_PHASE_ADJ - m_cPPS.setVertPhasePositionEnableFlag( m_scaledRefLayerId[i], m_scaledRefLayerWindow[i].getVertPhasePositionEnableFlag() ); -#endif - } -#endif + } #if Q0048_CGS_3D_ASYMLUT m_cPPS.setCGSFlag( m_nCGSFlag ); @@ -1688,5 +1604,5 @@ return win; } -#if REF_REGION_OFFSET + Window& TEncTop::getRefLayerWindowForLayer(Int layerId) { @@ -1705,5 +1621,4 @@ } #endif -#endif #endif //SVC_EXTENSION //! \} Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h (revision 1089) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h (revision 1090) @@ -127,5 +127,4 @@ #endif Window m_scaledRefLayerWindow[MAX_LAYERS]; -#if REF_REGION_OFFSET UInt m_numRefLayerOffsets; UInt m_refLayerId[MAX_LAYERS]; @@ -133,6 +132,4 @@ Bool m_scaledRefLayerOffsetPresentFlag[MAX_LAYERS]; Bool m_refRegionOffsetPresentFlag[MAX_LAYERS]; -#endif -#if R0209_GENERIC_PHASE Int m_phaseHorLuma [MAX_LAYERS]; Int m_phaseVerLuma [MAX_LAYERS]; @@ -140,8 +137,4 @@ Int m_phaseVerChroma[MAX_LAYERS]; Int m_resamplePhaseSetPresentFlag[MAX_LAYERS]; -#endif -#if P0312_VERT_PHASE_ADJ - Bool m_vertPhasePositionEnableFlag[MAX_LAYERS]; -#endif #if POC_RESET_FLAG || POC_RESET_IDC_ENCODER Int m_pocAdjustmentValue; @@ -232,5 +225,4 @@ #endif Window& getScaledRefLayerWindow(Int x) { return m_scaledRefLayerWindow[x]; } -#if REF_REGION_OFFSET Void setNumRefLayerOffsets(Int x) { m_numRefLayerOffsets = x; } UInt getNumRefLayerOffsets() { return m_numRefLayerOffsets; } @@ -243,10 +235,4 @@ Bool getRefRegionOffsetPresentFlag(Int x) { return m_refRegionOffsetPresentFlag[x]; } Void setRefRegionOffsetPresentFlag(Int x, Bool b) { m_refRegionOffsetPresentFlag[x] = b; } -#endif -#if P0312_VERT_PHASE_ADJ - Void setVertPhasePositionEnableFlag(Int x, Bool b) { m_vertPhasePositionEnableFlag[x] = b; } - UInt getVertPhasePositionEnableFlag(Int x) { return m_vertPhasePositionEnableFlag[x]; } -#endif -#if R0209_GENERIC_PHASE Int getPhaseHorLuma(Int x) { return m_phaseHorLuma[x]; } Int getPhaseVerLuma(Int x) { return m_phaseVerLuma[x]; } @@ -259,5 +245,4 @@ Bool getResamplePhaseSetPresentFlag(Int x) { return m_resamplePhaseSetPresentFlag[x]; } Void setResamplePhaseSetPresentFlag(Int x, Bool b) { m_resamplePhaseSetPresentFlag[x] = b; } -#endif TComPic** getIlpList() { return m_cIlpPic; }