Index: branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncCfg.cpp =================================================================== --- branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncCfg.cpp (revision 492) +++ branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncCfg.cpp (revision 493) @@ -215,17 +215,18 @@ #endif #if H_MV - in>>entry.m_numInterViewRefPics; - for( Int i = 0; i < entry.m_numInterViewRefPics; i++ ) - { - in>>entry.m_interViewRefs[i]; - } - for( Int i = 0; i < entry.m_numInterViewRefPics; i++ ) + in>>entry.m_numActiveRefLayerPics; + for( Int i = 0; i < entry.m_numActiveRefLayerPics; i++ ) + { + in>>entry.m_interLayerPredLayerIdc[i]; + } + for( Int i = 0; i < entry.m_numActiveRefLayerPics; i++ ) { in>>entry.m_interViewRefPosL[0][i]; } - for( Int i = 0; i < entry.m_numInterViewRefPics; i++ ) + for( Int i = 0; i < entry.m_numActiveRefLayerPics; i++ ) { in>>entry.m_interViewRefPosL[1][i]; } + in>>entry.m_collocatedRefLayerIdx; #endif return in; @@ -397,7 +398,11 @@ ("LayerIdsInSet_%d", m_layerIdsInSets , std::vector(1,0), MAX_VPS_OP_SETS_PLUS1 ,"LayerIds of Layer set") ("DefaultOneTargetOutputLayerFlag", m_defaultOneTargetOutputLayerFlag, false , "Output highest layer of layer sets by default") - ("OutputLayerSetIdx", m_outputLayerSetIdx , std::vector(1,0), "Indices of layer sets used as additional output layer sets") + ("OutputLayerSetIdx", m_outputLayerSetIdx , std::vector(0,0), "Indices of layer sets used as additional output layer sets") ("LayerIdsInAddOutputLayerSet_%d", m_layerIdsInAddOutputLayerSet , std::vector(1,0), MAX_VPS_ADD_OUTPUT_LAYER_SETS, "LayerIds of additional output layers") ("ProfileLevelTierIdx", m_profileLevelTierIdx, std::vector(1,0), "Indices to profile level tier") + + // Layer dependencies + ("DirectRefLayers_%d", m_directRefLayers , std::vector(0,0), MAX_NUM_LAYERS, "LayerIds of direct reference layers") + ("DependencyTypes_%d", m_dependencyTypes , std::vector(0,0), MAX_NUM_LAYERS, "Dependency types of direct reference layers, 0: Sample 1: Motion 2: Sample+Motion") #endif ("SourceWidth,-wdt", m_iSourceWidth, 0, "Source picture width") @@ -1391,4 +1396,16 @@ } xConfirmPara( m_profileLevelTierIdx.size() < m_vpsNumLayerSets + m_outputLayerSetIdx.size(), "The number of Profile Level Tier indices must be equal to the number of layer set plus the number of output layer set indices" ); + + // Layer Dependencies + for (Int i = 0; i < m_numberOfLayers; i++ ) + { + xConfirmPara( (i == 0) && m_directRefLayers[0].size() != 0, "Layer 0 shall not have reference layers." ); + xConfirmPara( m_directRefLayers[i].size() == m_dependencyTypes[ i ].size() != 0, "Each reference layer shall have a reference type" ); + for (Int j = 0; j < m_directRefLayers[i].size(); j++) + { + xConfirmPara( m_directRefLayers[i][j] < 0 || m_directRefLayers[i][j] >= i , "Reference layer id shall be greater than or equal to 0 and less than dependent layer id"); + xConfirmPara( m_dependencyTypes[i][j] < 0 || m_dependencyTypes[i][j] > 2 , "Dependency type shall be greater than or equal to 0 and less than 3"); + } + } #endif xConfirmPara( m_iGOPSize < 1 , "GOP Size must be greater or equal to 1" ); @@ -1544,5 +1561,5 @@ for( Int i = 0; i < MAX_GOP; i++ ) { - if( m_GOPListMvc[0][i].m_numInterViewRefPics != 0 ) + if( m_GOPListMvc[0][i].m_numActiveRefLayerPics != 0 ) { printf( "\nError: Frame%d inter_layer refs not available in layer 0\n", i ); @@ -1560,10 +1577,10 @@ for( Int i = 0; i < MAX_GOP+1; i++ ) { - for( Int j = 0; j < m_GOPListMvc[k][i].m_numInterViewRefPics; j++ ) + for( Int j = 0; j < m_GOPListMvc[k][i].m_numActiveRefLayerPics; j++ ) { - Int iAbsViewId = m_GOPListMvc[k][i].m_interViewRefs[j] + k; - if( iAbsViewId < 0 || iAbsViewId >= k ) + Int ilPredLayerIdc = m_directRefLayers[k][m_GOPListMvc[k][i].m_interLayerPredLayerIdc[j]]; + if( ilPredLayerIdc < 0 || ilPredLayerIdc >= m_directRefLayers[k].size() ) { - printf( "\nError: inter-layer ref pic %d is not available for Frame%d_l%d\n", m_GOPListMvc[k][i].m_interViewRefs[j], i, k ); + printf( "\nError: inter-layer ref idc %d is not available for Frame%d_l%d\n", m_GOPListMvc[k][i].m_interLayerPredLayerIdc[j], i, k ); bErrorIvpEnhV = true; } @@ -1615,5 +1632,5 @@ } - if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'I' && m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics != 0 ) + if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'I' && m_GOPListMvc[k][MAX_GOP].m_numActiveRefLayerPics != 0 ) { printf( "\nError: inter-layer prediction not possible for FrameI_l%d with slice type I, #IL_ref_pics must be 0\n", k ); @@ -1621,12 +1638,12 @@ } - if( m_GOPListMvc[k][MAX_GOP].m_numRefPicsActive > m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics ) + if( m_GOPListMvc[k][MAX_GOP].m_numRefPicsActive > m_GOPListMvc[k][MAX_GOP].m_numActiveRefLayerPics ) { - m_GOPListMvc[k][MAX_GOP].m_numRefPicsActive = m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics; + m_GOPListMvc[k][MAX_GOP].m_numRefPicsActive = m_GOPListMvc[k][MAX_GOP].m_numActiveRefLayerPics; } if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'P' ) { - if( m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics < 1 ) + if( m_GOPListMvc[k][MAX_GOP].m_numActiveRefLayerPics < 1 ) { printf( "\nError: #IL_ref_pics must be at least one for FrameI_l%d with slice type P\n", k ); @@ -1635,5 +1652,5 @@ else { - for( Int j = 0; j < m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics; j++ ) + for( Int j = 0; j < m_GOPListMvc[k][MAX_GOP].m_numActiveRefLayerPics; j++ ) { if( m_GOPListMvc[k][MAX_GOP].m_interViewRefPosL[1][j] != -1 ) @@ -1646,5 +1663,5 @@ } - if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'B' && m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics < 1 ) + if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'B' && m_GOPListMvc[k][MAX_GOP].m_numActiveRefLayerPics < 1 ) { printf( "\nError: #IL_ref_pics must be at least one for FrameI_l%d with slice type B\n", k ); Index: branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncCfg.h =================================================================== --- branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncCfg.h (revision 492) +++ branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncCfg.h (revision 493) @@ -87,13 +87,16 @@ std::vector m_dimensionIdLen; ///< Length of scalability dimension s - // layer sets + // layer sets Int m_vpsNumLayerSets; ///< Number of layer sets - std::vector< std::vector > m_layerIdsInSets; ///< LayerIds of Layer set + std::vector< std::vector > m_layerIdsInSets; ///< LayerIds in vps of layer set Bool m_defaultOneTargetOutputLayerFlag; ///< Output highest layer of layer sets by default - Int numAddOuputLayerSets; ///< Number of additional output layer sets + Int numAddOuputLayerSets; ///< Number of additional output layer sets std::vector m_outputLayerSetIdx; ///< Indices of layer sets used as additional output layer sets - std::vector< std::vector > m_layerIdsInAddOutputLayerSet; ///< LayerIds of additional output layers + std::vector< std::vector > m_layerIdsInAddOutputLayerSet; ///< LayerIds in vps of additional output layers std::vector m_profileLevelTierIdx; ///< Indices of of profile level tier - + + // Dependencies + std::vector> m_directRefLayers; ///< LayerIds of direct reference layers + std::vector> m_dependencyTypes; ///< Dependency types of direct reference layers #endif Double m_adLambdaModifier[ MAX_TLAYER ]; ///< Lambda modifier array for each temporal layer Index: branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncTop.cpp =================================================================== --- branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncTop.cpp (revision 492) +++ branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncTop.cpp (revision 493) @@ -118,5 +118,5 @@ xSetLayerIds ( vps ); xSetDimensionIdAndLength ( vps ); - xSetDirectDependencyFlags( vps ); + xSetDependencies( vps ); xSetLayerSets ( vps ); #if H_3D @@ -985,26 +985,63 @@ } -Void TAppEncTop::xSetDirectDependencyFlags( TComVPS& vps ) -{ - for( Int layer = 0; layer < m_numberOfLayers; layer++ ) - { - if( m_GOPListMvc[layer][MAX_GOP].m_POC == -1 ) - { - continue; - } - for( Int i = 0; i < getGOPSize()+1; i++ ) - { - GOPEntry ge = ( i < getGOPSize() ) ? m_GOPListMvc[layer][i] : m_GOPListMvc[layer][MAX_GOP]; - for( Int j = 0; j < ge.m_numInterViewRefPics; j++ ) - { - Int interLayerRef = layer + ge.m_interViewRefs[j]; - vps.setDirectDependencyFlag( layer, interLayerRef, true ); - } - } - } - - vps.checkVPSExtensionSyntax(); - vps.setRefLayers(); -} +Void TAppEncTop::xSetDependencies( TComVPS& vps ) +{ + // Direct dependency flags + dependency types + for( Int depLayer = 1; depLayer < MAX_NUM_LAYERS; depLayer++ ) + { + for( Int refLayer = 0; refLayer < MAX_NUM_LAYERS; refLayer++ ) + { + vps.setDirectDependencyFlag( depLayer, refLayer, false); + vps.setDirectDependencyType( depLayer, refLayer, 0 ); + } + } + for( Int depLayer = 1; depLayer < m_numberOfLayers; depLayer++ ) + { + Int numRefLayers = m_directRefLayers[depLayer].size(); + assert( numRefLayers == m_dependencyTypes[depLayer].size() ); + for( Int i = 0; i < numRefLayers; i++ ) + { + Int refLayer = m_directRefLayers[depLayer][i]; + vps.setDirectDependencyFlag( depLayer, refLayer, true); + vps.setDirectDependencyType( depLayer, refLayer,m_dependencyTypes[depLayer][i]); + } + } + + // Max temporal id for inter layer reference pictures + for ( Int refLayerIdInVps = 0; refLayerIdInVps < m_numberOfLayers; refLayerIdInVps++) + { + Int maxTid = -1; + for ( Int currLayerIdInVps = 1; currLayerIdInVps < m_numberOfLayers; currLayerIdInVps++) + { + for( Int i = 0; i < getGOPSize(); i++ ) + { + GOPEntry ge = m_GOPListMvc[currLayerIdInVps][i]; + + for (Int j = 0; j < ge.m_numRefPicsActive; j++) + { + if ( m_directRefLayers[ currLayerIdInVps ][ ge.m_interLayerPredLayerIdc[ j ]] == refLayerIdInVps ) + { + maxTid = std::max( maxTid, ge.m_temporalId ); + } + } + } + } + vps.setMaxTidIlRefPicPlus1( refLayerIdInVps, maxTid + 1 ); + } + + // Max one active ref layer flag + Bool maxOneActiveRefLayerFlag = true; + for ( Int currLayerIdInVps = 1; currLayerIdInVps < m_numberOfLayers && maxOneActiveRefLayerFlag; currLayerIdInVps++) + { + for( Int i = 0; i < ( getGOPSize() + 1) && maxOneActiveRefLayerFlag; i++ ) + { + GOPEntry ge = m_GOPListMvc[currLayerIdInVps][ ( i < getGOPSize() ? i : MAX_GOP ) ]; + maxOneActiveRefLayerFlag = maxOneActiveRefLayerFlag && (ge.m_numRefPicsActive <= 1); + } + } + + vps.setMaxOneActiveRefLayerFlag( maxOneActiveRefLayerFlag ); + vps.setRefLayers(); +}; Void TAppEncTop::xSetLayerIds( TComVPS& vps ) @@ -1046,6 +1083,6 @@ } for ( Int i = 0; i < m_layerIdsInSets[lsIdx].size(); i++) - { - vps.setLayerIdIncludedFlag( true, lsIdx, m_layerIdsInSets[lsIdx][i] ); + { + vps.setLayerIdIncludedFlag( true, lsIdx, vps.getLayerIdInNuh( m_layerIdsInSets[lsIdx][i] ) ); } } Index: branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncTop.h =================================================================== --- branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncTop.h (revision 492) +++ branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncTop.h (revision 493) @@ -118,5 +118,5 @@ Void xSetLayerIds ( TComVPS& vps ); Void xSetDimensionIdAndLength ( TComVPS& vps ); - Void xSetDirectDependencyFlags ( TComVPS& vps ); + Void xSetDependencies ( TComVPS& vps ); Void xSetLayerSets( TComVPS& vps ); Int xGetMax( std::vector& vec);