Changeset 1203 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
- Timestamp:
- 8 Jul 2015, 20:57:55 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp ¶
r1200 r1203 738 738 { 739 739 Window &conf = pcSPS->getConformanceWindow(); 740 #if REPN_FORMAT_IN_VPS740 #if SVC_EXTENSION 741 741 READ_UVLC( uiCode, "conf_win_left_offset" ); conf.setWindowLeftOffset ( uiCode ); 742 742 READ_UVLC( uiCode, "conf_win_right_offset" ); conf.setWindowRightOffset ( uiCode ); … … 1188 1188 pcSlice->setDependentSliceSegmentFlag(false); 1189 1189 } 1190 #if REPN_FORMAT_IN_VPS1190 #if SVC_EXTENSION 1191 1191 Int numCTUs = ((pcSlice->getPicWidthInLumaSamples()+sps->getMaxCUWidth()-1)/sps->getMaxCUWidth())*((pcSlice->getPicHeightInLumaSamples()+sps->getMaxCUHeight()-1)/sps->getMaxCUHeight()); 1192 1192 #else … … 1789 1789 pcSlice->setSliceQp (26 + pps->getPicInitQPMinus26() + iCode); 1790 1790 1791 #if REPN_FORMAT_IN_VPS1791 #if SVC_EXTENSION 1792 1792 g_bitDepthLayer[CHANNEL_TYPE_LUMA][pcSlice->getLayerId()] = pcSlice->getBitDepthY(); 1793 1793 g_bitDepthLayer[CHANNEL_TYPE_CHROMA][pcSlice->getLayerId()] = pcSlice->getBitDepthC(); … … 2336 2336 #endif 2337 2337 2338 #if REPN_FORMAT_IN_VPS2338 #if SVC_EXTENSION 2339 2339 Int qpBdOffsetY = pcCU->getSlice()->getQpBDOffsetY(); 2340 2340 #else … … 2957 2957 vps->checkNecessaryLayerFlagCondition(); 2958 2958 2959 #if REPN_FORMAT_IN_VPS2960 2959 READ_UVLC( uiCode, "vps_num_rep_formats_minus1" ); 2961 2960 vps->setVpsNumRepFormats( uiCode + 1 ); … … 3005 3004 } 3006 3005 } 3007 #endif3008 3006 3009 3007 READ_FLAG(uiCode, "max_one_active_ref_layer_flag" ); … … 3183 3181 } 3184 3182 3185 #if REPN_FORMAT_IN_VPS3186 3183 Void TDecCavlc::parseRepFormat( RepFormat *repFormat, RepFormat *repFormatPrev ) 3187 3184 { … … 3235 3232 } 3236 3233 } 3237 #endif //REPN_FORMAT_IN_VPS 3234 3238 3235 #if VPS_DPB_SIZE_TABLE 3239 3236 Void TDecCavlc::parseVpsDpbSizeTable( TComVPS *vps )
Note: See TracChangeset for help on using the changeset viewer.