Index: trunk/source/Lib/TLibDecoder/SEIread.cpp =================================================================== --- trunk/source/Lib/TLibDecoder/SEIread.cpp (revision 595) +++ trunk/source/Lib/TLibDecoder/SEIread.cpp (revision 644) @@ -111,7 +111,18 @@ #endif #if SUB_BITSTREAM_PROPERTY_SEI - case SEI::SUB_BITSTREAM_PROPERTY: - fprintf( g_hTrace, "=========== Sub-bitstream property SEI message ===========\n"); - break; + case SEI::SUB_BITSTREAM_PROPERTY: + fprintf( g_hTrace, "=========== Sub-bitstream property SEI message ===========\n"); + break; +#endif +#if O0164_MULTI_LAYER_HRD + case SEI::BSP_NESTING: + fprintf( g_hTrace, "=========== Bitstream parition nesting SEI message ===========\n"); + break; + case SEI::BSP_INITIAL_ARRIVAL_TIME: + fprintf( g_hTrace, "=========== Bitstream parition initial arrival time SEI message ===========\n"); + break; + case SEI::BSP_HRD: + fprintf( g_hTrace, "=========== Bitstream parition HRD parameters SEI message ===========\n"); + break; #endif #endif //SVC_EXTENSION @@ -152,8 +163,16 @@ } +#if O0164_MULTI_LAYER_HRD +#if LAYERS_NOT_PRESENT_SEI +Void SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps, const SEIScalableNesting *nestingSei, const SEIBspNesting *bspNestingSei) +#else +Void SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType, TComSPS *sps, const SEIScalableNesting *nestingSei) +#endif +#else #if LAYERS_NOT_PRESENT_SEI Void SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps) #else Void SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType, TComSPS *sps) +#endif #endif { @@ -272,4 +291,5 @@ xParseSEIScalableNesting((SEIScalableNesting&) *sei, nalUnitType, payloadSize, sps); #endif + break; #if SVC_EXTENSION #if LAYERS_NOT_PRESENT_SEI @@ -296,4 +316,22 @@ sei = new SEISubBitstreamProperty; xParseSEISubBitstreamProperty((SEISubBitstreamProperty&) *sei); + break; +#endif +#if O0164_MULTI_LAYER_HRD + case SEI::BSP_NESTING: + sei = new SEIBspNesting; +#if LAYERS_NOT_PRESENT_SEI + xParseSEIBspNesting((SEIBspNesting&) *sei, nalUnitType, vps, sps, *nestingSei); +#else + xParseSEIBspNesting((SEIBspNesting&) *sei, nalUnitType, sps, *nestingSei); +#endif + break; + case SEI::BSP_INITIAL_ARRIVAL_TIME: + sei = new SEIBspInitialArrivalTime; + xParseSEIBspInitialArrivalTime((SEIBspInitialArrivalTime&) *sei, vps, sps, *nestingSei, *bspNestingSei); + break; + case SEI::BSP_HRD: + sei = new SEIBspHrd; + xParseSEIBspHrd((SEIBspHrd&) *sei, sps, *nestingSei); break; #endif @@ -380,4 +418,36 @@ } +#if P0138_USE_ALT_CPB_PARAMS_FLAG +/** + * Check if SEI message contains payload extension + */ +Bool SEIReader::xPayloadExtensionPresent() +{ + Int payloadBitsRemaining = getBitstream()->getNumBitsLeft(); + Bool payloadExtensionPresent = false; + + if (payloadBitsRemaining > 8) + { + payloadExtensionPresent = true; + } + else + { + Int finalBits = getBitstream()->peekBits(payloadBitsRemaining); + while (payloadBitsRemaining && (finalBits & 1) == 0) + { + payloadBitsRemaining--; + finalBits >>= 1; + } + payloadBitsRemaining--; + if (payloadBitsRemaining > 0) + { + payloadExtensionPresent = true; + } + } + + return payloadExtensionPresent; +} +#endif + /** * parse bitstream bs and unpack a user_data_unregistered SEI message @@ -536,4 +606,16 @@ } } + +#if P0138_USE_ALT_CPB_PARAMS_FLAG + sei.m_useAltCpbParamsFlag = false; + sei.m_useAltCpbParamsFlagPresent = false; + if (xPayloadExtensionPresent()) + { + READ_FLAG (code, "use_alt_cpb_params_flag"); + sei.m_useAltCpbParamsFlag = code; + sei.m_useAltCpbParamsFlagPresent = true; + } +#endif + xParseByteAlign(); } @@ -826,8 +908,16 @@ // read nested SEI messages do { +#if O0164_MULTI_LAYER_HRD +#if LAYERS_NOT_PRESENT_SEI + xReadSEImessage(sei.m_nestedSEIs, nalUnitType, vps, sps, &sei); +#else + xReadSEImessage(sei.m_nestedSEIs, nalUnitType, sps, &sei); +#endif +#else #if LAYERS_NOT_PRESENT_SEI xReadSEImessage(sei.m_nestedSEIs, nalUnitType, vps, sps); #else xReadSEImessage(sei.m_nestedSEIs, nalUnitType, sps); +#endif #endif } while (m_pcBitstream->getNumBitsLeft() > 8); @@ -930,4 +1020,193 @@ } #endif + +#if O0164_MULTI_LAYER_HRD +#if LAYERS_NOT_PRESENT_SEI +Void SEIReader::xParseSEIBspNesting(SEIBspNesting &sei, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei) +#else +Void SEIReader::xParseSEIBspNesting(SEIBspNesting &sei, const NalUnitType nalUnitType, TComSPS *sps, const SEIScalableNesting &nestingSei) +#endif +{ + UInt uiCode; + READ_UVLC( uiCode, "bsp_idx" ); sei.m_bspIdx = uiCode; + + // byte alignment + while ( m_pcBitstream->getNumBitsRead() % 8 != 0 ) + { + UInt code; + READ_FLAG( code, "bsp_nesting_zero_bit" ); + } + + sei.m_callerOwnsSEIs = false; + + // read nested SEI messages + do { +#if LAYERS_NOT_PRESENT_SEI + xReadSEImessage(sei.m_nestedSEIs, nalUnitType, vps, sps, &nestingSei, &sei); +#else + xReadSEImessage(sei.m_nestedSEIs, nalUnitType, sps, &nestingSei); +#endif + } while (m_pcBitstream->getNumBitsLeft() > 8); +} + +Void SEIReader::xParseSEIBspInitialArrivalTime(SEIBspInitialArrivalTime &sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei, const SEIBspNesting &bspNestingSei) +{ + assert(vps->getVpsVuiPresentFlag()); + + UInt schedCombCnt = vps->getNumBspSchedCombinations(nestingSei.m_nestingOpIdx[0]); + UInt len; + UInt hrdIdx; + UInt uiCode; + + if (schedCombCnt > 0) + { + hrdIdx = vps->getBspCombHrdIdx(nestingSei.m_nestingOpIdx[0], 0, bspNestingSei.m_bspIdx); + } + else + { + hrdIdx = 0; + } + + TComHRD *hrd = vps->getBspHrd(hrdIdx); + + if (hrd->getNalHrdParametersPresentFlag() || hrd->getVclHrdParametersPresentFlag()) + { + len = hrd->getInitialCpbRemovalDelayLengthMinus1() + 1; + } + else + { + len = 23 + 1; + } + + if (hrd->getNalHrdParametersPresentFlag()) + { + for(UInt i = 0; i < schedCombCnt; i++) + { + READ_CODE( len, uiCode, "nal_initial_arrival_delay" ); sei.m_nalInitialArrivalDelay[i] = uiCode; + } + } + else + { + for(UInt i = 0; i < schedCombCnt; i++) + { + READ_CODE( len, uiCode, "vcl_initial_arrival_delay" ); sei.m_vclInitialArrivalDelay[i] = uiCode; + } + } +} + +Void SEIReader::xParseSEIBspHrd(SEIBspHrd &sei, TComSPS *sps, const SEIScalableNesting &nestingSei) +{ + UInt uiCode; + READ_UVLC( uiCode, "sei_num_bsp_hrd_parameters_minus1" ); sei.m_seiNumBspHrdParametersMinus1 = uiCode; + for (UInt i = 0; i <= sei.m_seiNumBspHrdParametersMinus1; i++) + { + if (i > 0) + { + READ_FLAG( uiCode, "sei_bsp_cprms_present_flag" ); sei.m_seiBspCprmsPresentFlag[i] = uiCode; + } + xParseHrdParameters(sei.hrd, i==0 ? 1 : sei.m_seiBspCprmsPresentFlag[i], nestingSei.m_nestingMaxTemporalIdPlus1[0]-1); + } + for (UInt h = 0; h <= nestingSei.m_nestingNumOpsMinus1; h++) + { + UInt lsIdx = nestingSei.m_nestingOpIdx[h]; + READ_UVLC( uiCode, "num_sei_bitstream_partitions_minus1[i]"); sei.m_seiNumBitstreamPartitionsMinus1[lsIdx] = uiCode; + for (UInt i = 0; i <= sei.m_seiNumBitstreamPartitionsMinus1[lsIdx]; i++) + { + for (UInt j = 0; j < sei.m_vpsMaxLayers; j++) + { + if (sei.m_layerIdIncludedFlag[lsIdx][j]) + { + READ_FLAG( uiCode, "sei_layer_in_bsp_flag[lsIdx][i][j]" ); sei.m_seiLayerInBspFlag[lsIdx][i][j] = uiCode; + } + } + } + READ_UVLC( uiCode, "sei_num_bsp_sched_combinations_minus1[i]"); sei.m_seiNumBspSchedCombinationsMinus1[lsIdx] = uiCode; + for (UInt i = 0; i <= sei.m_seiNumBspSchedCombinationsMinus1[lsIdx]; i++) + { + for (UInt j = 0; j <= sei.m_seiNumBitstreamPartitionsMinus1[lsIdx]; j++) + { + READ_UVLC( uiCode, "sei_bsp_comb_hrd_idx[lsIdx][i][j]"); sei.m_seiBspCombHrdIdx[lsIdx][i][j] = uiCode; + READ_UVLC( uiCode, "sei_bsp_comb_sched_idx[lsIdx][i][j]"); sei.m_seiBspCombScheddx[lsIdx][i][j] = uiCode; + } + } + } +} + +Void SEIReader::xParseHrdParameters(TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1) +{ + UInt uiCode; + if( commonInfPresentFlag ) + { + READ_FLAG( uiCode, "nal_hrd_parameters_present_flag" ); hrd->setNalHrdParametersPresentFlag( uiCode == 1 ? true : false ); + READ_FLAG( uiCode, "vcl_hrd_parameters_present_flag" ); hrd->setVclHrdParametersPresentFlag( uiCode == 1 ? true : false ); + if( hrd->getNalHrdParametersPresentFlag() || hrd->getVclHrdParametersPresentFlag() ) + { + READ_FLAG( uiCode, "sub_pic_cpb_params_present_flag" ); hrd->setSubPicCpbParamsPresentFlag( uiCode == 1 ? true : false ); + if( hrd->getSubPicCpbParamsPresentFlag() ) + { + READ_CODE( 8, uiCode, "tick_divisor_minus2" ); hrd->setTickDivisorMinus2( uiCode ); + READ_CODE( 5, uiCode, "du_cpb_removal_delay_length_minus1" ); hrd->setDuCpbRemovalDelayLengthMinus1( uiCode ); + READ_FLAG( uiCode, "sub_pic_cpb_params_in_pic_timing_sei_flag" ); hrd->setSubPicCpbParamsInPicTimingSEIFlag( uiCode == 1 ? true : false ); + READ_CODE( 5, uiCode, "dpb_output_delay_du_length_minus1" ); hrd->setDpbOutputDelayDuLengthMinus1( uiCode ); + } + READ_CODE( 4, uiCode, "bit_rate_scale" ); hrd->setBitRateScale( uiCode ); + READ_CODE( 4, uiCode, "cpb_size_scale" ); hrd->setCpbSizeScale( uiCode ); + if( hrd->getSubPicCpbParamsPresentFlag() ) + { + READ_CODE( 4, uiCode, "cpb_size_du_scale" ); hrd->setDuCpbSizeScale( uiCode ); + } + READ_CODE( 5, uiCode, "initial_cpb_removal_delay_length_minus1" ); hrd->setInitialCpbRemovalDelayLengthMinus1( uiCode ); + READ_CODE( 5, uiCode, "au_cpb_removal_delay_length_minus1" ); hrd->setCpbRemovalDelayLengthMinus1( uiCode ); + READ_CODE( 5, uiCode, "dpb_output_delay_length_minus1" ); hrd->setDpbOutputDelayLengthMinus1( uiCode ); + } + } + Int i, j, nalOrVcl; + for( i = 0; i <= maxNumSubLayersMinus1; i ++ ) + { + READ_FLAG( uiCode, "fixed_pic_rate_general_flag" ); hrd->setFixedPicRateFlag( i, uiCode == 1 ? true : false ); + if( !hrd->getFixedPicRateFlag( i ) ) + { + READ_FLAG( uiCode, "fixed_pic_rate_within_cvs_flag" ); hrd->setFixedPicRateWithinCvsFlag( i, uiCode == 1 ? true : false ); + } + else + { + hrd->setFixedPicRateWithinCvsFlag( i, true ); + } + hrd->setLowDelayHrdFlag( i, 0 ); // Infered to be 0 when not present + hrd->setCpbCntMinus1 ( i, 0 ); // Infered to be 0 when not present + if( hrd->getFixedPicRateWithinCvsFlag( i ) ) + { + READ_UVLC( uiCode, "elemental_duration_in_tc_minus1" ); hrd->setPicDurationInTcMinus1( i, uiCode ); + } + else + { + READ_FLAG( uiCode, "low_delay_hrd_flag" ); hrd->setLowDelayHrdFlag( i, uiCode == 1 ? true : false ); + } + if (!hrd->getLowDelayHrdFlag( i )) + { + READ_UVLC( uiCode, "cpb_cnt_minus1" ); hrd->setCpbCntMinus1( i, uiCode ); + } + for( nalOrVcl = 0; nalOrVcl < 2; nalOrVcl ++ ) + { + if( ( ( nalOrVcl == 0 ) && ( hrd->getNalHrdParametersPresentFlag() ) ) || + ( ( nalOrVcl == 1 ) && ( hrd->getVclHrdParametersPresentFlag() ) ) ) + { + for( j = 0; j <= ( hrd->getCpbCntMinus1( i ) ); j ++ ) + { + READ_UVLC( uiCode, "bit_rate_value_minus1" ); hrd->setBitRateValueMinus1( i, j, nalOrVcl, uiCode ); + READ_UVLC( uiCode, "cpb_size_value_minus1" ); hrd->setCpbSizeValueMinus1( i, j, nalOrVcl, uiCode ); + if( hrd->getSubPicCpbParamsPresentFlag() ) + { + READ_UVLC( uiCode, "cpb_size_du_value_minus1" ); hrd->setDuCpbSizeValueMinus1( i, j, nalOrVcl, uiCode ); + READ_UVLC( uiCode, "bit_rate_du_value_minus1" ); hrd->setDuBitRateValueMinus1( i, j, nalOrVcl, uiCode ); + } + READ_FLAG( uiCode, "cbr_flag" ); hrd->setCbrFlag( i, j, nalOrVcl, uiCode == 1 ? true : false ); + } + } + } + } +} +#endif + #endif //SVC_EXTENSION Index: trunk/source/Lib/TLibDecoder/SEIread.h =================================================================== --- trunk/source/Lib/TLibDecoder/SEIread.h (revision 595) +++ trunk/source/Lib/TLibDecoder/SEIread.h (revision 644) @@ -62,8 +62,19 @@ #endif protected: +#if O0164_MULTI_LAYER_HRD +#if LAYERS_NOT_PRESENT_SEI + Void xReadSEImessage (SEIMessages& seis, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps, const SEIScalableNesting *nestingSei=NULL, const SEIBspNesting *bspNestingSei=NULL); +#else + Void xReadSEImessage (SEIMessages& seis, const NalUnitType nalUnitType, TComSPS *sps, const SEIScalableNesting *nestingSei=NULL); +#endif +#else #if LAYERS_NOT_PRESENT_SEI Void xReadSEImessage (SEIMessages& seis, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps); #else Void xReadSEImessage (SEIMessages& seis, const NalUnitType nalUnitType, TComSPS *sps); +#endif +#endif +#if P0138_USE_ALT_CPB_PARAMS_FLAG + Bool xPayloadExtensionPresent (); #endif Void xParseSEIuserDataUnregistered (SEIuserDataUnregistered &sei, UInt payloadSize); @@ -92,4 +103,14 @@ Void xParseSEIScalableNesting (SEIScalableNesting& sei, const NalUnitType nalUnitType, UInt payloadSize, TComSPS *sps); #endif +#if O0164_MULTI_LAYER_HRD +#if LAYERS_NOT_PRESENT_SEI + Void xParseSEIBspNesting(SEIBspNesting &sei, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei); +#else + Void xParseSEIBspNesting(SEIBspNesting &sei, const NalUnitType nalUnitType, TComSPS *sps, const SEIScalableNesting &nestingSei); +#endif + Void xParseSEIBspInitialArrivalTime(SEIBspInitialArrivalTime &sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei, const SEIBspNesting &bspNestingSei); + Void xParseSEIBspHrd(SEIBspHrd &sei, TComSPS *sps, const SEIScalableNesting &nestingSei); + Void xParseHrdParameters(TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1); +#endif Void xParseByteAlign(); }; Index: trunk/source/Lib/TLibDecoder/TDecCAVLC.cpp =================================================================== --- trunk/source/Lib/TLibDecoder/TDecCAVLC.cpp (revision 595) +++ trunk/source/Lib/TLibDecoder/TDecCAVLC.cpp (revision 644) @@ -334,8 +334,31 @@ if (uiCode) { +#if P0166_MODIFIED_PPS_EXTENSION + UInt ppsExtensionTypeFlag[8]; + for (UInt i = 0; i < 8; i++) + { + READ_FLAG( ppsExtensionTypeFlag[i], "pps_extension_type_flag" ); + } +#if !POC_RESET_IDC + if (ppsExtensionTypeFlag[1]) + { +#else + if( ppsExtensionTypeFlag[0] ) + { + READ_FLAG( uiCode, "poc_reset_info_present_flag" ); + pcPPS->setPocResetInfoPresentFlag(uiCode ? true : false); +#endif + } + if (ppsExtensionTypeFlag[7]) + { +#endif + while ( xMoreRbspData() ) { READ_FLAG( uiCode, "pps_extension_data_flag"); } +#if P0166_MODIFIED_PPS_EXTENSION + } +#endif } } @@ -514,5 +537,5 @@ } -#if SVC_EXTENSION +#if SVC_EXTENSION && !SPS_DPB_PARAMS Void TDecCavlc::parseSPS(TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager) #else @@ -536,4 +559,5 @@ #if SVC_EXTENSION } +#if !SPS_DPB_PARAMS else { @@ -542,9 +566,13 @@ } #endif +#endif + if ( pcSPS->getMaxTLayers() == 1 ) { // sps_temporal_id_nesting_flag must be 1 when sps_max_sub_layers_minus1 is 0 #if SVC_EXTENSION +#if !SPS_DPB_PARAMS assert( pcSPS->getTemporalIdNestingFlag() == true ); +#endif #else assert( uiCode == 1 ); @@ -644,28 +672,34 @@ assert(uiCode <= 12); - UInt subLayerOrderingInfoPresentFlag; - READ_FLAG(subLayerOrderingInfoPresentFlag, "sps_sub_layer_ordering_info_present_flag"); - - for(UInt i=0; i <= pcSPS->getMaxTLayers()-1; i++) - { - READ_UVLC ( uiCode, "sps_max_dec_pic_buffering_minus1"); - pcSPS->setMaxDecPicBuffering( uiCode + 1, i); - READ_UVLC ( uiCode, "sps_num_reorder_pics" ); - pcSPS->setNumReorderPics(uiCode, i); - READ_UVLC ( uiCode, "sps_max_latency_increase_plus1"); - pcSPS->setMaxLatencyIncrease( uiCode, i ); - - if (!subLayerOrderingInfoPresentFlag) - { - for (i++; i <= pcSPS->getMaxTLayers()-1; i++) - { - pcSPS->setMaxDecPicBuffering(pcSPS->getMaxDecPicBuffering(0), i); - pcSPS->setNumReorderPics(pcSPS->getNumReorderPics(0), i); - pcSPS->setMaxLatencyIncrease(pcSPS->getMaxLatencyIncrease(0), i); - } - break; - } - } - +#if SPS_DPB_PARAMS + if( pcSPS->getLayerId() == 0 ) + { +#endif + UInt subLayerOrderingInfoPresentFlag; + READ_FLAG(subLayerOrderingInfoPresentFlag, "sps_sub_layer_ordering_info_present_flag"); + + for(UInt i=0; i <= pcSPS->getMaxTLayers()-1; i++) + { + READ_UVLC ( uiCode, "sps_max_dec_pic_buffering_minus1"); + pcSPS->setMaxDecPicBuffering( uiCode + 1, i); + READ_UVLC ( uiCode, "sps_num_reorder_pics" ); + pcSPS->setNumReorderPics(uiCode, i); + READ_UVLC ( uiCode, "sps_max_latency_increase_plus1"); + pcSPS->setMaxLatencyIncrease( uiCode, i ); + + if (!subLayerOrderingInfoPresentFlag) + { + for (i++; i <= pcSPS->getMaxTLayers()-1; i++) + { + pcSPS->setMaxDecPicBuffering(pcSPS->getMaxDecPicBuffering(0), i); + pcSPS->setNumReorderPics(pcSPS->getNumReorderPics(0), i); + pcSPS->setMaxLatencyIncrease(pcSPS->getMaxLatencyIncrease(0), i); + } + break; + } + } +#if SPS_DPB_PARAMS + } +#endif READ_UVLC( uiCode, "log2_min_coding_block_size_minus3" ); Int log2MinCUSize = uiCode + 3; @@ -824,5 +858,5 @@ Window& scaledWindow = pcSPS->getScaledRefLayerWindow(i); #if O0098_SCALED_REF_LAYER_ID - READ_CODE( 6, uiCode, "scaled_ref_layer_left_id" ); pcSPS->setScaledRefLayerId( i, uiCode ); + READ_CODE( 6, uiCode, "scaled_ref_layer_id" ); pcSPS->setScaledRefLayerId( i, uiCode ); #endif READ_SVLC( iCode, "scaled_ref_layer_left_offset" ); scaledWindow.setWindowLeftOffset (iCode << 1); @@ -830,4 +864,7 @@ READ_SVLC( iCode, "scaled_ref_layer_right_offset" ); scaledWindow.setWindowRightOffset (iCode << 1); READ_SVLC( iCode, "scaled_ref_layer_bottom_offset" ); scaledWindow.setWindowBottomOffset(iCode << 1); +#if P0312_VERT_PHASE_ADJ + READ_FLAG( uiCode, "vert_phase_position_enable_flag" ); scaledWindow.setVertPhasePositionEnableFlag(uiCode); pcSPS->setVertPhasePositionEnableFlag( pcSPS->getScaledRefLayerId(i), uiCode); +#endif } } @@ -850,5 +887,5 @@ READ_CODE( 6, uiCode, "vps_reserved_zero_6bits" ); assert(uiCode == 0); #endif - READ_CODE( 3, uiCode, "vps_max_sub_layers_minus1" ); pcVPS->setMaxTLayers( uiCode + 1 ); + READ_CODE( 3, uiCode, "vps_max_sub_layers_minus1" ); pcVPS->setMaxTLayers( uiCode + 1 ); assert(uiCode <= 6); READ_FLAG( uiCode, "vps_temporal_id_nesting_flag" ); pcVPS->setTemporalNestingFlag( uiCode ? true:false ); assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag()); @@ -970,4 +1007,8 @@ UInt uiCode; // ... More syntax elements to be parsed here +#if P0300_ALT_OUTPUT_LAYER_FLAG + Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1]; + Int OlsHighestOutputLayerId[MAX_VPS_LAYER_SETS_PLUS1]; +#endif #if VPS_EXTN_MASK_AND_DIM_INFO UInt numScalabilityTypes = 0, i = 0, j = 0; @@ -1091,5 +1132,5 @@ if (vps->getMaxTSLayersPresentFlag()) { - for(i = 0; i < vps->getMaxLayers() - 1; i++) + for(i = 0; i < vps->getMaxLayers(); i++) { READ_CODE( 3, uiCode, "sub_layers_vps_max_minus1[i]" ); vps->setMaxTSLayersMinus1(i, uiCode); @@ -1098,5 +1139,5 @@ else { - for( i = 0; i < vps->getMaxLayers() - 1; i++) + for( i = 0; i < vps->getMaxLayers(); i++) { vps->setMaxTSLayersMinus1(i, vps->getMaxTLayers()-1); @@ -1238,5 +1279,9 @@ { Int lsIdx = vps->getOutputLayerSetIdx(i); +#if NUM_OL_FLAGS + for(j = 0; j < vps->getNumLayersInIdList(lsIdx) ; j++) +#else for(j = 0; j < vps->getNumLayersInIdList(lsIdx) - 1; j++) +#endif { READ_FLAG( uiCode, "output_layer_flag[i][j]"); vps->setOutputLayerFlag(i, j, uiCode); @@ -1269,4 +1314,21 @@ } READ_CODE( numBits, uiCode, "profile_level_tier_idx[i]" ); vps->setProfileLevelTierIdx(i, uiCode); +#if P0300_ALT_OUTPUT_LAYER_FLAG + NumOutputLayersInOutputLayerSet[i] = 0; + Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx(i); + for (j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++) + { + NumOutputLayersInOutputLayerSet[i] += vps->getOutputLayerFlag(i, j); + if (vps->getOutputLayerFlag(i, j)) + { + OlsHighestOutputLayerId[i] = vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j); + } + } + if (NumOutputLayersInOutputLayerSet[i] == 1 && vps->getNumDirectRefLayers(OlsHighestOutputLayerId[i]) > 0) + { + READ_FLAG(uiCode, "alt_output_layer_flag[i]"); + vps->setAltOuputLayerFlag(i, uiCode ? true : false); + } +#endif } #else @@ -1292,5 +1354,9 @@ READ_CODE( numBits, uiCode, "output_layer_set_idx_minus1"); vps->setOutputLayerSetIdx( i, uiCode + 1); Int lsIdx = vps->getOutputLayerSetIdx(i); +#if NUM_OL_FLAGS + for(j = 0; j < vps->getNumLayersInIdList(lsIdx) ; j++) +#else for(j = 0; j < vps->getNumLayersInIdList(lsIdx) - 1; j++) +#endif { READ_FLAG( uiCode, "output_layer_flag[i][j]"); vps->setOutputLayerFlag(i, j, uiCode); @@ -1354,4 +1420,5 @@ #endif +#if !P0300_ALT_OUTPUT_LAYER_FLAG #if O0153_ALT_OUTPUT_LAYER_FLAG if( vps->getMaxLayers() > 1 ) @@ -1360,4 +1427,5 @@ vps->setAltOuputLayerFlag( uiCode ? true : false ); } +#endif #endif @@ -1510,8 +1578,16 @@ #if P0307_VPS_NON_VUI_EXTENSION READ_UVLC( uiCode, "vps_non_vui_extension_length"); vps->setVpsNonVuiExtLength((Int)uiCode); +#if P0307_VPS_NON_VUI_EXT_UPDATE + Int nonVuiExtByte = uiCode; + for (i = 1; i <= nonVuiExtByte; i++) + { + READ_CODE( 8, uiCode, "vps_non_vui_extension_data_byte" ); //just parse and discard for now. + } +#else if ( vps->getVpsNonVuiExtLength() > 0 ) { printf("\n\nUp to the current spec, the value of vps_non_vui_extension_length is supposed to be 0\n"); } +#endif #endif @@ -1596,4 +1672,22 @@ { UInt uiCode; +#if DPB_PARAMS_MAXTLAYERS + Int * MaxSubLayersInLayerSetMinus1 = new Int[vps->getNumOutputLayerSets()]; + for(Int i = 1; i < vps->getNumOutputLayerSets(); i++) + { + UInt maxSLMinus1 = 0; +#if CHANGE_NUMSUBDPB_IDX + Int optLsIdx = vps->getOutputLayerSetIdx( i ); +#else + Int optLsIdx = i; +#endif + for(Int k = 0; k < vps->getNumLayersInIdList(optLsIdx); k++ ) { + Int lId = vps->getLayerSetLayerIdList(optLsIdx, k); + maxSLMinus1 = max(maxSLMinus1, vps->getMaxTSLayersMinus1(vps->getLayerIdInVps(lId))); + } + MaxSubLayersInLayerSetMinus1[ i ] = maxSLMinus1; + } +#endif + #if !RESOLUTION_BASED_DPB vps->deriveNumberOfSubDpbs(); @@ -1605,5 +1699,9 @@ #endif READ_FLAG( uiCode, "sub_layer_flag_info_present_flag[i]"); vps->setSubLayerFlagInfoPresentFlag( i, uiCode ? true : false ); - for(Int j = 0; j < vps->getMaxTLayers(); j++) +#if DPB_PARAMS_MAXTLAYERS + for(Int j = 0; j <= MaxSubLayersInLayerSetMinus1[ i ]; j++) +#else + for(Int j = 0; j <= vps->getMaxTLayers(); j++) +#endif { if( j > 0 && vps->getSubLayerFlagInfoPresentFlag(i) ) @@ -1652,4 +1750,30 @@ } } + for(Int j = vps->getMaxTLayers(); j < MAX_TLAYER; j++) + { + vps->setSubLayerDpbInfoPresentFlag( i, j, false ); + } + } + + // Infer values when not signalled + for(Int i = 1; i < vps->getNumOutputLayerSets(); i++) + { + Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i ); + for(Int j = 0; j < MAX_TLAYER; j++) + { + if( !vps->getSubLayerDpbInfoPresentFlag(i, j) ) // If sub-layer DPB information is NOT present + { + for(Int k = 0; k < vps->getNumSubDpbs(layerSetIdxForOutputLayerSet); k++) + { + vps->setMaxVpsDecPicBufferingMinus1( i, k, j, vps->getMaxVpsDecPicBufferingMinus1( i, k, j - 1 ) ); + } + vps->setMaxVpsNumReorderPics( i, j, vps->getMaxVpsNumReorderPics( i, j - 1) ); + for(Int k = 0; k < vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ); k++) + { + vps->setMaxVpsLayerDecPicBuffMinus1( i, k, j, vps->getMaxVpsLayerDecPicBuffMinus1( i, k, j - 1)); + } + vps->setMaxVpsLatencyIncreasePlus1( i, j, vps->getMaxVpsLatencyIncreasePlus1( i, j - 1 ) ); + } + } } } @@ -1669,4 +1793,11 @@ READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" ); vps->setCrossLayerIrapAlignFlag(uiCode); +#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG + if (uiCode) + { + READ_FLAG(uiCode, "only_idr_for_IRAP_across_layers" ); + vps->setCrossLayerIrapAlignFlag(uiCode); + } +#endif #endif #if O0223_PICTURE_TYPES_ALIGN_FLAG @@ -1825,5 +1956,7 @@ #endif #endif - +#if P0312_VERT_PHASE_ADJ + READ_FLAG( uiCode, "vps_vui_vert_phase_in_use_flag" ); vps->setVpsVuiVertPhaseInUseFlag(uiCode); +#endif #if N0160_VUI_EXT_ILP_REF READ_FLAG( uiCode, "ilp_restricted_ref_layers_flag" ); vps->setIlpRestrictedRefLayersFlag( uiCode == 1 ); @@ -1892,4 +2025,62 @@ #endif #endif + +#if O0164_MULTI_LAYER_HRD + READ_FLAG(uiCode, "vps_vui_bsp_hrd_present_flag" ); vps->setVpsVuiBspHrdPresentFlag(uiCode); + if (vps->getVpsVuiBspHrdPresentFlag()) + { + READ_UVLC( uiCode, "vps_num_bsp_hrd_parameters_minus1" ); vps->setVpsNumBspHrdParametersMinus1(uiCode); + vps->createBspHrdParamBuffer(vps->getVpsNumBspHrdParametersMinus1() + 1); + for( i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++ ) + { + if( i > 0 ) + { + READ_FLAG( uiCode, "bsp_cprms_present_flag[i]" ); vps->setBspCprmsPresentFlag(i, uiCode); + } + parseHrdParameters(vps->getBspHrd(i), i==0 ? 1 : vps->getBspCprmsPresentFlag(i), vps->getMaxTLayers()-1); + } + for( UInt h = 1; h <= (vps->getNumLayerSets()-1); h++ ) + { + READ_UVLC( uiCode, "num_bitstream_partitions[i]"); vps->setNumBitstreamPartitions(h, uiCode); + for( i = 0; i < vps->getNumBitstreamPartitions(h); i++ ) + { + for( j = 0; j <= (vps->getMaxLayers()-1); j++ ) + { + if( vps->getLayerIdIncludedFlag(h, j) ) + { + READ_FLAG( uiCode, "layer_in_bsp_flag[h][i][j]" ); vps->setLayerInBspFlag(h, i, j, uiCode); + } + } + } + if (vps->getNumBitstreamPartitions(h)) + { + READ_UVLC( uiCode, "num_bsp_sched_combinations[h]"); vps->setNumBspSchedCombinations(h, uiCode); + for( i = 0; i < vps->getNumBspSchedCombinations(h); i++ ) + { + for( j = 0; j < vps->getNumBitstreamPartitions(h); j++ ) + { + READ_UVLC( uiCode, "bsp_comb_hrd_idx[h][i][j]"); vps->setBspCombHrdIdx(h, i, j, uiCode); + READ_UVLC( uiCode, "bsp_comb_sched_idx[h][i][j]"); vps->setBspCombSchedIdx(h, i, j, uiCode); + } + } + } + } + } +#endif + +#if P0182_VPS_VUI_PS_FLAG + for(i = 1; i < vps->getMaxLayers(); i++) + { + if (vps->getNumRefLayers(vps->getLayerIdInNuh(i)) == 0) + { + READ_FLAG( uiCode, "base_layer_parameter_set_compatibility_flag" ); + vps->setBaseLayerPSCompatibilityFlag( i, uiCode ); + } + else + { + vps->setBaseLayerPSCompatibilityFlag( i, 0 ); + } + } +#endif } #endif @@ -1911,5 +2102,9 @@ if( rpcSlice->getRapPicFlag()) { +#if !NO_OUTPUT_OF_PRIOR_PICS READ_FLAG( uiCode, "no_output_of_prior_pics_flag" ); //ignored +#else + READ_FLAG( uiCode, "no_output_of_prior_pics_flag" ); rpcSlice->setNoOutputOfPriorPicsFlag( uiCode ? true : false ); +#endif } READ_UVLC ( uiCode, "slice_pic_parameter_set_id" ); rpcSlice->setPPSId(uiCode); @@ -2229,10 +2424,10 @@ #if ILP_SSH_SIG #if ILP_SSH_SIG_FIX - if((sps->getLayerId() > 0) && !(rpcSlice->getVPS()->getIlpSshSignalingEnabledFlag()) && (rpcSlice->getNumILRRefIdx() > 0) ) -#else - if((sps->getLayerId() > 0) && rpcSlice->getVPS()->getIlpSshSignalingEnabledFlag() && (rpcSlice->getNumILRRefIdx() > 0) ) -#endif -#else - if((sps->getLayerId() > 0) && (rpcSlice->getNumILRRefIdx() > 0) ) + if((rpcSlice->getLayerId() > 0) && !(rpcSlice->getVPS()->getIlpSshSignalingEnabledFlag()) && (rpcSlice->getNumILRRefIdx() > 0) ) +#else + if((rpcSlice->getLayerId() > 0) && rpcSlice->getVPS()->getIlpSshSignalingEnabledFlag() && (rpcSlice->getNumILRRefIdx() > 0) ) +#endif +#else + if((rpcSlice->getLayerId() > 0) && (rpcSlice->getNumILRRefIdx() > 0) ) #endif { @@ -2256,17 +2451,13 @@ { #if P0079_DERIVE_NUMACTIVE_REF_PICS - Int numRefLayerPics = 0; - Int i = 0; - Int refLayerPicIdc [MAX_VPS_LAYER_ID_PLUS1]; - for(i = 0, numRefLayerPics = 0; i < rpcSlice->getNumILRRefIdx(); i++ ) + for( Int i = 0; i < rpcSlice->getNumILRRefIdx(); i++ ) { if(rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(rpcSlice->getVPS()->getLayerIdInVps(i),rpcSlice->getLayerId()) > rpcSlice->getTLayer() && (rpcSlice->getVPS()->getMaxTSLayersMinus1(rpcSlice->getVPS()->getLayerIdInVps(i)) >= rpcSlice->getTLayer()) ) { - refLayerPicIdc[ numRefLayerPics++ ] = i; + rpcSlice->setActiveNumILRRefIdx(1); + break; } } - if (numRefLayerPics) - rpcSlice->setActiveNumILRRefIdx(1); #else rpcSlice->setActiveNumILRRefIdx(1); @@ -2344,4 +2535,14 @@ #endif #endif +#if P0312_VERT_PHASE_ADJ + for(Int i = 0; i < rpcSlice->getActiveNumILRRefIdx(); i++ ) + { + UInt refLayerIdc = rpcSlice->getInterLayerPredLayerIdc(i); + if( rpcSlice->getSPS()->getVertPhasePositionEnableFlag(refLayerIdc) ) + { + READ_FLAG( uiCode, "vert_phase_position_flag" ); rpcSlice->setVertPhasePositionFlag( uiCode? true : false, refLayerIdc ); + } + } +#endif if(sps->getUseSAO()) @@ -2661,4 +2862,90 @@ } +#if POC_RESET_IDC_SIGNALLING + Int sliceHederExtensionLength = 0; + if(pps->getSliceHeaderExtensionPresentFlag()) + { + READ_UVLC( uiCode, "slice_header_extension_length"); sliceHederExtensionLength = uiCode; + } + else + { + sliceHederExtensionLength = 0; + } + UInt startBits = m_pcBitstream->getNumBitsRead(); // Start counter of # SH Extn bits + if( sliceHederExtensionLength > 0 ) + { + if( rpcSlice->getPPS()->getPocResetInfoPresentFlag() ) + { + READ_CODE( 2, uiCode, "poc_reset_idc"); rpcSlice->setPocResetIdc(uiCode); + } + else + { + rpcSlice->setPocResetIdc( 0 ); + } + if( rpcSlice->getPocResetIdc() > 0 ) + { + READ_CODE(6, uiCode, "poc_reset_period_id"); rpcSlice->setPocResetPeriodId(uiCode); + } + else + { + + rpcSlice->setPocResetPeriodId( 0 ); + } + + if (rpcSlice->getPocResetIdc() == 3) + { + READ_FLAG( uiCode, "full_poc_reset_flag"); rpcSlice->setFullPocResetFlag((uiCode == 1) ? true : false); + READ_CODE(rpcSlice->getSPS()->getBitsForPOC(), uiCode,"poc_lsb_val"); rpcSlice->setPocLsbVal(uiCode); + } + + // Derive the value of PocMsbValRequiredFlag + rpcSlice->setPocMsbValRequiredFlag( rpcSlice->getCraPicFlag() || rpcSlice->getBlaPicFlag() + /* || related to vps_poc_lsb_aligned_flag */ + ); + + if( !rpcSlice->getPocMsbValRequiredFlag() /* vps_poc_lsb_aligned_flag */ ) + { + READ_FLAG( uiCode, "poc_msb_val_present_flag"); rpcSlice->setPocMsbValPresentFlag( uiCode ? true : false ); + } + else + { + if( rpcSlice->getPocMsbValRequiredFlag() ) + { + rpcSlice->setPocMsbValPresentFlag( true ); + } + else + { + rpcSlice->setPocMsbValPresentFlag( false ); + } + } + + Int maxPocLsb = 1 << rpcSlice->getSPS()->getBitsForPOC(); + if( rpcSlice->getPocMsbValPresentFlag() ) + { + READ_UVLC( uiCode, "poc_msb_val"); rpcSlice->setPocMsbVal( uiCode ); + // Update POC of the slice based on this MSB val + Int pocLsb = rpcSlice->getPOC() % maxPocLsb; + rpcSlice->setPOC((rpcSlice->getPocMsbVal() * maxPocLsb) + pocLsb); + } + else + { + rpcSlice->setPocMsbVal( rpcSlice->getPOC() / maxPocLsb ); + } + + // Read remaining bits in the slice header extension. + UInt endBits = m_pcBitstream->getNumBitsRead(); + Int counter = (endBits - startBits) % 8; + if( counter ) + { + counter = 8 - counter; + } + + while( counter ) + { + READ_FLAG( uiCode, "slice_segment_header_extension_reserved_bit" ); assert( uiCode == 1 ); + counter--; + } + } +#else if(pps->getSliceHeaderExtensionPresentFlag()) { @@ -2670,4 +2957,5 @@ } } +#endif m_pcBitstream->readByteAlignment(); Index: trunk/source/Lib/TLibDecoder/TDecCAVLC.h =================================================================== --- trunk/source/Lib/TLibDecoder/TDecCAVLC.h (revision 595) +++ trunk/source/Lib/TLibDecoder/TDecCAVLC.h (revision 644) @@ -86,5 +86,9 @@ Void parseVpsDpbSizeTable( TComVPS *vps ); #endif +#if SPS_DPB_PARAMS + Void parseSPS ( TComSPS* pcSPS ); // it should be removed after macro clean up +#else Void parseSPS ( TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager ); +#endif Void parseSPSExtension ( TComSPS* pcSPS ); #else //SVC_EXTENSION Index: trunk/source/Lib/TLibDecoder/TDecEntropy.h =================================================================== --- trunk/source/Lib/TLibDecoder/TDecEntropy.h (revision 595) +++ trunk/source/Lib/TLibDecoder/TDecEntropy.h (revision 644) @@ -66,5 +66,5 @@ virtual Void parseVPS ( TComVPS* pcVPS ) = 0; -#if SVC_EXTENSION +#if SVC_EXTENSION && !SPS_DPB_PARAMS virtual Void parseSPS ( TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager ) = 0; #else @@ -133,5 +133,5 @@ Void resetEntropy ( TComSlice* p) { m_pcEntropyDecoderIf->resetEntropy(p); } Void decodeVPS ( TComVPS* pcVPS ) { m_pcEntropyDecoderIf->parseVPS(pcVPS); } -#if SVC_EXTENSION +#if SVC_EXTENSION && !SPS_DPB_PARAMS Void decodeSPS ( TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager ) { m_pcEntropyDecoderIf->parseSPS(pcSPS, parameterSetManager); } #else Index: trunk/source/Lib/TLibDecoder/TDecSbac.cpp =================================================================== --- trunk/source/Lib/TLibDecoder/TDecSbac.cpp (revision 595) +++ trunk/source/Lib/TLibDecoder/TDecSbac.cpp (revision 644) @@ -1394,4 +1394,7 @@ Void TDecSbac::parseSAOBlkParam (SAOBlkParam& saoBlkParam +#if SVC_EXTENSION + , UInt* saoMaxOffsetQVal +#endif , Bool* sliceEnabled , Bool leftMergeAvail @@ -1468,5 +1471,9 @@ for(Int i=0; i< 4; i++) { +#if SVC_EXTENSION + parseSaoMaxUvlc(uiSymbol, saoMaxOffsetQVal[compIdx] ); //sao_offset_abs +#else parseSaoMaxUvlc(uiSymbol, g_saoMaxOffsetQVal[compIdx] ); //sao_offset_abs +#endif offset[i] = (Int)uiSymbol; } Index: trunk/source/Lib/TLibDecoder/TDecSbac.h =================================================================== --- trunk/source/Lib/TLibDecoder/TDecSbac.h (revision 595) +++ trunk/source/Lib/TLibDecoder/TDecSbac.h (revision 644) @@ -76,5 +76,5 @@ Void setBitstream ( TComInputBitstream* p ) { m_pcBitstream = p; m_pcTDecBinIf->init( p ); } Void parseVPS ( TComVPS* /*pcVPS*/ ) {} -#if SVC_EXTENSION +#if SVC_EXTENSION && !SPS_DPB_PARAMS Void parseSPS ( TComSPS* /*pcSPS*/, ParameterSetManagerDecoder * /*parameterSetManager*/ ) {} #else @@ -90,5 +90,10 @@ Void parseSaoTypeIdx ( UInt& ruiVal ); Void parseSaoUflc ( UInt uiLength, UInt& ruiVal ); + +#if SVC_EXTENSION + Void parseSAOBlkParam (SAOBlkParam& saoBlkParam, UInt* saoMaxOffsetQVal, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail ); +#else Void parseSAOBlkParam (SAOBlkParam& saoBlkParam, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail); +#endif Void parseSaoSign(UInt& val); private: Index: trunk/source/Lib/TLibDecoder/TDecSlice.cpp =================================================================== --- trunk/source/Lib/TLibDecoder/TDecSlice.cpp (revision 595) +++ trunk/source/Lib/TLibDecoder/TDecSlice.cpp (revision 644) @@ -105,9 +105,9 @@ #if SVC_EXTENSION -Void TDecSlice::init(TDecTop** ppcDecTop,TDecEntropy* pcEntropyDecoder, TDecCu* pcCuDecoder) +Void TDecSlice::init(TDecEntropy* pcEntropyDecoder, TDecCu* pcCuDecoder, UInt* saoMaxOffsetQVal) { m_pcEntropyDecoder = pcEntropyDecoder; m_pcCuDecoder = pcCuDecoder; - m_ppcTDecTop = ppcDecTop; + m_saoMaxOffsetQVal = saoMaxOffsetQVal; } #else @@ -347,6 +347,9 @@ aboveMergeAvail = rpcPic->getSAOMergeAvailability(iCUAddr, iCUAddr-uiWidthInLCUs); } - +#if SVC_EXTENSION + pcSbacDecoder->parseSAOBlkParam( saoblkParam, m_saoMaxOffsetQVal, sliceEnabled, leftMergeAvail, aboveMergeAvail); +#else pcSbacDecoder->parseSAOBlkParam( saoblkParam, sliceEnabled, leftMergeAvail, aboveMergeAvail); +#endif } else Index: trunk/source/Lib/TLibDecoder/TDecSlice.h =================================================================== --- trunk/source/Lib/TLibDecoder/TDecSlice.h (revision 595) +++ trunk/source/Lib/TLibDecoder/TDecSlice.h (revision 644) @@ -72,5 +72,5 @@ std::vector CTXMem; #if SVC_EXTENSION - TDecTop** m_ppcTDecTop; + UInt* m_saoMaxOffsetQVal; #endif @@ -80,5 +80,5 @@ #if SVC_EXTENSION - Void init ( TDecTop** ppcDecTop, TDecEntropy* pcEntropyDecoder, TDecCu* pcMbDecoder ); + Void init ( TDecEntropy* pcEntropyDecoder, TDecCu* pcMbDecoder, UInt* saoMaxOffsetQVal ); #else Void init ( TDecEntropy* pcEntropyDecoder, TDecCu* pcMbDecoder ); @@ -91,7 +91,4 @@ Void setCtxMem( TDecSbac* sb, Int b ) { CTXMem[b] = sb; } Int getCtxMemSize( ) { return (Int)CTXMem.size(); } -#if SVC_EXTENSION - TDecTop* getLayerDec ( UInt LayerId ) { return m_ppcTDecTop[LayerId]; } -#endif }; Index: trunk/source/Lib/TLibDecoder/TDecTop.cpp =================================================================== --- trunk/source/Lib/TLibDecoder/TDecTop.cpp (revision 595) +++ trunk/source/Lib/TLibDecoder/TDecTop.cpp (revision 644) @@ -138,5 +138,5 @@ #if SVC_EXTENSION m_cGopDecoder.init( m_ppcTDecTop, &m_cEntropyDecoder, &m_cSbacDecoder, &m_cBinCABAC, &m_cCavlcDecoder, &m_cSliceDecoder, &m_cLoopFilter, &m_cSAO); - m_cSliceDecoder.init( m_ppcTDecTop, &m_cEntropyDecoder, &m_cCuDecoder ); + m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder, m_cSAO.getSaoMaxOffsetQVal() ); #else m_cGopDecoder.init( &m_cEntropyDecoder, &m_cSbacDecoder, &m_cBinCABAC, &m_cCavlcDecoder, &m_cSliceDecoder, &m_cLoopFilter, &m_cSAO); @@ -349,5 +349,12 @@ TComPicYuv* pcPicYuvRecBase = (*(pcTDecTopBase->getListPic()->begin()))->getPicYuvRec(); #if REPN_FORMAT_IN_VPS +#if O0194_DIFFERENT_BITDEPTH_EL_BL + UInt refLayerId = pcSlice->getVPS()->getRefLayerId(m_layerId, i); + Bool sameBitDepths = ( g_bitDepthYLayer[m_layerId] == g_bitDepthYLayer[refLayerId] ) && ( g_bitDepthCLayer[m_layerId] == g_bitDepthCLayer[refLayerId] ); + + if( pcPicYuvRecBase->getWidth() != pcSlice->getPicWidthInLumaSamples() || pcPicYuvRecBase->getHeight() != pcSlice->getPicHeightInLumaSamples() || !zeroOffsets || !sameBitDepths ) +#else if(pcPicYuvRecBase->getWidth() != pcSlice->getPicWidthInLumaSamples() || pcPicYuvRecBase->getHeight() != pcSlice->getPicHeightInLumaSamples() || !zeroOffsets ) +#endif #else if(pcPicYuvRecBase->getWidth() != pcSlice->getSPS()->getPicWidthInLumaSamples() || pcPicYuvRecBase->getHeight() != pcSlice->getSPS()->getPicHeightInLumaSamples() || !zeroOffsets ) @@ -726,4 +733,40 @@ #endif +#if P0312_VERT_PHASE_ADJ + if( activeVPS->getVpsVuiVertPhaseInUseFlag() == 0 ) + { + for(Int i = 0; i < activeSPS->getNumScaledRefLayerOffsets(); i++) + { + UInt scaledRefLayerId = activeSPS->getScaledRefLayerId(i); + if( activeSPS->getVertPhasePositionEnableFlag( scaledRefLayerId ) ) + { + printf("\nWarning: LayerId = %d: vert_phase_position_enable_flag[%d] = 1, however indication vert_phase_position_in_use_flag = 0\n", m_layerId, scaledRefLayerId ); + break; + } + } + } +#endif + +#if SPS_DPB_PARAMS + if( m_layerId > 0 ) + { + // When not present sps_max_sub_layers_minus1 is inferred to be equal to vps_max_sub_layers_minus1. + sps->setMaxTLayers( activeVPS->getMaxTLayers() ); + + // When not present sps_temporal_id_nesting_flag is inferred to be equal to vps_temporal_id_nesting_flag + sps->setTemporalIdNestingFlag( activeVPS->getTemporalNestingFlag() ); + + // When sps_max_dec_pic_buffering_minus1[ i ] is not present for i in the range of 0 to sps_max_sub_layers_minus1, inclusive, due to nuh_layer_id being greater than 0, + // it is inferred to be equal to max_vps_dec_pic_buffering_minus1[ TargetOptLayerSetIdx ][ currLayerId ][ i ] of the active VPS, where currLayerId is the nuh_layer_id of the layer that refers to the SPS. + for(UInt i=0; i < sps->getMaxTLayers(); i++) + { + // to avoid compiler warning "array subscript is above array bounds" + assert( i < MAX_TLAYER ); + + sps->setMaxDecPicBuffering( activeVPS->getMaxVpsDecPicBufferingMinus1( getCommonDecoderParams()->getTargetOutputLayerSetIdx(), sps->getLayerId(), i) + 1, i); + } + } +#endif + if( pps->getDependentSliceSegmentsEnabledFlag() ) { @@ -800,6 +843,8 @@ TComPic*& pcPic = m_pcPic; #if SVC_EXTENSION +#if !NO_OUTPUT_OF_PRIOR_PICS #if NO_CLRAS_OUTPUT_FLAG Bool bFirstSliceInSeq; +#endif #endif m_apcSlicePilot->setVPS( m_parameterSetManagerDecoder.getPrefetchedVPS(0) ); @@ -855,4 +900,21 @@ m_apcSlicePilot->setAssociatedIRAPType(m_associatedIRAPType); +#if NO_OUTPUT_OF_PRIOR_PICS + // Infer the value of NoOutputOfPriorPicsFlag + if( m_apcSlicePilot->getRapPicFlag() ) + { + if ( m_apcSlicePilot->getBlaPicFlag() || m_apcSlicePilot->getIdrPicFlag() || + (m_apcSlicePilot->getCraPicFlag() && m_bFirstSliceInSequence) || + (m_apcSlicePilot->getCraPicFlag() && m_apcSlicePilot->getHandleCraAsBlaFlag())) + { + m_apcSlicePilot->setNoRaslOutputFlag( true ); + } + else + { + m_apcSlicePilot->setNoRaslOutputFlag( false ); + } + } +#endif + // Skip pictures due to random access if (isRandomAccessSkipPicture(iSkipFrame, iPOCLastDisplay)) @@ -876,4 +938,63 @@ #if SVC_EXTENSION bNewPOC = (m_apcSlicePilot->getPOC()!= m_prevPOC); + +#if NO_OUTPUT_OF_PRIOR_PICS +#if NO_CLRAS_OUTPUT_FLAG + if (m_layerId == 0 && m_apcSlicePilot->getRapPicFlag() ) + { + if (m_bFirstSliceInSequence) + { + setNoClrasOutputFlag(true); + } + else if ( m_apcSlicePilot->getBlaPicFlag() ) + { + setNoClrasOutputFlag(true); + } +#if O0149_CROSS_LAYER_BLA_FLAG + else if (m_apcSlicePilot->getIdrPicFlag() && m_apcSlicePilot->getCrossLayerBLAFlag()) + { + setNoClrasOutputFlag(true); + } +#endif + else + { + setNoClrasOutputFlag(false); + } + } + else + { + setNoClrasOutputFlag(false); + } + + m_apcSlicePilot->decodingRefreshMarking(m_pocCRA, m_bRefreshPending, m_cListPic, getNoClrasOutputFlag()); +#endif + + // Derive the value of NoOutputOfPriorPicsFlag + if( bNewPOC || m_layerId!=m_uiPrevLayerId ) // i.e. new coded picture + { + if( m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA && m_apcSlicePilot->getNoRaslOutputFlag() ) + { + this->setNoOutputOfPriorPicsFlags( true ); + } + else if( m_apcSlicePilot->getRapPicFlag() && m_apcSlicePilot->getNoRaslOutputFlag() ) + { + this->setNoOutputOfPriorPicsFlags( m_apcSlicePilot->getNoOutputOfPriorPicsFlag() ); + } + else + { + if( this->m_ppcTDecTop[0]->getNoClrasOutputFlag() ) + { + this->setNoOutputOfPriorPicsFlags( true ); + } + } + } +#endif + +#if ALIGNED_BUMPING + if (bNewPOC || m_layerId!=m_uiPrevLayerId) + { + m_apcSlicePilot->applyReferencePictureSet(m_cListPic, m_apcSlicePilot->getRPS()); + } +#endif if (m_apcSlicePilot->isNextSlice() && (bNewPOC || m_layerId!=m_uiPrevLayerId) && !m_bFirstSliceInSequence ) { @@ -929,6 +1050,8 @@ #endif } +#if !NO_OUTPUT_OF_PRIOR_PICS #if NO_CLRAS_OUTPUT_FLAG bFirstSliceInSeq = m_bFirstSliceInSequence; +#endif #endif m_bFirstSliceInSequence = false; @@ -1093,4 +1216,5 @@ #endif +#if !NO_OUTPUT_OF_PRIOR_PICS #if NO_CLRAS_OUTPUT_FLAG if (m_layerId == 0 && @@ -1137,8 +1261,21 @@ m_apcSlicePilot->decodingRefreshMarking(m_pocCRA, m_bRefreshPending, m_cListPic, getNoClrasOutputFlag()); #endif - +#else + if ( m_layerId == 0 && m_apcSlicePilot->getRapPicFlag() && getNoClrasOutputFlag() ) + { + for (UInt i = 0; i < m_apcSlicePilot->getVPS()->getMaxLayers(); i++) + { + m_ppcTDecTop[i]->setLayerInitializedFlag(false); + m_ppcTDecTop[i]->setFirstPicInLayerDecodedFlag(false); + } + } +#endif // Buffer initialize for prediction. m_cPrediction.initTempBuff(); +#if !ALIGNED_BUMPING m_apcSlicePilot->applyReferencePictureSet(m_cListPic, m_apcSlicePilot->getRPS()); +#else + m_apcSlicePilot->checkLeadingPictureRestrictions(m_cListPic); +#endif // Get a new picture buffer xGetNewPicBuffer (m_apcSlicePilot, pcPic); @@ -1600,5 +1737,9 @@ #if SVC_EXTENSION sps->setLayerId(m_layerId); +#if SPS_DPB_PARAMS + m_cEntropyDecoder.decodeSPS( sps ); // it should be removed after macro clean up +#else m_cEntropyDecoder.decodeSPS( sps, &m_parameterSetManagerDecoder ); +#endif m_parameterSetManagerDecoder.storePrefetchedSPS(sps); #if !REPN_FORMAT_IN_VPS // ILRP can only be initialized at activation Index: trunk/source/Lib/TLibDecoder/TDecTop.h =================================================================== --- trunk/source/Lib/TLibDecoder/TDecTop.h (revision 595) +++ trunk/source/Lib/TLibDecoder/TDecTop.h (revision 644) @@ -239,5 +239,10 @@ fstream* getBLSyntaxFile() { return m_pBLSyntaxFile; } #endif - +#if NO_OUTPUT_OF_PRIOR_PICS +#if NO_CLRAS_OUTPUT_FLAG + Bool getNoOutputOfPriorPicsFlags() { return m_noOutputOfPriorPicsFlags;} + Void setNoOutputOfPriorPicsFlags(Bool x) { m_noOutputOfPriorPicsFlags = x; } +#endif +#endif protected: Void xGetNewPicBuffer (TComSlice* pcSlice, TComPic*& rpcPic); @@ -266,7 +271,9 @@ Int getFirstPicInLayerDecodedFlag() { return m_firstPicInLayerDecodedFlag;} Void setFirstPicInLayerDecodedFlag(Bool x) { m_firstPicInLayerDecodedFlag = x; } +#if !NO_OUTPUT_OF_PRIOR_PICS Int getNoOutputOfPriorPicsFlags() { return m_noOutputOfPriorPicsFlags;} Void setNoOutputOfPriorPicsFlags(Bool x) { m_noOutputOfPriorPicsFlags = x; } #endif +#endif };// END CLASS DEFINITION TDecTop