Ignore:
Timestamp:
8 Jul 2015, 20:57:55 (9 years ago)
Author:
seregin
Message:

macro cleanup: REPN_FORMAT_IN_VPS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1200 r1203  
    738738  {
    739739    Window &conf = pcSPS->getConformanceWindow();
    740 #if REPN_FORMAT_IN_VPS
     740#if SVC_EXTENSION
    741741    READ_UVLC(   uiCode, "conf_win_left_offset" );               conf.setWindowLeftOffset  ( uiCode );
    742742    READ_UVLC(   uiCode, "conf_win_right_offset" );              conf.setWindowRightOffset ( uiCode );
     
    11881188    pcSlice->setDependentSliceSegmentFlag(false);
    11891189  }
    1190 #if REPN_FORMAT_IN_VPS
     1190#if SVC_EXTENSION
    11911191  Int numCTUs = ((pcSlice->getPicWidthInLumaSamples()+sps->getMaxCUWidth()-1)/sps->getMaxCUWidth())*((pcSlice->getPicHeightInLumaSamples()+sps->getMaxCUHeight()-1)/sps->getMaxCUHeight());
    11921192#else
     
    17891789    pcSlice->setSliceQp (26 + pps->getPicInitQPMinus26() + iCode);
    17901790
    1791 #if REPN_FORMAT_IN_VPS
     1791#if SVC_EXTENSION
    17921792    g_bitDepthLayer[CHANNEL_TYPE_LUMA][pcSlice->getLayerId()] = pcSlice->getBitDepthY();
    17931793    g_bitDepthLayer[CHANNEL_TYPE_CHROMA][pcSlice->getLayerId()] = pcSlice->getBitDepthC();
     
    23362336#endif
    23372337
    2338 #if REPN_FORMAT_IN_VPS
     2338#if SVC_EXTENSION
    23392339  Int qpBdOffsetY = pcCU->getSlice()->getQpBDOffsetY();
    23402340#else
     
    29572957  vps->checkNecessaryLayerFlagCondition(); 
    29582958
    2959 #if REPN_FORMAT_IN_VPS
    29602959  READ_UVLC( uiCode, "vps_num_rep_formats_minus1" );
    29612960  vps->setVpsNumRepFormats( uiCode + 1 );
     
    30053004    }
    30063005  }
    3007 #endif
    30083006
    30093007  READ_FLAG(uiCode, "max_one_active_ref_layer_flag" );
     
    31833181}
    31843182
    3185 #if REPN_FORMAT_IN_VPS
    31863183Void  TDecCavlc::parseRepFormat( RepFormat *repFormat, RepFormat *repFormatPrev )
    31873184{
     
    32353232  }
    32363233}
    3237 #endif //REPN_FORMAT_IN_VPS
     3234
    32383235#if VPS_DPB_SIZE_TABLE
    32393236Void TDecCavlc::parseVpsDpbSizeTable( TComVPS *vps )
Note: See TracChangeset for help on using the changeset viewer.