Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 534) @@ -338,4 +338,10 @@ { WRITE_FLAG(pcVUI->getTilesFixedStructureFlag(), "tiles_fixed_structure_flag"); +#if H_MV + if ( pcSPS->getLayerId() > 0 ) + { + WRITE_FLAG( pcVUI->getTileBoundariesAlignedFlag( ) ? 1 : 0 , "tile_boundaries_aligned_flag" ); + } +#endif WRITE_FLAG(pcVUI->getMotionVectorsOverPicBoundariesFlag(), "motion_vectors_over_pic_boundaries_flag"); WRITE_FLAG(pcVUI->getRestrictedRefPicListsFlag(), "restricted_ref_pic_lists_flag"); @@ -452,7 +458,14 @@ #endif WRITE_CODE( pcSPS->getVPSId (), 4, "sps_video_parameter_set_id" ); +#if H_MV + if ( pcSPS->getLayerId() == 0 ) + { +#endif WRITE_CODE( pcSPS->getMaxTLayers() - 1, 3, "sps_max_sub_layers_minus1" ); WRITE_FLAG( pcSPS->getTemporalIdNestingFlag() ? 1 : 0, "sps_temporal_id_nesting_flag" ); codePTL(pcSPS->getPTL(), 1, pcSPS->getMaxTLayers() - 1); +#if H_MV +} +#endif WRITE_UVLC( pcSPS->getSPSId (), "sps_seq_parameter_set_id" ); WRITE_UVLC( pcSPS->getChromaFormatIdc (), "chroma_format_idc" ); @@ -565,4 +578,23 @@ WRITE_FLAG( 1, "sps_extension_flag" ); WRITE_FLAG( pcSPS->getInterViewMvVertConstraintFlag() ? 1 : 0, "inter_view_mv_vert_constraint_flag" ); + //// sps_extension_vui_parameters( ) + if( pcSPS->getVuiParameters()->getBitstreamRestrictionFlag() ) + { + WRITE_UVLC( pcSPS->getNumIlpRestrictedRefLayers( ), "num_ilp_restricted_ref_layers" ); + for( Int i = 0; i < pcSPS->getNumIlpRestrictedRefLayers( ); i++ ) + { + WRITE_UVLC( pcSPS->getMinSpatialSegmentOffsetPlus1( i ), "min_spatial_segment_offset_plus1" ); + if( pcSPS->getMinSpatialSegmentOffsetPlus1( i ) > 0 ) + { + WRITE_FLAG( pcSPS->getCtuBasedOffsetEnabledFlag( i ), "ctu_based_offset_enabled_flag[ i ]"); + if( pcSPS->getCtuBasedOffsetEnabledFlag( i ) ) + { + WRITE_UVLC( pcSPS->getMinHorizontalCtuOffsetPlus1( i ), "min_horizontal_ctu_offset_plus1[ i ]"); + } + } + } + } + //// sps_extension_vui_parameters( ) END + WRITE_UVLC( 0, "sps_shvc_reserved_zero_idc" ); #if !H_3D WRITE_FLAG( 0, "sps_extension2_flag" ); @@ -632,10 +664,17 @@ assert( pcVPS->getNumHrdParameters() <= MAX_VPS_NUM_HRD_PARAMETERS ); #if H_MV - assert( pcVPS->getMaxNuhLayerId() < MAX_VPS_NUH_LAYER_ID_PLUS1 ); - WRITE_CODE( pcVPS->getMaxNuhLayerId(), 6, "vps_max_nuh_layer_id" ); + assert( pcVPS->getVpsMaxLayerId() < MAX_VPS_NUH_LAYER_ID_PLUS1 ); + WRITE_CODE( pcVPS->getVpsMaxLayerId(), 6, "vps_max_layer_id" ); + + WRITE_UVLC( pcVPS->getVpsNumLayerSetsMinus1(), "vps_max_num_layer_sets_minus1" ); + for( UInt opsIdx = 1; opsIdx <= pcVPS->getVpsNumLayerSetsMinus1(); opsIdx ++ ) + { + // Operation point set + for( UInt i = 0; i <= pcVPS->getVpsMaxLayerId(); i ++ ) + { #else assert( pcVPS->getMaxNuhReservedZeroLayerId() < MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1 ); WRITE_CODE( pcVPS->getMaxNuhReservedZeroLayerId(), 6, "vps_max_nuh_reserved_zero_layer_id" ); -#endif + pcVPS->setMaxOpSets(1); WRITE_UVLC( pcVPS->getMaxOpSets() - 1, "vps_max_op_sets_minus1" ); @@ -643,12 +682,9 @@ { // Operation point set -#if H_MV - for( UInt i = 0; i <= pcVPS->getMaxNuhLayerId(); i ++ ) -#else for( UInt i = 0; i <= pcVPS->getMaxNuhReservedZeroLayerId(); i ++ ) -#endif { // Only applicable for version 1 pcVPS->setLayerIdIncludedFlag( true, opsIdx, i ); +#endif WRITE_FLAG( pcVPS->getLayerIdIncludedFlag( opsIdx, i ) ? 1 : 0, "layer_id_included_flag[opsIdx][i]" ); } @@ -701,42 +737,39 @@ } - for( Int sIdx = 0; sIdx < pcVPS->getNumScalabilityTypes( ); sIdx++ ) + for( Int sIdx = 0; sIdx < pcVPS->getNumScalabilityTypes( ) - ( pcVPS->getSplittingFlag() ? 1 : 0 ); sIdx++ ) { WRITE_CODE( pcVPS->getDimensionIdLen( sIdx ) - 1 , 3, "dimension_id_len_minus1[j]"); } + if ( pcVPS->getSplittingFlag() ) + { // Ignore old dimension id length + pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1 ,pcVPS->inferLastDimsionIdLenMinus1() + 1 ); + } + + WRITE_FLAG( pcVPS->getVpsNuhLayerIdPresentFlag() ? 1 : 0, "vps_nuh_layer_id_present_flag"); - // already updated to JCT3V-D0220 - for( Int layer = 0; layer <= pcVPS->getMaxLayers() - 1; layer++ ) - { - if ( ( layer != 0 ) && pcVPS->getVpsNuhLayerIdPresentFlag() ) - WRITE_CODE( pcVPS->getLayerIdInNuh( layer ), 6, "layer_id_in_nuh[i]"); - for( Int sIdx = 0; sIdx < pcVPS->getNumScalabilityTypes() ; sIdx++ ) + for( Int i = 0; i <= pcVPS->getMaxLayers() - 1; i++ ) + { + if ( pcVPS->getVpsNuhLayerIdPresentFlag() && ( i > 0 ) ) { - WRITE_CODE( pcVPS->getDimensionId( layer, sIdx ), pcVPS->getDimensionIdLen( sIdx ), "dimension_id[i][j]"); - } - } - - for( Int layerSet = 1; layerSet <= pcVPS->getMaxOpSets() - 1; layerSet++ ) - { - WRITE_FLAG( pcVPS->getVpsProfilePresentFlag( layerSet ) ? 1 : 0, "vps_profile_present_flag[lsIdx]" ); - if( pcVPS->getVpsProfilePresentFlag( layerSet ) == false ) - { - WRITE_UVLC( pcVPS->getProfileLayerSetRefMinus1( layerSet ), "profile_layer_set_ref_minus1[lsIdx]" ); - } - codePTL( pcVPS->getPTL( layerSet ), pcVPS->getVpsProfilePresentFlag( layerSet ), pcVPS->getMaxTLayers() - 1 ); - } - - WRITE_UVLC( pcVPS->getNumOutputLayerSets(), "num_output_layer_sets" ); - - for( Int layerSet = 0; layerSet < pcVPS->getNumOutputLayerSets(); layerSet++ ) - { - WRITE_UVLC( pcVPS->getOutputLayerSetIdx( layerSet ), "output_layer_set_idx[i]" ); - for( Int layer = 0; layer <= pcVPS->getMaxNuhLayerId(); layer++ ) - { - if( pcVPS->getLayerIdIncludedFlag( pcVPS->getOutputLayerSetIdx( layerSet ), layer ) == true ) - { - WRITE_FLAG( pcVPS->getOutputLayerFlag( layerSet, layer ) ? 1 : 0, "output_layer_flag" ); + WRITE_CODE( pcVPS->getLayerIdInNuh( i ), 6, "layer_id_in_nuh[i]"); + } + else + { + assert( pcVPS->getLayerIdInNuh( i ) == i ); + } + + assert( pcVPS->getLayerIdInVps( pcVPS->getLayerIdInNuh( i ) ) == i ); + + for( Int j = 0; j < pcVPS->getNumScalabilityTypes() ; j++ ) + { + if ( !pcVPS->getSplittingFlag() ) + { + WRITE_CODE( pcVPS->getDimensionId( i, j ), pcVPS->getDimensionIdLen( j ), "dimension_id[i][j]"); + } + else + { + assert( pcVPS->getDimensionId( i, j ) == pcVPS->inferDimensionId( i, j ) ); } } @@ -750,4 +783,71 @@ } } + + for( Int i = 0; i < pcVPS->getMaxLayers() - 1; i++ ) + { + WRITE_CODE( pcVPS->getMaxTidIlRefPicPlus1( i ), 3, "max_tid_il_ref_pics_plus1[i]" ); + } + + WRITE_CODE( pcVPS->getVpsNumberLayerSetsMinus1( ) , 10, "vps_number_layer_sets_minus1" ); + WRITE_CODE( pcVPS->getVpsNumProfileTierLevelMinus1( ), 6, "vps_num_profile_tier_level_minus1" ); + + for( Int i = 1; i <= pcVPS->getVpsNumProfileTierLevelMinus1(); i++ ) + { + WRITE_FLAG( pcVPS->getVpsProfilePresentFlag( i ) ? 1 : 0, "vps_profile_present_flag[i]" ); + if( !pcVPS->getVpsProfilePresentFlag( i ) ) + { + WRITE_CODE( pcVPS->getProfileRefMinus1( i ), 6, "profile_ref_minus1[i]" ); + } + codePTL( pcVPS->getPTL( i ), pcVPS->getVpsProfilePresentFlag( i ), pcVPS->getMaxTLayers() - 1 ); + } + + Int numOutputLayerSets = pcVPS->getVpsNumberLayerSetsMinus1( ) + 1; + + WRITE_FLAG( pcVPS->getMoreOutputLayerSetsThanDefaultFlag( ) ? 1 : 0, "more_output_layer_sets_than_default_flag" ); + + if ( pcVPS->getMoreOutputLayerSetsThanDefaultFlag( ) ) + { + WRITE_CODE( pcVPS->getNumAddOutputLayerSetsMinus1( ) , 10, "num_add_output_layer_sets_minus1" ); + numOutputLayerSets += ( pcVPS->getNumAddOutputLayerSetsMinus1( ) + 1 ); + } + + if( numOutputLayerSets > 1) + { + WRITE_FLAG( pcVPS->getDefaultOneTargetOutputLayerFlag( ) ? 1 : 0, "default_one_target_output_layer_flag" ); + } + + for( Int i = 1; i < numOutputLayerSets; i++ ) + { + if( i > pcVPS->getVpsNumberLayerSetsMinus1( ) ) + { + WRITE_UVLC( pcVPS->getOutputLayerSetIdxMinus1( i ), "output_layer_set_idx_minus1[i]" ); + for( Int j = 0; j < pcVPS->getNumLayersInIdList( j ) - 1 ; j++ ) + { + WRITE_FLAG( pcVPS->getOutputLayerFlag( i, j) ? 1 : 0, "output_layer_flag" ); + } + } + if ( pcVPS->getProfileLevelTierIdxLen() > 0 ) + { + WRITE_CODE( pcVPS->getProfileLevelTierIdx( i ), pcVPS->getProfileLevelTierIdxLen() ,"profile_level_tier_idx[ i ]" ); + } + } + + WRITE_FLAG( pcVPS->getMaxOneActiveRefLayerFlag( ) ? 1 : 0, "max_one_active_ref_layer_flag" ); + WRITE_UVLC( pcVPS->getDirectDepTypeLenMinus2 ( ), "direct_dep_type_len_minus2"); + + for( Int i = 1; i <= pcVPS->getMaxLayers() - 1; i++ ) + { + for( Int j = 0; j < i; j++ ) + { + if (pcVPS->getDirectDependencyFlag( i, j) ) + { + assert ( pcVPS->getDirectDependencyType( i, j ) != -1 ); + WRITE_CODE( pcVPS->getDirectDependencyType( i, j ),pcVPS->getDirectDepTypeLenMinus2( ) + 2, "direct_dependency_type[i][j]" ); + } + } + } + + WRITE_FLAG ( 0, "vps_shvc_reserved_zero_flag" ); + #if H_3D_GEN WRITE_FLAG( 1, "vps_extension2_flag" ); @@ -811,4 +911,7 @@ Void TEncCavlc::codeSliceHeader ( TComSlice* pcSlice ) { +#if H_MV + TComVPS* vps = pcSlice->getVPS(); +#endif #if ENC_DEC_TRACE xTraceSliceHeader (pcSlice); @@ -853,5 +956,14 @@ if ( !pcSlice->getDependentSliceSegmentFlag() ) { +#if H_MV + if ( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > 0 ) + { + WRITE_FLAG( pcSlice->getDiscardableFlag( ) ? 1 : 0 , "discardable_flag" ); + } + + for (Int i = 1; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++) +#else for (Int i = 0; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++) +#endif { assert(!!"slice_reserved_undetermined_flag[]"); @@ -1016,4 +1128,28 @@ } } +#if H_MV + Int layerIdInVps = pcSlice->getLayerIdInVps(); + if( pcSlice->getLayerId() > 0 && vps->getNumDirectRefLayers( layerIdInVps ) > 0 ) + { + WRITE_FLAG( pcSlice->getInterLayerPredEnabledFlag( ) ? 1 : 0 , "inter_layer_pred_enabled_flag" ); + if( pcSlice->getInterLayerPredEnabledFlag() && vps->getNumDirectRefLayers( layerIdInVps ) > 1 ) + { + if( !vps->getMaxOneActiveRefLayerFlag()) + { + WRITE_CODE( pcSlice->getNumInterLayerRefPicsMinus1( ), pcSlice->getNumInterLayerRefPicsMinus1Len( ), "num_inter_layer_ref_pics_minus1" ); + } + for( Int i = 0; i < pcSlice->getNumActiveRefLayerPics(); i++ ) + { + WRITE_CODE( pcSlice->getInterLayerPredLayerIdc( i ), pcSlice->getInterLayerPredLayerIdcLen( ), "inter_layer_pred_layer_idc" ); + } + } + } + + if( vps->getNumSamplePredRefLayers( layerIdInVps ) > 0 && pcSlice->getNumActiveRefLayerPics() > 0 ) + { + WRITE_FLAG( pcSlice->getInterLayerSamplePredOnlyFlag( ) ? 1 : 0 , "inter_layer_sample_pred_only_flag" ); + } + +#endif if(pcSlice->getSPS()->getUseSAO()) { @@ -1123,4 +1259,16 @@ if ( pcSlice->getEnableTMVPFlag() ) { +#if H_MV + if( pcSlice->getLayerId() > 0 && pcSlice->getNumActiveMotionPredRefLayers() > 0 ) + { + WRITE_FLAG( pcSlice->getAltCollocatedIndicationFlag( ) ? 1 : 0 , "alt_collocated_indication_flag" ); + } + if( pcSlice->getAltCollocatedIndicationFlag() && pcSlice->getNumActiveMotionPredRefLayers() > 1 ) + { + WRITE_UVLC( pcSlice->getCollocatedRefLayerIdx( ), "collocated_ref_layer_idx" ); + } + else + { +#endif if ( pcSlice->getSliceType() == B_SLICE ) { @@ -1135,4 +1283,7 @@ } } +#if H_MV + } +#endif if ( (pcSlice->getPPS()->getUseWP() && pcSlice->getSliceType()==P_SLICE) || (pcSlice->getPPS()->getWPBiPred() && pcSlice->getSliceType()==B_SLICE) ) { Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCfg.h =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCfg.h (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCfg.h (revision 534) @@ -74,7 +74,8 @@ Int m_refIdc[MAX_NUM_REF_PICS+1]; #if H_MV - Int m_numInterViewRefPics; - Int m_interViewRefs [MAX_NUM_REF_PICS]; + Int m_numActiveRefLayerPics; + Int m_interLayerPredLayerIdc [MAX_NUM_REF_PICS]; Int m_interViewRefPosL[2][MAX_NUM_REF_PICS]; + Int m_collocatedRefLayerIdx; #endif GOPEntry() @@ -93,5 +94,6 @@ , m_numRefIdc(0) #if H_MV - , m_numInterViewRefPics(0) + , m_numActiveRefLayerPics(0) + , m_collocatedRefLayerIdx(-1) #endif { @@ -100,5 +102,5 @@ ::memset( m_refIdc, 0, sizeof(m_refIdc) ); #if H_MV - ::memset( m_interViewRefs, 0, sizeof(m_interViewRefs) ); + ::memset( m_interLayerPredLayerIdc, 0, sizeof(m_interLayerPredLayerIdc) ); ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) ); ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) ); @@ -429,4 +431,5 @@ , m_viewIndex(-1) , m_isDepth(false) + , m_bUseVSO(false) #endif #endif Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.cpp (revision 534) @@ -502,4 +502,5 @@ pcSlice->setSliceIdx(0); #if H_MV + pcSlice->setRefPicSetInterLayer ( &m_refPicSetInterLayer ); pcPic ->setLayerId ( getLayerId() ); pcPic ->setViewId ( getViewId() ); @@ -669,8 +670,54 @@ refPicListModification->setRefPicListModificationFlagL1(0); #if H_MV + if ( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > 0 ) + { + pcSlice->setDiscardableFlag ( false ); + } + + TComVPS* vps = pcSlice->getVPS(); + Int layerIdInVps = vps ->getLayerIdInVps( getLayerId()); + Int numDirectRefLayers = vps ->getNumDirectRefLayers( layerIdInVps ); + GOPEntry gopEntry = m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid ); + + if ( getLayerId() > 0 && numDirectRefLayers > 0 ) + { + pcSlice->setInterLayerPredEnabledFlag ( gopEntry.m_numActiveRefLayerPics > 0 ); + if ( pcSlice->getInterLayerPredEnabledFlag() && numDirectRefLayers > 1 ) + { + if ( !vps->getMaxOneActiveRefLayerFlag() ) + { + pcSlice->setNumInterLayerRefPicsMinus1( gopEntry.m_numActiveRefLayerPics - 1 ); + } + for (Int i = 0; i < gopEntry.m_numActiveRefLayerPics; i++ ) + { + pcSlice->setInterLayerPredLayerIdc( i, gopEntry.m_interLayerPredLayerIdc[ i ] ); + } + } + } + assert( pcSlice->getNumActiveRefLayerPics() == gopEntry.m_numActiveRefLayerPics ); + + if ( vps->getNumSamplePredRefLayers( layerIdInVps ) > 0 && pcSlice->getNumActiveRefLayerPics() > 0) + { + pcSlice->setInterLayerSamplePredOnlyFlag( gopEntry.m_numRefPics == 0 ); + } + pcSlice->createAndApplyIvReferencePictureSet( m_ivPicLists, m_refPicSetInterLayer ); - pcSlice->setNumRefIdx(REF_PIC_LIST_0,min(m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid ).m_numRefPicsActive,( pcSlice->getRPS()->getNumberOfPictures() + (Int) m_refPicSetInterLayer.size() ) ) ); - pcSlice->setNumRefIdx(REF_PIC_LIST_1,min(m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid ).m_numRefPicsActive,( pcSlice->getRPS()->getNumberOfPictures() + (Int) m_refPicSetInterLayer.size() ) ) ); - xSetRefPicListModificationsMvc( pcSlice, pocCurr, iGOPid ); + pcSlice->setNumRefIdx(REF_PIC_LIST_0,min(gopEntry.m_numRefPicsActive,( pcSlice->getRPS()->getNumberOfPictures() + (Int) m_refPicSetInterLayer.size() ) ) ); + pcSlice->setNumRefIdx(REF_PIC_LIST_1,min(gopEntry.m_numRefPicsActive,( pcSlice->getRPS()->getNumberOfPictures() + (Int) m_refPicSetInterLayer.size() ) ) ); + + xSetRefPicListModificationsMv( pcSlice, iGOPid ); + + pcSlice->setActiveMotionPredRefLayers( ); + + if ( getLayerId() > 0 && pcSlice->getNumActiveMotionPredRefLayers() > 0 && pcSlice->getEnableTMVPFlag() && + ( pcSlice->getSliceType() == B_SLICE || pcSlice->getSliceType() == P_SLICE )) + { + pcSlice->setAltCollocatedIndicationFlag( gopEntry.m_collocatedRefLayerIdx >= 0 ); + if ( pcSlice->getNumActiveRefLayerPics() && pcSlice->getNumActiveMotionPredRefLayers() > 0 ) + { + pcSlice->setCollocatedRefLayerIdx( gopEntry.m_collocatedRefLayerIdx ); + } + } + #else pcSlice->setNumRefIdx(REF_PIC_LIST_0,min(m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive,pcSlice->getRPS()->getNumberOfPictures())); @@ -827,5 +874,4 @@ pcSlice->setEnableTMVPFlag(0); } - #if H_MV if( pcSlice->getIdrPicFlag() ) @@ -2120,4 +2166,5 @@ TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer ); std::vector temp; + TComSlice::markCurrPic( pcPic ); TComSlice::markIvRefPicsAsUnused ( m_ivPicLists, temp, pcPic->getSlice(0)->getVPS(), m_layerId, pcPic->getPOC() ); #endif @@ -2950,10 +2997,9 @@ #endif #if H_MV -Void TEncGOP::xSetRefPicListModificationsMvc( TComSlice* pcSlice, UInt uiPOCCurr, UInt iGOPid ) +Void TEncGOP::xSetRefPicListModificationsMv( TComSlice* pcSlice, UInt iGOPid ) { - TComVPS* vps = pcSlice->getVPS(); Int layer = pcSlice->getLayerIdInVps( ); - if( pcSlice->getSliceType() == I_SLICE || !(pcSlice->getPPS()->getListsModificationPresentFlag()) || vps->getNumDirectRefLayers( layer ) == 0 ) + if( pcSlice->getSliceType() == I_SLICE || !(pcSlice->getPPS()->getListsModificationPresentFlag()) || pcSlice->getNumActiveRefLayerPics() == 0 ) { return; @@ -2962,47 +3008,35 @@ // analyze inter-view modifications GOPEntry ge = m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && ( layer > 0) ) ? MAX_GOP : iGOPid ); - - TComRefPicListModification* refPicListModification = pcSlice->getRefPicListModification(); + assert( ge.m_numActiveRefLayerPics == pcSlice->getNumActiveRefLayerPics() ); Int maxRefListSize = pcSlice->getNumRpsCurrTempList(); - Int numTemporalRefs = maxRefListSize - vps->getNumDirectRefLayers( layer ); - + Int numTemporalRefs = maxRefListSize - pcSlice->getNumActiveRefLayerPics(); for (Int li = 0; li < 2; li ++) // Loop over lists L0 and L1 { - Int numModifications = 0; - - for( Int k = 0; k < ge.m_numInterViewRefPics; k++ ) - { - numModifications += ( ge.m_interViewRefPosL[li][k] >= 0 ) ? 1 : 0; - } - - // set inter-view modifications + // set inter-view modifications + Int tempList[16]; + for( Int k = 0; k < 16; k++ ) + { + tempList[ k ] = -1; + } + Bool isModified = false; - Int tempList[16]; - for( Int k = 0; k < 16; k++ ) { tempList[k] = -1; } - - if( (maxRefListSize > 1) && (numModifications > 0) ) - { - for( Int k = 0; k < ge.m_numInterViewRefPics; k++ ) - { - if( ge.m_interViewRefPosL[li][k] >= 0 ) - { - Int orgIdx = numTemporalRefs; + if ( maxRefListSize > 1 ) + { + for( Int k = 0, orgIdx = numTemporalRefs; k < ge.m_numActiveRefLayerPics; k++, orgIdx++ ) + { Int targetIdx = ge.m_interViewRefPosL[ li ][ k ]; - for( Int idx = 0; idx < vps->getNumDirectRefLayers( layer ); idx++ ) - { - Int refLayer = vps->getLayerIdInVps( vps->getRefLayerId( layer, idx ) ); - if( ( layer + ge.m_interViewRefs[ k ]) == refLayer ) + + isModified = ( targetIdx != orgIdx ) && ( targetIdx >= 0 ); + if ( isModified ) { + assert( tempList[ targetIdx ] == -1 ); // Assert when two inter layer reference pictures are sorted to the same position tempList[ targetIdx ] = orgIdx; - isModified = ( targetIdx != orgIdx ); - } - orgIdx++; - } - } - } - } - + } + } + } + + TComRefPicListModification* refPicListModification = pcSlice->getRefPicListModification(); refPicListModification->setRefPicListModificationFlagL( li, isModified ); Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.h =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.h (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.h (revision 534) @@ -221,5 +221,5 @@ #endif #if H_MV - Void xSetRefPicListModificationsMvc( TComSlice* pcSlice, UInt uiPOCCurr, UInt iGOPid ); + Void xSetRefPicListModificationsMv( TComSlice* pcSlice, UInt iGOPid ); #endif #if L0386_DB_METRIC Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp (revision 534) @@ -525,4 +525,5 @@ #if H_MV m_cSPS.setSPSId( getLayerIdInVps() ); + m_cSPS.setLayerId( getLayerId() ); #endif ProfileTierLevel& profileTierLevel = *m_cSPS.getPTL()->getGeneralPTL(); @@ -746,4 +747,7 @@ m_cPPS.setWPBiPred( m_useWeightedBiPred ); m_cPPS.setOutputFlagPresentFlag( false ); +#if H_MV + m_cPPS.setNumExtraSliceHeaderBits( 1 ); +#endif m_cPPS.setSignHideFlag(getSignHideFlag()); #if L0386_DB_METRIC