Changeset 1090 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder


Ignore:
Timestamp:
1 Jul 2015, 00:53:31 (10 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

Location:
branches/SHM-dev/source/Lib/TLibEncoder
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp

    r1029 r1090  
    690690  TComSlice * pSlice = pCurPic->getSlice(pCurPic->getCurrSliceIdx());
    691691  UInt refLayerId = pSlice->getVPS()->getRefLayerId(pSlice->getLayerId(), refLayerIdc);
    692 #if MOVE_SCALED_OFFSET_TO_PPS
    693692  const Window &scalEL = pSlice->getPPS()->getScaledRefLayerWindowForLayer(refLayerId);
    694 #else
    695   const Window &scalEL = pSlice->getSPS()->getScaledRefLayerWindowForLayer(refLayerId);
    696 #endif
    697693  TComPicYuv *pcRecPicBL = pSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
    698694  // borders of down-sampled picture

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1085 r1090  
    316316#endif
    317317
    318 #if REF_REGION_OFFSET
    319318            WRITE_UVLC( pcPPS->getNumRefLayerLocationOffsets(),      "num_ref_loc_offsets" );
    320319            for(Int k = 0; k < pcPPS->getNumRefLayerLocationOffsets(); k++)
    … …  
    339338                WRITE_SVLC( refWindow.getWindowBottomOffset() >> 1, "ref_region_bottom_offset" );
    340339              }
    341 #if R0209_GENERIC_PHASE
    342340              WRITE_FLAG( pcPPS->getResamplePhaseSetPresentFlag(k) ? 1 : 0, "resample_phase_set_present_flag" );
    343341              if (pcPPS->getResamplePhaseSetPresentFlag(k))
    … …  
    348346                WRITE_UVLC( pcPPS->getPhaseVerChroma(k) + 8, "phase_ver_chroma_plus8" );
    349347              }
    350 #endif
    351348            }
    352 #else
    353 #if MOVE_SCALED_OFFSET_TO_PPS
    354             WRITE_UVLC( pcPPS->getNumScaledRefLayerOffsets(),      "num_scaled_ref_layer_offsets" );
    355             for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
    356             {
    357               Window scaledWindow = pcPPS->getScaledRefLayerWindow(k);
    358 #if O0098_SCALED_REF_LAYER_ID
    359               WRITE_CODE( pcPPS->getScaledRefLayerId(k), 6,          "scaled_ref_layer_id" );
    360 #endif
    361               WRITE_SVLC( scaledWindow.getWindowLeftOffset()   >> 1, "scaled_ref_layer_left_offset" );
    362               WRITE_SVLC( scaledWindow.getWindowTopOffset()    >> 1, "scaled_ref_layer_top_offset" );
    363               WRITE_SVLC( scaledWindow.getWindowRightOffset()  >> 1, "scaled_ref_layer_right_offset" );
    364               WRITE_SVLC( scaledWindow.getWindowBottomOffset() >> 1, "scaled_ref_layer_bottom_offset" );
    365             }
    366 #endif
    367 #endif
    368349#if Q0048_CGS_3D_ASYMLUT
    369350            bits = getNumberOfWrittenBits();
    … …  
    12681249      }
    12691250    }     
    1270 #if P0312_VERT_PHASE_ADJ
    1271     for(Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ )
    1272     {
    1273       UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i);
    1274       if( pcSlice->getSPS()->getVertPhasePositionEnableFlag(refLayerIdc) )
    1275       {
    1276         WRITE_FLAG( pcSlice->getVertPhasePositionFlag(refLayerIdc), "vert_phase_position_flag" );
    1277       }
    1278     }
    1279 #endif
    12801251#endif //SVC_EXTENSION
    12811252
    … …  
    25492520  }
    25502521#endif
    2551 #if O0215_PHASE_ALIGNMENT
    2552   WRITE_FLAG(vps->getPhaseAlignFlag(), "cross_layer_phase_alignment_flag" );
    2553 #endif
    25542522#if !IRAP_ALIGN_FLAG_IN_VPS_VUI
    25552523  WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
    … …  
    29932961  WRITE_FLAG(vps->getHigherLayerIrapSkipFlag(), "higher_layer_irap_skip_flag" );
    29942962#endif
    2995 #endif
    2996 #if P0312_VERT_PHASE_ADJ
    2997   WRITE_FLAG( vps->getVpsVuiVertPhaseInUseFlag(), "vps_vui_vert_phase_in_use_flag" );
    29982963#endif
    29992964#if N0160_VUI_EXT_ILP_REF
    … …  
    31223087  // Vertical MV component restriction is not used in SHVC CTC
    31233088  WRITE_FLAG( 0, "inter_view_mv_vert_constraint_flag" );
    3124 
    3125 #if !MOVE_SCALED_OFFSET_TO_PPS
    3126   if( pcSPS->getLayerId() > 0 )
    3127   {
    3128     WRITE_UVLC( pcSPS->getNumScaledRefLayerOffsets(),      "num_scaled_ref_layer_offsets" );
    3129     for(Int i = 0; i < pcSPS->getNumScaledRefLayerOffsets(); i++)
    3130     {
    3131       Window scaledWindow = pcSPS->getScaledRefLayerWindow(i);
    3132 #if O0098_SCALED_REF_LAYER_ID
    3133       WRITE_CODE( pcSPS->getScaledRefLayerId(i), 6,          "scaled_ref_layer_id" );
    3134 #endif
    3135       WRITE_SVLC( scaledWindow.getWindowLeftOffset()   >> 1, "scaled_ref_layer_left_offset" );
    3136       WRITE_SVLC( scaledWindow.getWindowTopOffset()    >> 1, "scaled_ref_layer_top_offset" );
    3137       WRITE_SVLC( scaledWindow.getWindowRightOffset()  >> 1, "scaled_ref_layer_right_offset" );
    3138       WRITE_SVLC( scaledWindow.getWindowBottomOffset() >> 1, "scaled_ref_layer_bottom_offset" );
    3139 #if P0312_VERT_PHASE_ADJ
    3140       WRITE_FLAG( scaledWindow.getVertPhasePositionEnableFlag(), "vert_phase_position_enable_flag" );
    3141 #endif
    3142     }
    3143   }
    3144 #endif
    31453089}
    31463090#endif //SVC_EXTENSION

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

    r1089 r1090  
    489489
    490490  Window   &getConformanceWindow()                           { return m_conformanceWindow; }
    491 #if P0312_VERT_PHASE_ADJ && !R0209_GENERIC_PHASE
    492   Void      setConformanceWindow (Int confLeft, Int confRight, Int confTop, Int confBottom ) { m_conformanceWindow.setWindow (confLeft, confRight, confTop, confBottom, false); }
    493 #else
    494491  Void      setConformanceWindow (Int confLeft, Int confRight, Int confTop, Int confBottom ) { m_conformanceWindow.setWindow (confLeft, confRight, confTop, confBottom); }
    495 #endif
    496492
    497493  Void      setFramesToBeEncoded            ( Int   i )      { m_framesToBeEncoded = i; }

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r1089 r1090  
    14771477#endif
    14781478
    1479 #if REF_REGION_OFFSET
    14801479        const Window &windowRL  = m_pcEncTop->getRefLayerWindowForLayer(pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc));
    14811480        Int widthBL   = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getWidth(COMPONENT_Y) - windowRL.getWindowLeftOffset() - windowRL.getWindowRightOffset();
    14821481        Int heightBL  = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight(COMPONENT_Y) - windowRL.getWindowTopOffset() - windowRL.getWindowBottomOffset();
    1483 #else
    1484         Int widthBL   = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getWidth(COMPONENT_Y);
    1485         Int heightBL  = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight(COMPONENT_Y);
    1486 #if Q0200_CONFORMANCE_BL_SIZE
    1487         Int chromaFormatIdc = pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getChromaFormatIdc();
    1488         const Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getConformanceWindow();
    1489         widthBL  -= ( confBL.getWindowLeftOffset() + confBL.getWindowRightOffset() ) * TComSPS::getWinUnitX( chromaFormatIdc );
    1490         heightBL -= ( confBL.getWindowTopOffset() + confBL.getWindowBottomOffset() ) * TComSPS::getWinUnitY( chromaFormatIdc );
    1491 #endif
    1492 #endif
    14931482        Int widthEL   = pcPic->getPicYuvRec()->getWidth(COMPONENT_Y)  - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset();
    14941483        Int heightEL  = pcPic->getPicYuvRec()->getHeight(COMPONENT_Y) - scalEL.getWindowTopOffset()  - scalEL.getWindowBottomOffset();
    14951484
    1496 #if RESAMPLING_FIX
    1497 #if REF_REGION_OFFSET
    14981485        // conformance check: the values of RefLayerRegionWidthInSamplesY, RefLayerRegionHeightInSamplesY, ScaledRefRegionWidthInSamplesY and ScaledRefRegionHeightInSamplesY shall be greater than 0
    14991486        assert(widthEL > 0 && heightEL > 0 && widthBL > 0 && widthEL > 0);
    … …  
    15021489        assert(widthEL >= widthBL && heightEL >= heightBL);
    15031490
    1504 #if R0209_GENERIC_PHASE
    15051491        // 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.
    15061492        Bool phaseSetPresentFlag;
    … …  
    15101496        assert( ( (widthEL  != widthBL)  || (phaseHorLuma == 0 && phaseHorChroma == 0) )
    15111497             && ( (heightEL != heightBL) || (phaseVerLuma == 0 && phaseVerChroma == 0) ) );
    1512 #endif
    1513 #endif
    1514 #endif
    15151498
    15161499        g_mvScalingFactor[refLayerIdc][0] = widthEL  == widthBL  ? 4096 : Clip3(-4096, 4095, ((widthEL  << 8) + (widthBL  >> 1)) / widthBL);
    … …  
    15561539          if( pcSlice->getVPS()->isSamplePredictionType( pcSlice->getVPS()->getLayerIdxInVps(m_layerId), pcSlice->getVPS()->getLayerIdxInVps(refLayerId) ) )
    15571540          {
    1558 #if P0312_VERT_PHASE_ADJ
    1559             //when PhasePositionEnableFlag is equal to 1, set vertPhasePositionFlag to 0 if BL is top field and 1 if bottom
    1560             if( scalEL.getVertPhasePositionEnableFlag() )
    1561             {
    1562               pcSlice->setVertPhasePositionFlag( pcSlice->getPOC()%2, refLayerIdc );
    1563             }
    1564 #endif
    1565 #if O0215_PHASE_ALIGNMENT_REMOVAL
    15661541            m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec() );
    1567 #else
    1568 #if O0215_PHASE_ALIGNMENT
    1569 #if O0194_JOINT_US_BITSHIFT
    1570 #if Q0048_CGS_3D_ASYMLUT
    1571             m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() );
    1572 #else
    1573             m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() );
    1574 #endif
    1575 #else
    1576 #if Q0048_CGS_3D_ASYMLUT
    1577             m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL, pcSlice->getVPS()->getPhaseAlignFlag() );
    1578 #else
    1579             m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL, pcSlice->getVPS()->getPhaseAlignFlag() );
    1580 #endif
    1581 #endif
    1582 #else
    1583 #if O0194_JOINT_US_BITSHIFT
    1584 #if Q0048_CGS_3D_ASYMLUT
    1585 #if REF_REGION_OFFSET
    1586           m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL, altRL );
    1587 #else
    1588           m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL );
    1589 #endif
    1590 #else
    1591           m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL );
    1592 #endif
    1593 #else
    1594 #if Q0048_CGS_3D_ASYMLUT
    1595             m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL );
    1596 #else
    1597             m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL );
    1598 #endif
    1599 #endif
    1600 #endif
    1601 #endif
    16021542          }
    16031543        }

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r1068 r1090  
    619619        for(UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
    620620        {
    621 #if MOVE_SCALED_OFFSET_TO_PPS
    622621#if O0098_SCALED_REF_LAYER_ID
    623622          const Window scalEL = getPPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
    … …  
    625624          const Window scalEL = getPPS()->getScaledRefLayerWindow(i);
    626625#endif
    627 #else
    628 #if O0098_SCALED_REF_LAYER_ID
    629           const Window scalEL = getSPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
    630 #else
    631           const Window scalEL = getSPS()->getScaledRefLayerWindow(i);
    632 #endif
    633 #endif
    634 #if REF_REGION_OFFSET
    635626          const Window altRL  = getPPS()->getRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
    636 #if RESAMPLING_FIX
    637627          Bool equalOffsets = scalEL.hasEqualOffset(altRL);
    638 #if R0209_GENERIC_PHASE
    639628          Bool zeroPhase = getPPS()->hasZeroResamplingPhase(m_cVPS.getRefLayerId(m_layerId, i));
    640 #endif
    641 #else
    642           Bool zeroOffsets = ( scalEL.getWindowLeftOffset() == 0 && scalEL.getWindowRightOffset() == 0 && scalEL.getWindowTopOffset() == 0 && scalEL.getWindowBottomOffset() == 0
    643                                && altRL.getWindowLeftOffset() == 0 && altRL.getWindowRightOffset() == 0 && altRL.getWindowTopOffset() == 0 && altRL.getWindowBottomOffset() == 0);
    644 #endif
    645 #else
    646           Bool zeroOffsets = ( scalEL.getWindowLeftOffset() == 0 && scalEL.getWindowRightOffset() == 0 && scalEL.getWindowTopOffset() == 0 && scalEL.getWindowBottomOffset() == 0 );
    647 #endif
    648629
    649630#if VPS_EXTN_DIRECT_REF_LAYERS
    … …  
    665646#else
    666647          if( m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !sameBitDepths
    667 #if REF_REGION_OFFSET && RESAMPLING_FIX
    668648            || !equalOffsets
    669 #if R0209_GENERIC_PHASE
    670649            || !zeroPhase
    671 #endif
    672 #else
    673             || !zeroOffsets
    674 #endif
    675650#endif
    676651#if Q0048_CGS_3D_ASYMLUT
    … …  
    683658#else
    684659          if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight()
    685 #if REF_REGION_OFFSET && RESAMPLING_FIX
    686660            || !equalOffsets
    687 #if R0209_GENERIC_PHASE
    688661            || !zeroPhase
    689 #endif
    690 #else
    691             || !zeroOffsets
    692 #endif
    693662          )
    694663#endif
    … …  
    720689        for(UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
    721690        {
    722 #if MOVE_SCALED_OFFSET_TO_PPS
    723691#if O0098_SCALED_REF_LAYER_ID
    724692          const Window scalEL = getPPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
    … …  
    726694          const Window scalEL = getPPS()->getScaledRefLayerWindow(i);
    727695#endif
    728 #else
    729 #if O0098_SCALED_REF_LAYER_ID
    730           const Window scalEL = getSPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
    731 #else
    732           const Window scalEL = getSPS()->getScaledRefLayerWindow(i);
    733 #endif
    734 #endif
    735 #if REF_REGION_OFFSET
    736696          const Window altRL  = getPPS()->getRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
    737 #if RESAMPLING_FIX
    738697          Bool equalOffsets = scalEL.hasEqualOffset(altRL);
    739 #if R0209_GENERIC_PHASE
    740698          Bool zeroPhase = getPPS()->hasZeroResamplingPhase(m_cVPS.getRefLayerId(m_layerId, i));
    741 #endif
    742 #else
    743           Bool zeroOffsets = ( scalEL.getWindowLeftOffset() == 0 && scalEL.getWindowRightOffset() == 0 && scalEL.getWindowTopOffset() == 0 && scalEL.getWindowBottomOffset() == 0
    744                                && altRL.getWindowLeftOffset() == 0 && altRL.getWindowRightOffset() == 0 && altRL.getWindowTopOffset() == 0 && altRL.getWindowBottomOffset() == 0);
    745 #endif
    746 #else
    747           Bool zeroOffsets = ( scalEL.getWindowLeftOffset() == 0 && scalEL.getWindowRightOffset() == 0 && scalEL.getWindowTopOffset() == 0 && scalEL.getWindowBottomOffset() == 0 );
    748 #endif
    749699
    750700#if VPS_EXTN_DIRECT_REF_LAYERS
    … …  
    758708
    759709          if( m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !sameBitDepths
    760 #if REF_REGION_OFFSET && RESAMPLING_FIX
    761710            || !equalOffsets
    762 #if R0209_GENERIC_PHASE
    763711            || !zeroPhase
    764 #endif
    765 #else
    766             || !zeroOffsets
    767 #endif
    768712#if Q0048_CGS_3D_ASYMLUT
    769713            || m_cPPS.getCGSFlag() > 0
    … …  
    775719#else
    776720          if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight()
    777 #if REF_REGION_OFFSET && RESAMPLING_FIX
    778721            || !equalOffsets
    779 #if R0209_GENERIC_PHASE
    780722            || !zeroPhase
    781 #endif
    782 #else
    783             || !zeroOffsets
    784 #endif
    785723          )
    786724#endif
    … …  
    832770#else
    833771  m_cSPS.setLayerId(m_layerId);
    834 #endif
    835 #if !MOVE_SCALED_OFFSET_TO_PPS
    836   m_cSPS.setNumScaledRefLayerOffsets(m_numScaledRefLayerOffsets);
    837   for(Int i = 0; i < m_cSPS.getNumScaledRefLayerOffsets(); i++)
    838   {
    839 #if O0098_SCALED_REF_LAYER_ID
    840     m_cSPS.setScaledRefLayerId(i, m_scaledRefLayerId[i]);
    841 #endif
    842     m_cSPS.getScaledRefLayerWindow(i) = m_scaledRefLayerWindow[i];
    843 #if P0312_VERT_PHASE_ADJ
    844     m_cSPS.setVertPhasePositionEnableFlag( m_scaledRefLayerId[i], m_scaledRefLayerWindow[i].getVertPhasePositionEnableFlag() );
    845 #endif
    846   }
    847772#endif
    848773#endif //SVC_EXTENSION
    … …  
    11491074  }
    11501075#endif
    1151 #if MOVE_SCALED_OFFSET_TO_PPS
    11521076  m_cPPS.setNumRefLayerLocationOffsets(m_numRefLayerLocationOffsets);
    11531077  for(Int i = 0; i < m_cPPS.getNumRefLayerLocationOffsets(); i++)
    … …  
    11571081#endif
    11581082    m_cPPS.getScaledRefLayerWindow(i) = m_scaledRefLayerWindow[i];
    1159 #if REF_REGION_OFFSET
    11601083    m_cPPS.getRefLayerWindow(i) = m_refLayerWindow[i];
    11611084    m_cPPS.setScaledRefLayerOffsetPresentFlag( i, m_scaledRefLayerOffsetPresentFlag[i] );
    11621085    m_cPPS.setRefRegionOffsetPresentFlag( i, m_refRegionOffsetPresentFlag[i] );
    1163 #endif
    1164 #if R0209_GENERIC_PHASE
    11651086    m_cPPS.setResamplePhaseSetPresentFlag( i, m_resamplePhaseSetPresentFlag[i] );
    11661087    m_cPPS.setPhaseHorLuma( m_refLocationOffsetLayerId[i], m_phaseHorLuma[i] );
    … …  
    11681089    m_cPPS.setPhaseHorChroma( m_refLocationOffsetLayerId[i], m_phaseHorChroma[i] );
    11691090    m_cPPS.setPhaseVerChroma( m_refLocationOffsetLayerId[i], m_phaseVerChroma[i] );
    1170 #endif
    1171 #if P0312_VERT_PHASE_ADJ
    1172     m_cPPS.setVertPhasePositionEnableFlag( m_scaledRefLayerId[i], m_scaledRefLayerWindow[i].getVertPhasePositionEnableFlag() );
    1173 #endif
    1174   }
    1175 #endif
     1091  }
    11761092#if Q0048_CGS_3D_ASYMLUT
    11771093  m_cPPS.setCGSFlag( m_nCGSFlag );
    … …  
    16881604  return win;
    16891605}
    1690 #if REF_REGION_OFFSET
     1606
    16911607Window& TEncTop::getRefLayerWindowForLayer(Int layerId)
    16921608{
    … …  
    17051621}
    17061622#endif
    1707 #endif
    17081623#endif //SVC_EXTENSION
    17091624//! \}

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h

    r1057 r1090  
    127127#endif
    128128  Window                  m_scaledRefLayerWindow[MAX_LAYERS];
    129 #if REF_REGION_OFFSET
    130129  UInt                    m_numRefLayerOffsets;
    131130  UInt                    m_refLayerId[MAX_LAYERS];
    … …  
    133132  Bool                    m_scaledRefLayerOffsetPresentFlag[MAX_LAYERS];
    134133  Bool                    m_refRegionOffsetPresentFlag[MAX_LAYERS];
    135 #endif
    136 #if R0209_GENERIC_PHASE
    137134  Int                     m_phaseHorLuma  [MAX_LAYERS];
    138135  Int                     m_phaseVerLuma  [MAX_LAYERS];
    … …  
    140137  Int                     m_phaseVerChroma[MAX_LAYERS];
    141138  Int                     m_resamplePhaseSetPresentFlag[MAX_LAYERS];
    142 #endif
    143 #if P0312_VERT_PHASE_ADJ
    144   Bool                    m_vertPhasePositionEnableFlag[MAX_LAYERS];
    145 #endif
    146139#if POC_RESET_FLAG || POC_RESET_IDC_ENCODER
    147140  Int                     m_pocAdjustmentValue;
    … …  
    232225#endif
    233226  Window&   getScaledRefLayerWindow(Int x)                 { return m_scaledRefLayerWindow[x];        }
    234 #if REF_REGION_OFFSET
    235227  Void      setNumRefLayerOffsets(Int x) { m_numRefLayerOffsets = x; }
    236228  UInt      getNumRefLayerOffsets() { return m_numRefLayerOffsets; }
    … …  
    243235  Bool      getRefRegionOffsetPresentFlag(Int x) { return m_refRegionOffsetPresentFlag[x]; }
    244236  Void      setRefRegionOffsetPresentFlag(Int x, Bool b) { m_refRegionOffsetPresentFlag[x] = b; }
    245 #endif
    246 #if P0312_VERT_PHASE_ADJ
    247   Void      setVertPhasePositionEnableFlag(Int x, Bool b)  { m_vertPhasePositionEnableFlag[x] = b;    }
    248   UInt      getVertPhasePositionEnableFlag(Int x)          { return m_vertPhasePositionEnableFlag[x]; }
    249 #endif
    250 #if R0209_GENERIC_PHASE
    251237  Int       getPhaseHorLuma(Int x) { return m_phaseHorLuma[x]; }
    252238  Int       getPhaseVerLuma(Int x) { return m_phaseVerLuma[x]; }
    … …  
    259245  Bool      getResamplePhaseSetPresentFlag(Int x) { return m_resamplePhaseSetPresentFlag[x]; }
    260246  Void      setResamplePhaseSetPresentFlag(Int x, Bool b) { m_resamplePhaseSetPresentFlag[x] = b; }
    261 #endif
    262247
    263248  TComPic** getIlpList() { return m_cIlpPic; }
Note: See TracChangeset for help on using the changeset viewer.