Index: branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp (revision 534) @@ -150,6 +150,8 @@ Bool recon_opened = false; // reconstruction file not yet opened. (must be performed after SPS is seen) #else +#if H_3D Int pocCurrPic = -MAX_INT; Int pocLastPic = -MAX_INT; +#endif Int layerIdCurrPic = 0; @@ -187,5 +189,7 @@ Bool newSliceDiffPoc = false; Bool newSliceDiffLayer = false; +#if H_3D Bool allLayersDecoded = false; +#endif #endif if (nalUnit.empty()) @@ -222,5 +226,7 @@ { layerIdCurrPic = nalu.m_layerId; +#if H_3D pocCurrPic = m_tDecTop[decIdx]->getCurrPoc(); +#endif decIdxCurrPic = decIdx; firstSlice = false; @@ -230,12 +236,13 @@ { layerIdCurrPic = nalu.m_layerId; - +#if H_3D pocLastPic = pocCurrPic; pocCurrPic = m_tDecTop[decIdx]->getCurrPoc(); - +#endif decIdxLastPic = decIdxCurrPic; decIdxCurrPic = decIdx; - +#if H_3D allLayersDecoded = ( pocCurrPic != pocLastPic ); +#endif } Index: branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp (revision 534) @@ -215,16 +215,20 @@ #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]; + } + if (entry.m_numActiveRefLayerPics > 0 ) + { + in>>entry.m_collocatedRefLayerIdx; } #endif @@ -398,4 +402,16 @@ ("LayerIdInNuh", m_layerIdInNuh , std::vector(1,0), "LayerId in Nuh") ("SplittingFlag", m_splittingFlag , false , "Splitting Flag") + + // Layer Sets + Output Layer Sets + Profile Tier Level + ("VpsNumLayerSets", m_vpsNumLayerSets , 1 , "Number of layer sets") + ("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(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") @@ -756,4 +772,8 @@ cOSS<<"Frame"<opt->opt_duplicate = true; + } } } @@ -762,5 +782,11 @@ std::ostringstream cOSS1; cOSS1<<"FrameI"<<"_l"< 1 ) + { + opts.opt_list.back()->opt->opt_duplicate = true; + } + for( Int i = 1; i < MAX_GOP + 1; i++ ) @@ -769,4 +795,8 @@ cOSS2<<"Frame"< 0 ) + { + opts.opt_list.back()->opt->opt_duplicate = true; + } } } @@ -1311,14 +1341,32 @@ #endif - xConfirmPara( m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. " ); - - for( Int dim = 0; dim < m_dimIds.size(); dim++ ) + xConfirmPara( m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. " ); Int dimBitOffset[MAX_NUM_SCALABILITY_TYPES+1]; + + dimBitOffset[ 0 ] = 0; + for (Int j = 1; j <= ((Int) m_dimIds.size() - m_splittingFlag ? 1 : 0); j++ ) { - xConfirmPara( m_dimIds[dim].size() < m_numberOfLayers, "DimensionId must be given for all layers and all dimensions. "); - xConfirmPara( ( dim != viewDimPosition ) && (m_dimIds[dim][0] != 0), "DimensionId of layer 0 must be 0. " ); - xConfirmPara( m_dimensionIdLen[dim] < 1 || m_dimensionIdLen[dim] > 8, "DimensionIdLen must be greater than 0 and less than 9 in all dimensions. " ); + dimBitOffset[ j ] = dimBitOffset[ j - 1 ] + m_dimensionIdLen[ j - 1]; + } + + if ( m_splittingFlag ) + { + dimBitOffset[ (Int) m_dimIds.size() ] = 6; + } + + for( Int j = 0; j < m_dimIds.size(); j++ ) + { + xConfirmPara( m_dimIds[j].size() < m_numberOfLayers, "DimensionId must be given for all layers and all dimensions. "); + xConfirmPara( ( j != viewDimPosition ) && (m_dimIds[j][0] != 0), "DimensionId of layer 0 must be 0. " ); + xConfirmPara( m_dimensionIdLen[j] < 1 || m_dimensionIdLen[j] > 8, "DimensionIdLen must be greater than 0 and less than 9 in all dimensions. " ); + + for( Int i = 1; i < m_numberOfLayers; i++ ) { - xConfirmPara( ( m_dimIds[dim][i] < 0 ) || ( m_dimIds[dim][i] > ( ( 1 << m_dimensionIdLen[dim] ) - 1 ) ) , "DimensionId shall be in the range of 0 to 2^DimensionIdLen - 1. " ); + xConfirmPara( ( m_dimIds[j][i] < 0 ) || ( m_dimIds[j][i] > ( ( 1 << m_dimensionIdLen[j] ) - 1 ) ) , "DimensionId shall be in the range of 0 to 2^DimensionIdLen - 1. " ); + if ( m_splittingFlag ) + { + Int layerIdInNuh = (m_layerIdInNuh.size()!=1) ? m_layerIdInNuh[i] : i; + xConfirmPara( ( ( layerIdInNuh & ( (1 << dimBitOffset[ j + 1 ] ) - 1) ) >> dimBitOffset[ j ] ) != m_dimIds[j][ i ] , "When Splitting Flag is equal to 1 dimension ids shall match values derived from layer ids. "); + } } } @@ -1361,4 +1409,52 @@ } + /// Layer sets + xConfirmPara( m_vpsNumLayerSets < 0 || m_vpsNumLayerSets > 1024, "VpsNumLayerSets must be greater than 0 and less than 1025") ; + for( Int lsIdx = 0; lsIdx < m_vpsNumLayerSets; lsIdx++ ) + { + if (lsIdx == 0) + { + xConfirmPara( m_layerIdsInSets[lsIdx].size() != 1 || m_layerIdsInSets[lsIdx][0] != 0 , "0-th layer shall only include layer 0. "); + } + for ( Int i = 0; i < m_layerIdsInSets[lsIdx].size(); i++ ) + { + xConfirmPara( m_layerIdsInSets[lsIdx][i] < 0 || m_layerIdsInSets[lsIdx].size() >= MAX_NUM_LAYER_IDS, "LayerIdsInSet must be greater than and less than 64" ); + } + } + + // Output layer sets + xConfirmPara( m_outputLayerSetIdx.size() > 1024, "The number of output layer set indices must be less than 1025.") ; + for (Int lsIdx = 0; lsIdx < m_outputLayerSetIdx.size(); lsIdx++) + { + Int refLayerSetIdx = m_outputLayerSetIdx[ lsIdx ]; + xConfirmPara( refLayerSetIdx < 0 || refLayerSetIdx >= m_vpsNumLayerSets, "Output layer set idx must be greater or equal to 0 and less than the VpsNumLayerSets." ); + + for (Int i = 0; i < m_layerIdsInAddOutputLayerSet[ lsIdx ].size(); i++) + { + Bool isAlsoInLayerSet = false; + for (Int j = 0; j < m_layerIdsInSets[ refLayerSetIdx ].size(); j++ ) + { + if ( m_layerIdsInSets[ refLayerSetIdx ][ j ] == m_layerIdsInAddOutputLayerSet[ lsIdx ][ i ] ) + { + isAlsoInLayerSet = true; + break; + } + } + xConfirmPara( !isAlsoInLayerSet, "All output layers of a output layer set be included in corresponding layer set."); + } + } + 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(), "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" ); @@ -1518,5 +1614,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 ); @@ -1530,24 +1626,25 @@ if( m_numberOfLayers > 1 ) { - for( Int k = 1; k < m_numberOfLayers; k++ ) + for( Int layer = 1; layer < m_numberOfLayers; layer++ ) { for( Int i = 0; i < MAX_GOP+1; i++ ) { - for( Int j = 0; j < m_GOPListMvc[k][i].m_numInterViewRefPics; j++ ) + GOPEntry gopEntry = m_GOPListMvc[layer][i]; + for( Int j = 0; j < gopEntry.m_numActiveRefLayerPics; j++ ) { - Int iAbsViewId = m_GOPListMvc[k][i].m_interViewRefs[j] + k; - if( iAbsViewId < 0 || iAbsViewId >= k ) + Int ilPredLayerIdc = gopEntry.m_interLayerPredLayerIdc[j]; + if( ilPredLayerIdc < 0 || ilPredLayerIdc >= m_directRefLayers[layer].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", gopEntry.m_interLayerPredLayerIdc[j], i, layer ); bErrorIvpEnhV = true; } - if( m_GOPListMvc[k][i].m_interViewRefPosL[0][j] < -1 || m_GOPListMvc[k][i].m_interViewRefPosL[0][j] > m_GOPListMvc[k][i].m_numRefPicsActive ) + if( gopEntry.m_interViewRefPosL[0][j] < -1 || gopEntry.m_interViewRefPosL[0][j] > gopEntry.m_numRefPicsActive ) { - printf( "\nError: inter-layer ref pos %d on L0 is not available for Frame%d_l%d\n", m_GOPListMvc[k][i].m_interViewRefPosL[0][j], i, k ); + printf( "\nError: inter-layer ref pos %d on L0 is not available for Frame%d_l%d\n", gopEntry.m_interViewRefPosL[0][j], i, layer ); bErrorIvpEnhV = true; } - if( m_GOPListMvc[k][i].m_interViewRefPosL[1][j] < -1 || m_GOPListMvc[k][i].m_interViewRefPosL[1][j] > m_GOPListMvc[k][i].m_numRefPicsActive ) + if( gopEntry.m_interViewRefPosL[1][j] < -1 || gopEntry.m_interViewRefPosL[1][j] > gopEntry.m_numRefPicsActive ) { - printf( "\nError: inter-layer ref pos %d on L1 is not available for Frame%d_l%d\n", m_GOPListMvc[k][i].m_interViewRefPosL[1][j], i, k ); + printf( "\nError: inter-layer ref pos %d on L1 is not available for Frame%d_l%d\n", gopEntry.m_interViewRefPosL[1][j], i, layer ); bErrorIvpEnhV = true; } @@ -1555,63 +1652,63 @@ if( i == MAX_GOP ) // inter-view refs at I pic position in base view { - if( m_GOPListMvc[k][MAX_GOP].m_sliceType != 'B' && m_GOPListMvc[k][MAX_GOP].m_sliceType != 'P' && m_GOPListMvc[k][MAX_GOP].m_sliceType != 'I' ) + if( gopEntry.m_sliceType != 'B' && gopEntry.m_sliceType != 'P' && gopEntry.m_sliceType != 'I' ) { - printf( "\nError: slice type of FrameI_l%d must be equal to B or P or I\n", k ); + printf( "\nError: slice type of FrameI_l%d must be equal to B or P or I\n", layer ); bErrorIvpEnhV = true; } - if( m_GOPListMvc[k][MAX_GOP].m_POC != 0 ) + if( gopEntry.m_POC != 0 ) { - printf( "\nError: POC %d not possible for FrameI_l%d, must be 0\n", m_GOPListMvc[k][MAX_GOP].m_POC, k ); + printf( "\nError: POC %d not possible for FrameI_l%d, must be 0\n", gopEntry.m_POC, layer ); bErrorIvpEnhV = true; } - if( m_GOPListMvc[k][MAX_GOP].m_temporalId != 0 ) + if( gopEntry.m_temporalId != 0 ) { - printf( "\nWarning: Temporal id of FrameI_l%d must be 0 (cp. I-frame in base layer)\n", k ); - m_GOPListMvc[k][MAX_GOP].m_temporalId = 0; + printf( "\nWarning: Temporal id of FrameI_l%d must be 0 (cp. I-frame in base layer)\n", layer ); + gopEntry.m_temporalId = 0; } - if( m_GOPListMvc[k][MAX_GOP].m_numRefPics != 0 ) + if( gopEntry.m_numRefPics != 0 ) { - printf( "\nWarning: temporal references not possible for FrameI_l%d\n", k ); - for( Int j = 0; j < m_GOPListMvc[k][MAX_GOP].m_numRefPics; j++ ) + printf( "\nWarning: temporal references not possible for FrameI_l%d\n", layer ); + for( Int j = 0; j < m_GOPListMvc[layer][MAX_GOP].m_numRefPics; j++ ) { - m_GOPListMvc[k][MAX_GOP].m_referencePics[j] = 0; + gopEntry.m_referencePics[j] = 0; } - m_GOPListMvc[k][MAX_GOP].m_numRefPics = 0; + gopEntry.m_numRefPics = 0; } - if( m_GOPListMvc[k][MAX_GOP].m_interRPSPrediction ) + if( gopEntry.m_interRPSPrediction ) { - printf( "\nError: inter RPS prediction not possible for FrameI_l%d, must be 0\n", k ); + printf( "\nError: inter RPS prediction not possible for FrameI_l%d, must be 0\n", layer ); bErrorIvpEnhV = true; } - if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'I' && m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics != 0 ) + if( gopEntry.m_sliceType == 'I' && gopEntry.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 ); + printf( "\nError: inter-layer prediction not possible for FrameI_l%d with slice type I, #IL_ref_pics must be 0\n", layer ); bErrorIvpEnhV = true; } - if( m_GOPListMvc[k][MAX_GOP].m_numRefPicsActive > m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics ) + if( gopEntry.m_numRefPicsActive > gopEntry.m_numActiveRefLayerPics ) { - m_GOPListMvc[k][MAX_GOP].m_numRefPicsActive = m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics; + gopEntry.m_numRefPicsActive = gopEntry.m_numActiveRefLayerPics; } - if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'P' ) + if( gopEntry.m_sliceType == 'P' ) { - if( m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics < 1 ) + if( gopEntry.m_numActiveRefLayerPics < 1 ) { - printf( "\nError: #IL_ref_pics must be at least one for FrameI_l%d with slice type P\n", k ); + printf( "\nError: #IL_ref_pics must be at least one for FrameI_l%d with slice type P\n", layer ); bErrorIvpEnhV = true; } else { - for( Int j = 0; j < m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics; j++ ) + for( Int j = 0; j < gopEntry.m_numActiveRefLayerPics; j++ ) { - if( m_GOPListMvc[k][MAX_GOP].m_interViewRefPosL[1][j] != -1 ) + if( gopEntry.m_interViewRefPosL[1][j] != -1 ) { - printf( "\nError: inter-layer ref pos %d on L1 not possible for FrameI_l%d with slice type P\n", m_GOPListMvc[k][MAX_GOP].m_interViewRefPosL[1][j], k ); + printf( "\nError: inter-layer ref pos %d on L1 not possible for FrameI_l%d with slice type P\n", gopEntry.m_interViewRefPosL[1][j], layer ); bErrorIvpEnhV = true; } @@ -1620,7 +1717,7 @@ } - if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'B' && m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics < 1 ) + if( gopEntry.m_sliceType == 'B' && gopEntry.m_numActiveRefLayerPics < 1 ) { - printf( "\nError: #IL_ref_pics must be at least one for FrameI_l%d with slice type B\n", k ); + printf( "\nError: #IL_ref_pics must be at least one for FrameI_l%d with slice type B\n", layer ); bErrorIvpEnhV = true; } Index: branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.h =================================================================== --- branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.h (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.h (revision 534) @@ -86,4 +86,17 @@ Int m_scalabilityMask; ///< Mask indicating scalabilities, 1: texture; 3: texture + depth std::vector m_dimensionIdLen; ///< Length of scalability dimension s + +// layer sets + Int m_vpsNumLayerSets; ///< Number of layer sets + std::vector< std::vector > m_layerIdsInSets; ///< LayerIds in vps of layer set + Bool m_defaultOneTargetOutputLayerFlag; ///< Output highest layer of layer sets by default + std::vector m_outputLayerSetIdx; ///< Indices of layer sets used as additional output layer sets + 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< std::vector > m_directRefLayers; ///< LayerIds of direct reference layers + std::vector< std::vector > m_dependencyTypes; ///< Dependency types of direct reference layers + #if H_3D_IV_MERGE Bool m_ivMvPredFlag; ///< Interview motion vector prediction Index: branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp (revision 534) @@ -118,5 +118,7 @@ xSetLayerIds ( vps ); xSetDimensionIdAndLength ( vps ); - xSetDirectDependencyFlags( vps ); + xSetDependencies( vps ); + xSetProfileTierLevel ( vps ); + xSetLayerSets ( vps ); #if H_3D vps.initViewIndex(); @@ -1079,26 +1081,64 @@ } -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++ ) +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, -1 ); + } + } + for( Int depLayer = 1; depLayer < m_numberOfLayers; depLayer++ ) + { + Int numRefLayers = (Int) m_directRefLayers[depLayer].size(); + assert( numRefLayers == (Int) 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 curLayerIdInVps = 1; curLayerIdInVps < m_numberOfLayers; curLayerIdInVps++) { - Int interLayerRef = layer + ge.m_interViewRefs[j]; - vps.setDirectDependencyFlag( layer, interLayerRef, true ); + for( Int i = 0; i < getGOPSize(); i++ ) + { + GOPEntry geCur = m_GOPListMvc[curLayerIdInVps][i]; + GOPEntry geRef = m_GOPListMvc[refLayerIdInVps][i]; + + for (Int j = 0; j < geCur.m_numActiveRefLayerPics; j++) + { + if ( m_directRefLayers[ curLayerIdInVps ][ geCur.m_interLayerPredLayerIdc[ j ]] == refLayerIdInVps ) + { + maxTid = std::max( maxTid, geRef.m_temporalId ); + } + } } } - } - - vps.checkVPSExtensionSyntax(); - vps.calcIvRefLayers(); -} + 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_numActiveRefLayerPics <= 1); + } +} + + vps.setMaxOneActiveRefLayerFlag( maxOneActiveRefLayerFlag ); + vps.setRefLayers(); +}; Void TAppEncTop::xSetLayerIds( TComVPS& vps ) @@ -1109,5 +1149,5 @@ Int maxNuhLayerId = nuhLayerIdPresentFlag ? xGetMax( m_layerIdInNuh ) : ( m_numberOfLayers - 1 ) ; - vps.setMaxNuhLayerId( maxNuhLayerId ); + vps.setVpsMaxLayerId( maxNuhLayerId ); vps.setVpsNuhLayerIdPresentFlag( nuhLayerIdPresentFlag ); @@ -1125,4 +1165,68 @@ maxVec = max( vec[i], maxVec ); return maxVec; +} + +Void TAppEncTop::xSetProfileTierLevel( TComVPS& vps ) +{ + const Int vpsNumProfileTierLevelMinus1 = 0; //TBD + vps.setVpsNumProfileTierLevelMinus1( vpsNumProfileTierLevelMinus1 ); + + for (Int i = 0; i <= vps.getVpsNumProfileTierLevelMinus1(); i++ ) + { + vps.setVpsProfilePresentFlag( i, true ); + } +} + + +Void TAppEncTop::xSetLayerSets( TComVPS& vps ) +{ + // Layer sets + vps.setVpsNumLayerSetsMinus1 ( m_vpsNumLayerSets - 1 ); + vps.setVpsNumberLayerSetsMinus1( vps.getVpsNumLayerSetsMinus1() ); + + for (Int lsIdx = 0; lsIdx < m_vpsNumLayerSets; lsIdx++ ) + { + for( Int layerId = 0; layerId < MAX_NUM_LAYER_IDS; layerId++ ) + { + vps.setLayerIdIncludedFlag( false, lsIdx, layerId ); + } + for ( Int i = 0; i < m_layerIdsInSets[lsIdx].size(); i++) + { + vps.setLayerIdIncludedFlag( true, lsIdx, vps.getLayerIdInNuh( m_layerIdsInSets[lsIdx][i] ) ); + } + } + + Int numAddOuputLayerSets = (Int) m_outputLayerSetIdx.size(); + // Additional output layer sets + profileLevelTierIdx + vps.setDefaultOneTargetOutputLayerFlag ( m_defaultOneTargetOutputLayerFlag ); + vps.setMoreOutputLayerSetsThanDefaultFlag( numAddOuputLayerSets != 0 ); + vps.setNumAddOutputLayerSetsMinus1 ( numAddOuputLayerSets - 1 ); + + for (Int lsIdx = 1; lsIdx < m_vpsNumLayerSets; lsIdx++) + { + vps.setProfileLevelTierIdx( lsIdx, m_profileLevelTierIdx[ lsIdx ] ); + } + + for (Int addOutLs = 0; addOutLs < numAddOuputLayerSets; addOutLs++ ) + { + vps.setProfileLevelTierIdx( m_vpsNumLayerSets + addOutLs, m_profileLevelTierIdx[ addOutLs ] ); + + Int refLayerSetIdx = m_outputLayerSetIdx[ addOutLs ]; + vps.setOutputLayerSetIdxMinus1( m_vpsNumLayerSets + addOutLs, refLayerSetIdx - 1 ); + + for (Int i = 0; i < m_layerIdsInSets[ refLayerSetIdx].size(); i++ ) + { + Bool outputLayerFlag = false; + for (Int j = 0; j < m_layerIdsInAddOutputLayerSet[ addOutLs ].size(); j++ ) + { + if ( m_layerIdsInAddOutputLayerSet[addOutLs][ j ] == m_layerIdsInSets[ refLayerSetIdx][ i ] ) + { + outputLayerFlag = true; + break; + } + } + vps.setOutputLayerFlag( m_vpsNumLayerSets + addOutLs, i, outputLayerFlag ); + } + } } #endif Index: branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.h =================================================================== --- branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.h (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.h (revision 534) @@ -118,5 +118,7 @@ Void xSetLayerIds ( TComVPS& vps ); Void xSetDimensionIdAndLength ( TComVPS& vps ); - Void xSetDirectDependencyFlags ( TComVPS& vps ); + Void xSetDependencies ( TComVPS& vps ); + Void xSetLayerSets ( TComVPS& vps ); + Void xSetProfileTierLevel ( TComVPS& vps ); Int xGetMax( std::vector& vec); #endif Index: branches/HTM-DEV-0.3-dev2/source/Lib/TAppCommon/program_options_lite.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TAppCommon/program_options_lite.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TAppCommon/program_options_lite.cpp (revision 534) @@ -39,5 +39,5 @@ #include #include "program_options_lite.h" - +#include "../TLibCommon/TypeDef.h" using namespace std; @@ -146,4 +146,7 @@ for(Options::NamesPtrList::iterator it = opts.opt_list.begin(); it != opts.opt_list.end(); it++) { +#if H_MV + if ( (*it)->opt->opt_duplicate ) continue; +#endif ostringstream line(ios_base::out); doHelpOpt(line, **it, pad_short); @@ -161,4 +164,7 @@ for(Options::NamesPtrList::iterator it = opts.opt_list.begin(); it != opts.opt_list.end(); it++) { +#if H_MV + if ( (*it)->opt->opt_duplicate ) continue; +#endif ostringstream line(ios_base::out); line << " "; Index: branches/HTM-DEV-0.3-dev2/source/Lib/TAppCommon/program_options_lite.h =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TAppCommon/program_options_lite.h (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TAppCommon/program_options_lite.h (revision 534) @@ -36,4 +36,5 @@ #include #include +#include "../TLibCommon/TypeDef.h" #if H_MV @@ -85,6 +86,11 @@ struct OptionBase { +#if H_MV + OptionBase(const std::string& name, const std::string& desc, bool duplicate = false) + : opt_string(name), opt_desc(desc), opt_duplicate(duplicate) +#else OptionBase(const std::string& name, const std::string& desc) : opt_string(name), opt_desc(desc) +#endif {}; @@ -98,4 +104,7 @@ std::string opt_string; std::string opt_desc; +#if H_MV + bool opt_duplicate; +#endif }; @@ -104,6 +113,11 @@ struct Option : public OptionBase { +#if H_MV + Option(const std::string& name, T& storage, T default_val, const std::string& desc, bool duplicate = false) + : OptionBase(name, desc, duplicate), opt_storage(storage), opt_default_val(default_val) +#else Option(const std::string& name, T& storage, T default_val, const std::string& desc) : OptionBase(name, desc), opt_storage(storage), opt_default_val(default_val) +#endif {} @@ -362,17 +376,26 @@ { std::string cNameBuffer; - std::string cDescriptionBuffer; + std::string cDescBuffer; cNameBuffer .resize( name.size() + 10 ); - cDescriptionBuffer.resize( desc.size() + 10 ); + cDescBuffer.resize( desc.size() + 10 ); storage.resize(uiMaxNum); for ( unsigned int uiK = 0; uiK < uiMaxNum; uiK++ ) { + Bool duplicate = (uiK != 0); // isn't there are sprintf function for string?? sprintf((char*) cNameBuffer.c_str() ,name.c_str(),uiK,uiK); - sprintf((char*) cDescriptionBuffer.c_str(),desc.c_str(),uiK,uiK); - - parent.addOption(new Option( cNameBuffer, (storage[uiK]), default_val, cDescriptionBuffer )); + + if ( !duplicate ) + { + sprintf((char*) cDescBuffer.c_str(),desc.c_str(),uiK,uiK); + } + + cNameBuffer.resize( std::strlen(cNameBuffer.c_str()) ); + cDescBuffer.resize( std::strlen(cDescBuffer.c_str()) ); + + + parent.addOption(new Option( cNameBuffer, (storage[uiK]), default_val, cDescBuffer, duplicate )); } Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp (revision 534) @@ -4321,5 +4321,17 @@ // use coldir. +#if H_MV + TComPic *pColPic; + if (getSlice()->getAltCollocatedIndicationFlag() ) + { + pColPic = getSlice()->getPicFromRefPicSetInterLayer( getSlice()->getActiveMotionPredRefLayerId( getSlice()->getCollocatedRefLayerIdx() )); + } + else + { + pColPic = getSlice()->getRefPic( RefPicList(getSlice()->isInterB() ? 1-getSlice()->getColFromL0Flag() : 0), getSlice()->getColRefIdx()); + } +#else TComPic *pColPic = getSlice()->getRefPic( RefPicList(getSlice()->isInterB() ? 1-getSlice()->getColFromL0Flag() : 0), getSlice()->getColRefIdx()); +#endif TComDataCU *pColCU = pColPic->getCU( uiCUAddr ); if(pColCU->getPic()==0||pColCU->getPartitionSize(uiPartUnitIdx)==SIZE_NONE) Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp (revision 534) @@ -108,4 +108,5 @@ , m_enableTMVPFlag ( true ) #if H_MV +, m_refPicSetInterLayer ( NULL ) , m_layerId (0) , m_viewId (0) @@ -114,4 +115,10 @@ , m_isDepth (false) #endif +, m_discardableFlag (false) +, m_interLayerPredEnabledFlag (false) +, m_numInterLayerRefPicsMinus1 (0) +, m_interLayerSamplePredOnlyFlag (false) +, m_altCollocatedIndicationFlag (0) +, m_collocatedRefLayerIdx (0) #if H_3D_IC , m_bApplyIC ( false ) @@ -162,4 +169,10 @@ initWpAcDcParam(); m_saoEnabledFlag = false; +#if H_MV + for (Int i = 0; i < MAX_NUM_LAYERS; i++ ) + { + m_interLayerPredLayerIdc[ i ] = 0; + } +#endif } @@ -492,8 +505,4 @@ UInt NumPocStCurr1 = 0; UInt NumPocLtCurr = 0; -#if H_MV - Int numDirectRefLayers = getVPS()->getNumDirectRefLayers( getLayerIdInVps() ); - assert( numDirectRefLayers == refPicSetInterLayer.size() ); -#endif Int i; for(i=0; i < m_pcRPS->getNumberOfNegativePictures(); i++) @@ -544,5 +553,7 @@ TComPic* rpsCurrList1[MAX_NUM_REF+1]; #if H_MV - Int numPocTotalCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + numDirectRefLayers; + Int numPocInterCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr; + assert( numPocInterCurr == 0 || getInterRefEnabledInRPLFlag() ); + Int numPocTotalCurr = numPocInterCurr + getNumActiveRefLayerPics( ); assert( numPocTotalCurr == getNumRpsCurrTempList() ); #else @@ -582,4 +593,8 @@ Int cIdx = 0; +#if H_MV + if ( getInterRefEnabledInRPLFlag() ) + { +#endif for ( i=0; i= numPocSt ) ; + } + } + } +#else for (Int rIdx = 0; rIdx <= (m_aiNumRefIdx[0]-1); rIdx ++) @@ -652,4 +694,5 @@ } } +#endif } @@ -687,5 +730,6 @@ } #if H_MV - numRpsCurrTempList = numRpsCurrTempList + getVPS()->getNumDirectRefLayers( getLayerIdInVps() ); + assert( ( numRpsCurrTempList == 0 ) || getInterRefEnabledInRPLFlag() ); + numRpsCurrTempList = numRpsCurrTempList + getNumActiveRefLayerPics(); #endif return numRpsCurrTempList; @@ -1022,4 +1066,26 @@ m_enableTMVPFlag = pSrc->m_enableTMVPFlag; m_maxNumMergeCand = pSrc->m_maxNumMergeCand; + +#if H_MV + // Additional slice header syntax elements + m_discardableFlag = pSrc->m_discardableFlag; + m_interLayerPredEnabledFlag = pSrc->m_interLayerPredEnabledFlag; + m_numInterLayerRefPicsMinus1 = pSrc->m_numInterLayerRefPicsMinus1; + + for (Int layer = 0; layer < MAX_NUM_LAYERS; layer++ ) + { + m_interLayerPredLayerIdc[ layer ] = pSrc->m_interLayerPredLayerIdc[ layer ]; + } + + m_interLayerSamplePredOnlyFlag = pSrc->m_interLayerSamplePredOnlyFlag; + m_altCollocatedIndicationFlag = pSrc->m_altCollocatedIndicationFlag ; + m_collocatedRefLayerIdx = pSrc->m_collocatedRefLayerIdx ; + m_numActiveMotionPredRefLayers = pSrc->m_numActiveMotionPredRefLayers; + + for (Int layer = 0; layer < MAX_NUM_LAYER_IDS; layer++) + { + m_interLayerPredLayerIdc[layer] = pSrc->m_interLayerPredLayerIdc[layer]; + } +#endif #if H_3D_IC m_bApplyIC = pSrc->m_bApplyIC; @@ -1489,5 +1555,5 @@ , m_numHrdParameters ( 0) #if H_MV -, m_maxNuhLayerId ( 0) +, m_maxLayerId ( 0) #else , m_maxNuhReservedZeroLayerId ( 0) @@ -1508,4 +1574,38 @@ } #if H_MV + for (Int lsIdx = 0; lsIdx < MAX_VPS_OP_SETS_PLUS1; lsIdx++ ) + { + for( Int layerId = 0; layerId < MAX_VPS_NUH_LAYER_ID_PLUS1; layerId++ ) + { + m_layerIdIncludedFlag[lsIdx][layerId] = false; + } + } + + m_vpsNumberLayerSetsMinus1 = -1; + m_vpsNumProfileTierLevelMinus1 = -1; + + for ( Int i = 0; i < MAX_VPS_PROFILE_TIER_LEVEL; i++) + { + m_profileRefMinus1[ i ] = -1; + } + + m_moreOutputLayerSetsThanDefaultFlag = false; + m_numAddOutputLayerSetsMinus1 = -1; + m_defaultOneTargetOutputLayerFlag = false; + + for ( Int i = 0; i < MAX_VPS_OUTPUTLAYER_SETS; i++) + { + m_outputLayerSetIdxMinus1[i] = -1; + m_profileLevelTierIdx[i] = 0; + for ( Int j = 0; j < MAX_VPS_NUH_LAYER_ID_PLUS1; j++) + { + m_outputLayerFlag[i][j] = false; + } + } + + m_maxOneActiveRefLayerFlag = false; + m_directDepTypeLenMinus2 = 0; + + m_avcBaseLayerFlag = false; m_splittingFlag = false; @@ -1518,11 +1618,10 @@ m_vpsNuhLayerIdPresentFlag = false; - m_numOutputLayerSets = 0; for( Int i = 0; i < MAX_VPS_OP_SETS_PLUS1; i++ ) { m_vpsProfilePresentFlag [i] = false; - m_profileLayerSetRefMinus1[i] = 0; - m_outputLayerSetIdx [i] = 0; + m_profileRefMinus1[i] = 0; + m_outputLayerSetIdxMinus1 [i] = 0; for( Int j = 0; j < MAX_VPS_NUH_LAYER_ID_PLUS1; j++ ) { @@ -1540,4 +1639,5 @@ m_layerIdInNuh [i] = ( i == 0 ) ? 0 : -1; m_numDirectRefLayers[i] = 0; + m_maxTidIlRefPicPlus1[i] = -1; #if H_3D m_viewIndex [i] = -1; @@ -1566,4 +1666,5 @@ { m_directDependencyFlag[i][j] = false; + m_directDependencyType[i][j] = -1; m_refLayerId[i][j] = -1; } @@ -1686,28 +1787,4 @@ Bool TComVPS::checkVPSExtensionSyntax() { - // check splitting flag constraint - if ( getSplittingFlag() ) - { - // Derive dimBitOffset[j] - Int dimBitOffset[MAX_NUM_SCALABILITY_TYPES+1]; - Int numScalabilityTypes = getNumScalabilityTypes(); - dimBitOffset[0] = 0; - - for (Int type = 1; type <= numScalabilityTypes; type++ ) - { - dimBitOffset[ type ] = 0; - for (Int dimIdx = 0; dimIdx <= type - 1; dimIdx++) - dimBitOffset[ type ] += ( getDimensionIdLen( dimIdx ) ); - } - - for (Int type = 0; type < getNumScalabilityTypes(); type++ ) - { - for( Int layer = 1; layer < getMaxLayers(); layer++ ) - { - assert( getDimensionId( layer, type ) == ( ( getLayerIdInNuh( layer ) & ( (1 << dimBitOffset[ type + 1 ] ) - 1) ) >> dimBitOffset[ type ] ) ); - }; - }; - } - for( Int layer = 1; layer < getMaxLayers(); layer++ ) { @@ -1737,6 +1814,4 @@ } - - Void TComVPS::setScalabilityMask( UInt val ) { @@ -1745,12 +1820,50 @@ } -Void TComVPS::calcIvRefLayers() -{ - for( Int i = 1; i <= getMaxLayers(); i++ ) +Void TComVPS::setRefLayers() +{ + for( Int i = 0; i < MAX_NUM_LAYERS; i++ ) { + m_numSamplePredRefLayers[ i ] = 0; + m_numMotionPredRefLayers[ i ] = 0; m_numDirectRefLayers[ i ] = 0; + for( Int j = 0; j < MAX_NUM_LAYERS; j++ ) { + m_samplePredEnabledFlag[ i ][ j ] = 0; + m_motionPredEnabledFlag[ i ][ j ] = 0; + m_refLayerId[ i ][ j ] = 0; + m_samplePredRefLayerId[ i ][ j ] = 0; + m_motionPredRefLayerId[ i ][ j ] = 0; + } + } + + for( Int i = 1; i <= getMaxLayers()- 1; i++ ) + { + for( Int j = 0; j < i; j++ ) + { + if( getDirectDependencyFlag(i,j) ) + { + m_refLayerId[ i ][m_numDirectRefLayers[ i ]++ ] = getLayerIdInNuh( j ); + + m_samplePredEnabledFlag [ i ][ j ] = ( ( getDirectDependencyType( i , j ) + 1 ) & 1 ) == 1; + m_numSamplePredRefLayers[ i ] += m_samplePredEnabledFlag [ i ][ j ] ? 1 : 0; + m_motionPredEnabledFlag [ i ][ j ] = ( ( ( getDirectDependencyType( i , j ) + 1 ) & 2 ) >> 1 ) == 1; + m_numMotionPredRefLayers[ i ] += m_motionPredEnabledFlag [ i][ j ] ? 1 : 0; + } + } + } + + for( Int i = 1, mIdx = 0, sIdx = 0; i <= getMaxLayers()- 1; i++ ) + { for( Int j = 0 ; j < i; j++ ) - if( m_directDependencyFlag[ i ][ j ]) - m_refLayerId[ i ][ m_numDirectRefLayers[ i ]++ ] = m_layerIdInNuh[ j ]; + { + if( m_motionPredEnabledFlag[ i ][ j ] ) + { + m_motionPredRefLayerId[ i ][ mIdx++ ] = getLayerIdInNuh( j ); + } + + if( m_samplePredEnabledFlag[ i ][ j ] ) + { + m_samplePredRefLayerId[ i ][ sIdx++ ] = getLayerIdInNuh( j ); + } + } } } @@ -1814,5 +1927,54 @@ return getLayerIdInNuh( foundlayerId ); } + #endif // H_3D + +Int TComVPS::xCeilLog2( Int val ) +{ + assert( val > 0 ); + Int ceilLog2 = 0; + while( val > ( 1 << ceilLog2 ) ) ceilLog2++; + return ceilLog2; +} + + +Int TComVPS::xGetDimBitOffset( Int j ) +{ + Int dimBitOffset = 0; + if ( getSplittingFlag() && j == getNumScalabilityTypes() ) + { + dimBitOffset = 6; + } + else + { + for (Int dimIdx = 0; dimIdx <= j-1; dimIdx++) + { + dimBitOffset += getDimensionIdLen( dimIdx ); + } + } + return dimBitOffset; +} + +Int TComVPS::inferDimensionId( Int i, Int j ) +{ + return ( ( getLayerIdInNuh( i ) & ( (1 << xGetDimBitOffset( j + 1 ) ) - 1) ) >> xGetDimBitOffset( j ) ); +} + +Int TComVPS::inferLastDimsionIdLenMinus1() +{ + return ( 5 - xGetDimBitOffset( getNumScalabilityTypes() - 1 ) ); +} + +Int TComVPS::getNumLayersInIdList( Int lsIdx ) +{ + assert( lsIdx >= 0 ); + assert( lsIdx <= getVpsNumLayerSetsMinus1() ); + Int numLayersInIdList = 0; + for (Int layerId = 0; layerId < getVpsMaxLayerId(); layerId++ ) + { + numLayersInIdList += ( getLayerIdIncludedFlag( lsIdx, layerId ) ); + } + return numLayersInIdList; +} #endif // H_MV @@ -1865,4 +2027,6 @@ #if H_MV , m_interViewMvVertConstraintFlag (false) +, m_numIlpRestrictedRefLayers ( 0 ) + #endif #if H_3D @@ -1883,4 +2047,12 @@ ::memset(m_ltRefPicPocLsbSps, 0, sizeof(m_ltRefPicPocLsbSps)); ::memset(m_usedByCurrPicLtSPSFlag, 0, sizeof(m_usedByCurrPicLtSPSFlag)); +#if H_MV + for (Int i = 0; i < MAX_NUM_LAYERS; i++ ) + { + m_minSpatialSegmentOffsetPlus1[ i ] = 0; + m_ctuBasedOffsetEnabledFlag [ i ] = false; + m_minHorizontalCtuOffsetPlus1 [ i ] = 0; + } +#endif } @@ -2361,7 +2533,7 @@ refPicSetInterLayer.clear(); - for( Int i = 0; i < getVPS()->getNumDirectRefLayers( getLayerIdInVps() ); i++ ) - { - Int layerIdRef = getVPS()->getRefLayerId( getLayerIdInVps(), i ); + for( Int i = 0; i < getNumActiveRefLayerPics(); i++ ) + { + Int layerIdRef = getRefPicLayerId( i ); TComPic* picRef = ivPicLists->getPic( layerIdRef, getPOC() ) ; assert ( picRef != 0 ); @@ -2371,4 +2543,6 @@ picRef->getSlice(0)->setReferenced( true ); + // Consider to check here: + // "If the current picture is a RADL picture, there shall be no entry in the RefPicSetInterLayer that is a RASL picture. " refPicSetInterLayer.push_back( picRef ); } @@ -2441,4 +2615,98 @@ } } +} +Int TComSlice::xCeilLog2( Int val ) +{ + assert( val > 0 ); + Int ceilLog2 = 0; + while( val > ( 1 << ceilLog2 ) ) ceilLog2++; + return ceilLog2; +} + +Void TComSlice::markCurrPic( TComPic* currPic ) +{ + if ( !currPic->getSlice(0)->getDiscardableFlag() ) + { + currPic->getSlice(0)->setReferenced( true ) ; + currPic->setIsLongTerm( false ); + } + else + { + currPic->getSlice(0)->setReferenced( false ) ; + } +} + +Void TComSlice::setRefPicSetInterLayer( std::vector* refPicSetInterLayer ) +{ + m_refPicSetInterLayer = refPicSetInterLayer; +} + +TComPic* TComSlice::getPicFromRefPicSetInterLayer( Int layerId ) +{ + assert( m_refPicSetInterLayer != 0 ); + assert( (*m_refPicSetInterLayer).size() == getNumActiveRefLayerPics() ); + TComPic* pcPic = NULL; + for ( Int i = 0; i < getNumActiveRefLayerPics(); i++ ) + { + if ((*m_refPicSetInterLayer)[ i ]->getLayerId() == layerId) + { + pcPic = (*m_refPicSetInterLayer)[ i ]; + } + } + assert(pcPic != NULL); + return pcPic; +} + +Int TComSlice::getNumActiveRefLayerPics() +{ + Int numActiveRefLayerPics; + + if( getLayerId() == 0 || getVPS()->getNumDirectRefLayers( getLayerIdInVps() ) == 0 || !getInterLayerPredEnabledFlag() ) + { + numActiveRefLayerPics = 0; + } + else if( getVPS()->getMaxOneActiveRefLayerFlag() || getVPS()->getNumDirectRefLayers( getLayerIdInVps() ) == 1 ) + { + numActiveRefLayerPics = 1; + } + else + { + numActiveRefLayerPics = getNumInterLayerRefPicsMinus1() + 1; + } + return numActiveRefLayerPics; +} + +Int TComSlice::getRefPicLayerId( Int i ) +{ + return getVPS()->getRefLayerId( getLayerIdInVps(), getInterLayerPredLayerIdc( i ) ); +} + +Void TComSlice::setActiveMotionPredRefLayers() +{ + Int j = 0; + for( Int i = 0; i < getNumActiveRefLayerPics(); i++) + { + if( getVPS()->getMotionPredEnabledFlag( getLayerIdInVps(), getInterLayerPredLayerIdc( i )) ) + { + m_activeMotionPredRefLayerId[ j++ ] = getVPS()->getRefLayerId( getLayerIdInVps(), i ); + } + } + m_numActiveMotionPredRefLayers = j; + + // Consider incorporating bitstream conformance tests on derived variables here. +} + +Bool TComSlice::getInterRefEnabledInRPLFlag() +{ + Bool interRefEnabledInRPLFlag; + if ( getVPS()->getNumSamplePredRefLayers( getLayerIdInVps() ) > 0 && getNumActiveRefLayerPics() > 0 ) + { + interRefEnabledInRPLFlag = !getInterLayerSamplePredOnlyFlag(); + } + else + { + interRefEnabledInRPLFlag = 1; + } + return interRefEnabledInRPLFlag; } #if H_3D_ARP Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h (revision 534) @@ -487,5 +487,5 @@ UInt m_numHrdParameters; #if H_MV - UInt m_maxNuhLayerId; + UInt m_maxLayerId; #else UInt m_maxNuhReservedZeroLayerId; @@ -494,8 +494,9 @@ UInt* m_hrdOpSetIdx; Bool* m_cprmsPresentFlag; - UInt m_numOpSets; -#if H_MV +#if H_MV + UInt m_vpsNumLayerSetsMinus1; Bool m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_LAYER_ID_PLUS1]; #else + UInt m_numOpSets; Bool m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1]; #endif @@ -514,4 +515,5 @@ #if H_MV + /// VPS EXTENSION SYNTAX ELEMENTS Bool m_avcBaseLayerFlag; Bool m_splittingFlag; @@ -520,8 +522,41 @@ Bool m_vpsNuhLayerIdPresentFlag; Int m_layerIdInNuh [MAX_NUM_LAYER_IDS]; + Int m_dimensionId [MAX_NUM_LAYER_IDS][MAX_NUM_SCALABILITY_TYPES]; + Bool m_directDependencyFlag [MAX_NUM_LAYER_IDS][MAX_NUM_LAYER_IDS]; + Int m_maxTidIlRefPicPlus1 [MAX_NUM_LAYERS]; + Int m_vpsNumberLayerSetsMinus1; + Int m_vpsNumProfileTierLevelMinus1; + Bool m_vpsProfilePresentFlag [MAX_VPS_OP_SETS_PLUS1]; + Int m_profileRefMinus1 [MAX_VPS_PROFILE_TIER_LEVEL]; + Bool m_moreOutputLayerSetsThanDefaultFlag; + Int m_numAddOutputLayerSetsMinus1; + Bool m_defaultOneTargetOutputLayerFlag; + Int m_outputLayerSetIdxMinus1 [MAX_VPS_OUTPUTLAYER_SETS]; + Bool m_outputLayerFlag [MAX_VPS_OUTPUTLAYER_SETS][MAX_VPS_NUH_LAYER_ID_PLUS1]; + Int m_profileLevelTierIdx [MAX_VPS_OUTPUTLAYER_SETS ]; + Bool m_maxOneActiveRefLayerFlag; + Int m_directDepTypeLenMinus2; + Int m_directDependencyType [MAX_NUM_LAYERS] [MAX_NUM_LAYERS]; + + // VPS EXTENSION SEMANTICS VARIABLES Int m_layerIdInVps [MAX_NUM_LAYERS ]; - Int m_dimensionId [MAX_NUM_LAYER_IDS][MAX_NUM_SCALABILITY_TYPES]; + + Int m_numDirectRefLayers [MAX_NUM_LAYERS]; + Int m_refLayerId [MAX_NUM_LAYERS][MAX_NUM_LAYERS]; + + Int m_numSamplePredRefLayers [MAX_NUM_LAYERS]; + Bool m_samplePredEnabledFlag [MAX_NUM_LAYERS][MAX_NUM_LAYERS]; + Int m_samplePredRefLayerId [MAX_NUM_LAYERS][MAX_NUM_LAYERS]; + + Int m_numMotionPredRefLayers [MAX_NUM_LAYERS]; + Bool m_motionPredEnabledFlag [MAX_NUM_LAYERS][MAX_NUM_LAYERS]; + Int m_motionPredRefLayerId [MAX_NUM_LAYERS][MAX_NUM_LAYERS]; #if H_3D Int m_viewIndex [MAX_NUM_LAYERS ]; +#endif + + Int xCeilLog2 ( Int val ); + Int xGetDimBitOffset( Int j ); + #if H_3D_ARP UInt m_uiUseAdvResPred [MAX_NUM_LAYERS ]; @@ -549,17 +584,4 @@ Bool m_ivMvScalingFlag; #endif - -#endif - - - Bool m_vpsProfilePresentFlag [MAX_VPS_OP_SETS_PLUS1]; - Int m_profileLayerSetRefMinus1 [MAX_VPS_OP_SETS_PLUS1]; - Int m_numOutputLayerSets; - Int m_outputLayerSetIdx [MAX_VPS_OP_SETS_PLUS1]; - Bool m_outputLayerFlag [MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_LAYER_ID_PLUS1]; - Bool m_directDependencyFlag [MAX_NUM_LAYER_IDS][MAX_NUM_LAYER_IDS]; - - Int m_numDirectRefLayers [ MAX_NUM_LAYERS ]; - Int m_refLayerId [ MAX_NUM_LAYERS ][MAX_NUM_LAYERS]; #endif @@ -606,13 +628,16 @@ #if H_MV - UInt getMaxNuhLayerId() { return m_maxNuhLayerId; } - Void setMaxNuhLayerId(UInt v) { m_maxNuhLayerId = v; } + UInt getVpsMaxLayerId() { return m_maxLayerId; } + Void setVpsMaxLayerId(UInt v) { m_maxLayerId = v; } + + UInt getVpsNumLayerSetsMinus1() { return m_vpsNumLayerSetsMinus1; } + Void setVpsNumLayerSetsMinus1(UInt v) { m_vpsNumLayerSetsMinus1 = v; } #else UInt getMaxNuhReservedZeroLayerId() { return m_maxNuhReservedZeroLayerId; } Void setMaxNuhReservedZeroLayerId(UInt v) { m_maxNuhReservedZeroLayerId = v; } -#endif UInt getMaxOpSets() { return m_numOpSets; } Void setMaxOpSets(UInt v) { m_numOpSets = v; } +#endif Bool getLayerIdIncludedFlag(UInt opsIdx, UInt id) { return m_layerIdIncludedFlag[opsIdx][id]; } Void setLayerIdIncludedFlag(Bool v, UInt opsIdx, UInt id) { m_layerIdIncludedFlag[opsIdx][id] = v; } @@ -652,20 +677,91 @@ Int getLayerIdInNuh( Int layerIdInVps ) { assert( m_layerIdInNuh[layerIdInVps] >= 0 ); return m_layerIdInNuh[layerIdInVps]; } + Bool nuhLayerIdIncluded( Int layerIdinNuh ) { return ( m_layerIdInVps[ layerIdinNuh ] > 0 ); } + + Void setDimensionId( Int layerIdInVps, Int scalIdx, Int val ) { m_dimensionId[layerIdInVps][scalIdx] = val; } + Int getDimensionId( Int layerIdInVps, Int scalIdx ) { return m_dimensionId[layerIdInVps][scalIdx]; } + + Void setDirectDependencyFlag( Int depLayeridInVps, Int refLayeridInVps, Bool val ) { m_directDependencyFlag[depLayeridInVps][refLayeridInVps] = val; } + Bool getDirectDependencyFlag( Int depLayeridInVps, Int refLayeridInVps ) { return m_directDependencyFlag[depLayeridInVps][refLayeridInVps]; } + + Void setMaxTidIlRefPicPlus1( Int layerIdInVps, Int val ) { m_maxTidIlRefPicPlus1[ layerIdInVps ] = val; } + Int getMaxTidIlRefPicPlus1( Int layerIdInVps ) { return m_maxTidIlRefPicPlus1[ layerIdInVps ]; } + + Void setVpsNumberLayerSetsMinus1( Int val ) { m_vpsNumberLayerSetsMinus1 = val; } + Int getVpsNumberLayerSetsMinus1( ) { return m_vpsNumberLayerSetsMinus1; } + + Void setVpsNumProfileTierLevelMinus1( Int val ) { m_vpsNumProfileTierLevelMinus1 = val; } + Int getVpsNumProfileTierLevelMinus1( ) { return m_vpsNumProfileTierLevelMinus1; } + + Void setVpsProfilePresentFlag( Int idx, Bool val ) { m_vpsProfilePresentFlag[idx] = val; } + Bool getVpsProfilePresentFlag( Int idx ) { return m_vpsProfilePresentFlag[idx]; } + + Void setProfileRefMinus1( Int profileTierLevelIdx, Int val ) { m_profileRefMinus1[ profileTierLevelIdx ] = val; } + Int getProfileRefMinus1( Int profileTierLevelIdx ) { return m_profileRefMinus1[ profileTierLevelIdx ]; } + + Void setMoreOutputLayerSetsThanDefaultFlag( Bool flag ) { m_moreOutputLayerSetsThanDefaultFlag = flag; } + Bool getMoreOutputLayerSetsThanDefaultFlag() { return m_moreOutputLayerSetsThanDefaultFlag; } + + Void setNumAddOutputLayerSetsMinus1( Int val ) { m_numAddOutputLayerSetsMinus1 = val; } + Int getNumAddOutputLayerSetsMinus1( ) { return m_numAddOutputLayerSetsMinus1; } + + Void setDefaultOneTargetOutputLayerFlag( Bool flag ) { m_defaultOneTargetOutputLayerFlag = flag; } + Bool getDefaultOneTargetOutputLayerFlag( ) { return m_defaultOneTargetOutputLayerFlag; } + + Void setOutputLayerSetIdxMinus1( Int outLayerSetIdx, Int val ) { m_outputLayerSetIdxMinus1[ outLayerSetIdx ] = val; } + Int getOutputLayerSetIdxMinus1( Int outLayerSetIdx ) { return m_outputLayerSetIdxMinus1[ outLayerSetIdx ]; } + + Void setOutputLayerFlag( Int outLayerSetIdx, Int i, Bool flag ) { m_outputLayerFlag[ outLayerSetIdx ][ i ] = flag; } + Bool getOutputLayerFlag( Int outLayerSetIdx, Int i ) { return m_outputLayerFlag[ outLayerSetIdx ][ i ]; } + + Void setProfileLevelTierIdx( Int outLayerSetIdx, Int val ) { m_profileLevelTierIdx[ outLayerSetIdx = val ]; } + Int getProfileLevelTierIdx( Int outLayerSetIdx ) { return m_profileLevelTierIdx[ outLayerSetIdx ]; } + + Void setMaxOneActiveRefLayerFlag( Bool flag) { m_maxOneActiveRefLayerFlag = flag; } + Bool getMaxOneActiveRefLayerFlag( ) { return m_maxOneActiveRefLayerFlag; } + + Void setDirectDepTypeLenMinus2( Int val) { m_directDepTypeLenMinus2 = val; } + Int getDirectDepTypeLenMinus2( ) { return m_directDepTypeLenMinus2; } + + Void setDirectDependencyType( Int depLayeridInVps, Int refLayeridInVps, Int val) { m_directDependencyType[ depLayeridInVps ][ refLayeridInVps ] = val; } + Int getDirectDependencyType( Int depLayeridInVps, Int refLayeridInVps) { return m_directDependencyType[ depLayeridInVps ][ refLayeridInVps ]; } + + + // VPS EXTENSION SEMANTICS VARIABLES Void setLayerIdInVps( Int layerIdInNuh, Int val ) { m_layerIdInVps[layerIdInNuh] = val; } Int getLayerIdInVps( Int layerIdInNuh ) { assert( m_layerIdInVps[layerIdInNuh] >= 0 ); return m_layerIdInVps[layerIdInNuh]; } - Bool nuhLayerIdIncluded( Int layerIdinNuh ) { return ( m_layerIdInVps[ layerIdinNuh ] > 0 ); } - - Void setDimensionId( Int layerIdInVps, Int scalIdx, Int val ) { m_dimensionId[layerIdInVps][scalIdx] = val; } - Int getDimensionId( Int layerIdInVps, Int scalIdx ) { return m_dimensionId[layerIdInVps][scalIdx]; } - Int getScalabilityId ( Int layerIdInVps, ScalabilityType scalType ); - Int getViewId ( Int layerIdInVps ) { return getScalabilityId( layerIdInVps, VIEW_ID ); } + + Void setRefLayers(); + + Int getNumDirectRefLayers( Int layerIdInVps ) { return m_numDirectRefLayers[ layerIdInVps ]; }; + Int getRefLayerId ( Int layerIdInVps, Int idx );; + + Int getNumSamplePredRefLayers( Int layerIdInVps ) { return m_numSamplePredRefLayers[layerIdInVps]; } + Bool getSamplePredEnabledFlag ( Int layerIdInVps, Int idx ) { return m_samplePredEnabledFlag [layerIdInVps][idx]; } + Int getSamplePredRefLayerId ( Int layerIdInVps, Int idx ) { return m_samplePredRefLayerId [layerIdInVps][idx]; } + + Int getNumMotionPredRefLayers( Int layerIdInVps ) { return m_numMotionPredRefLayers[layerIdInVps]; } + Bool getMotionPredEnabledFlag ( Int layerIdInVps, Int idx ) { return m_motionPredEnabledFlag [layerIdInVps][idx]; } + Int getMotionPredRefLayerId ( Int layerIdInVps, Int idx ) { return m_motionPredRefLayerId [layerIdInVps][idx]; } + + Bool checkVPSExtensionSyntax(); + Int scalTypeToScalIdx ( ScalabilityType scalType ); + + Int getProfileLevelTierIdxLen() { return xCeilLog2( getVpsNumProfileTierLevelMinus1() + 1 ); }; + Int getNumLayersInIdList ( Int lsIdx );; + + // inference + Int inferDimensionId ( Int i, Int j ); + Int inferLastDimsionIdLenMinus1(); + #if H_3D Void initViewIndex(); Int getViewIndex ( Int layerIdInVps ) { return m_viewIndex[ layerIdInVps ]; } Int getDepthId ( Int layerIdInVps ) { return getScalabilityId( layerIdInVps, DEPTH_ID ); } - Int getLayerIdInNuh( Int viewIndex, Bool depthFlag ); + Int getLayerIdInNuh( Int viewIndex, Bool depthFlag ); + #if H_3D_ARP UInt getUseAdvRP ( Int layerIdInVps ) { return m_uiUseAdvResPred[layerIdInVps]; } @@ -703,31 +799,6 @@ Void setIvMvScalingFlag ( Bool b ) { m_ivMvScalingFlag = b; } #endif -#endif - - Void setVpsProfilePresentFlag( Int layerSet, Bool val ) { m_vpsProfilePresentFlag[layerSet] = val; } - Bool getVpsProfilePresentFlag( Int layerSet ) { return m_vpsProfilePresentFlag[layerSet]; } - - Void setProfileLayerSetRefMinus1( Int layerSet, Int val ) { m_profileLayerSetRefMinus1[layerSet] = val; } - Bool getProfileLayerSetRefMinus1( Int layerSet ) { return m_profileLayerSetRefMinus1[layerSet]; } - - Void setNumOutputLayerSets( Int val ) { m_numOutputLayerSets = val; } - Int getNumOutputLayerSets() { return m_numOutputLayerSets; } - - Void setOutputLayerSetIdx( Int layerSet, Int val ) { m_outputLayerSetIdx[layerSet] = val; } - Int getOutputLayerSetIdx( Int layerSet ) { return m_outputLayerSetIdx[layerSet]; } - - Void setOutputLayerFlag( Int layerSet, Int layer, Bool val ) { m_outputLayerFlag[layerSet][layer] = val; } - Bool getOutputLayerFlag( Int layerSet, Int layer ) { return m_outputLayerFlag[layerSet][layer]; } - - Void setDirectDependencyFlag( Int layerHigh, Int layerLow, Bool val ) { m_directDependencyFlag[layerHigh][layerLow] = val; } - Bool getDirectDependencyFlag( Int layerHigh, Int layerLow ) { return m_directDependencyFlag[layerHigh][layerLow]; } - - Void calcIvRefLayers(); - - Int getNumDirectRefLayers( Int layerIdInVps ) { return m_numDirectRefLayers[ layerIdInVps ]; }; - Int getRefLayerId ( Int layerIdInVps, Int idx );; - - Bool checkVPSExtensionSyntax(); - Int scalTypeToScalIdx ( ScalabilityType scalType ); + +#endif #endif }; @@ -813,5 +884,7 @@ Int m_numTicksPocDiffOneMinus1; #endif - +#if H_MV + Bool m_tileBoundariesAlignedFlag; +#endif public: TComVUI() @@ -849,4 +922,7 @@ ,m_numTicksPocDiffOneMinus1(0) #endif +#if H_MV + ,m_tileBoundariesAlignedFlag(true) +#endif {} @@ -950,4 +1026,8 @@ Int getNumTicksPocDiffOneMinus1() {return m_numTicksPocDiffOneMinus1;} Void setNumTicksPocDiffOneMinus1(Int x) { m_numTicksPocDiffOneMinus1 = x;} +#endif +#if H_MV + Bool getTileBoundariesAlignedFlag( ) { return m_tileBoundariesAlignedFlag; } + Void setTileBoundariesAlignedFlag( Bool flag ) { m_tileBoundariesAlignedFlag = flag; } #endif }; @@ -1035,4 +1115,8 @@ #if H_MV Bool m_interViewMvVertConstraintFlag; + Int m_numIlpRestrictedRefLayers ; + Int m_minSpatialSegmentOffsetPlus1[MAX_NUM_LAYERS]; + Bool m_ctuBasedOffsetEnabledFlag [MAX_NUM_LAYERS]; + Int m_minHorizontalCtuOffsetPlus1 [MAX_NUM_LAYERS]; #endif #if H_3D @@ -1041,4 +1125,7 @@ Int m_aaiCodedScale [2][MAX_NUM_LAYERS]; Int m_aaiCodedOffset[2][MAX_NUM_LAYERS]; +#endif +#if H_MV + Int m_layerId; #endif public: @@ -1175,4 +1262,17 @@ Void setInterViewMvVertConstraintFlag(Bool val) { m_interViewMvVertConstraintFlag = val; } Bool getInterViewMvVertConstraintFlag() { return m_interViewMvVertConstraintFlag;} + + //// sps_extension_vui_parameters( ) + Void setNumIlpRestrictedRefLayers ( Int val ) { m_numIlpRestrictedRefLayers = val;} + Int getNumIlpRestrictedRefLayers ( ) { return m_numIlpRestrictedRefLayers ;} + + Void setMinSpatialSegmentOffsetPlus1( Int i, Int val ) { m_minSpatialSegmentOffsetPlus1[ i ] = val;} + Int getMinSpatialSegmentOffsetPlus1( Int i ) { return m_minSpatialSegmentOffsetPlus1[ i ];} + + Void setCtuBasedOffsetEnabledFlag ( Int i, Bool flag ) { m_ctuBasedOffsetEnabledFlag [ i ] = flag;} + Bool getCtuBasedOffsetEnabledFlag ( Int i ) { return m_ctuBasedOffsetEnabledFlag [ i ];} + + Void setMinHorizontalCtuOffsetPlus1 ( Int i, Int val ) { m_minHorizontalCtuOffsetPlus1 [ i ] = val;} + Int getMinHorizontalCtuOffsetPlus1 ( Int i ) { return m_minHorizontalCtuOffsetPlus1 [ i ];} #endif #if H_3D @@ -1185,4 +1285,9 @@ Int* getInvCodedOffset () { return m_aaiCodedOffset[1]; } #endif +#if H_MV + Int getLayerId () { return m_layerId; } + Void setLayerId ( Int val ) { m_layerId = val; } +#endif + }; @@ -1213,6 +1318,8 @@ #if H_MV // Why not an listIdx for all members, would avoid code duplication?? - Void setRefPicSetIdxL(UInt li, UInt idx, UInt refPicSetIdx) {( li==0 ? m_RefPicSetIdxL0[idx] : m_RefPicSetIdxL1[idx] ) = refPicSetIdx; }; - Void setRefPicListModificationFlagL(UInt li, Bool flag) { ( li==0 ? m_bRefPicListModificationFlagL0 : m_bRefPicListModificationFlagL1 ) = flag; }; + Void setRefPicSetIdxL(UInt li, UInt idx, UInt refPicSetIdx) {( li==0 ? m_RefPicSetIdxL0[idx] : m_RefPicSetIdxL1[idx] ) = refPicSetIdx; } + UInt getRefPicSetIdxL(UInt li, UInt idx ) { return ( li == 0 ) ? m_RefPicSetIdxL0[idx] : m_RefPicSetIdxL1[idx] ; } + Void setRefPicListModificationFlagL(UInt li, Bool flag) { ( li==0 ? m_bRefPicListModificationFlagL0 : m_bRefPicListModificationFlagL1 ) = flag; } + Bool getRefPicListModificationFlagL(UInt li ) { return ( li== 0) ? m_bRefPicListModificationFlagL0 : m_bRefPicListModificationFlagL1; } #endif }; @@ -1539,4 +1646,5 @@ Bool m_enableTMVPFlag; #if H_MV + std::vector* m_refPicSetInterLayer; Int m_layerId; Int m_viewId; @@ -1565,4 +1673,19 @@ #endif #endif +#if H_MV +// Additional slice header syntax elements + Bool m_discardableFlag; + Bool m_interLayerPredEnabledFlag; + Int m_numInterLayerRefPicsMinus1; + Int m_interLayerPredLayerIdc [MAX_NUM_LAYERS]; + Bool m_interLayerSamplePredOnlyFlag; + Bool m_altCollocatedIndicationFlag; + Int m_collocatedRefLayerIdx; +// Additional slice header semantics variables + Int m_numActiveMotionPredRefLayers; + Int m_activeMotionPredRefLayerId [ MAX_NUM_LAYER_IDS ]; + +#endif + public: TComSlice(); @@ -1757,4 +1880,5 @@ Void createAndApplyIvReferencePictureSet( TComPicLists* ivPicLists, std::vector& refPicSetInterLayer ); static Void markIvRefPicsAsShortTerm ( std::vector refPicSetInterLayer ); + static Void markCurrPic ( TComPic* currPic );; static Void markIvRefPicsAsUnused ( TComPicLists* ivPicLists, std::vector targetDecLayerIdSet, TComVPS* vps, Int curLayerId, Int curPoc ); @@ -1873,4 +1997,45 @@ #endif +#if H_MV +// Additional slice header syntax elements +Void setDiscardableFlag( Bool flag ) { m_discardableFlag = flag; } +Bool getDiscardableFlag( ) { return m_discardableFlag; } + +Void setInterLayerPredEnabledFlag( Bool flag ) { m_interLayerPredEnabledFlag = flag; } +Bool getInterLayerPredEnabledFlag( ) { return m_interLayerPredEnabledFlag; } + +Void setNumInterLayerRefPicsMinus1( Int val ) { m_numInterLayerRefPicsMinus1 = val; } +Int getNumInterLayerRefPicsMinus1( ) { return m_numInterLayerRefPicsMinus1; } + +Void setInterLayerPredLayerIdc( Int i, Int val ) { m_interLayerPredLayerIdc[i] = val; } +Int getInterLayerPredLayerIdc( Int i ) { return m_interLayerPredLayerIdc[i]; } + +Void setInterLayerSamplePredOnlyFlag( Bool flag ) { m_interLayerSamplePredOnlyFlag = flag; } +Bool getInterLayerSamplePredOnlyFlag( ) { return m_interLayerSamplePredOnlyFlag; } + +Void setAltCollocatedIndicationFlag( Bool flag ) { m_altCollocatedIndicationFlag = flag; } +Bool getAltCollocatedIndicationFlag( ) { return m_altCollocatedIndicationFlag; } + +Void setCollocatedRefLayerIdx( Int val ) { m_collocatedRefLayerIdx = val; } +Int getCollocatedRefLayerIdx( ) { return m_collocatedRefLayerIdx; } + +// Additional variables derived in slice header semantics +Int getNumInterLayerRefPicsMinus1Len( ) { return xCeilLog2( getVPS()->getNumDirectRefLayers( getLayerIdInVps() )); } +Int getInterLayerPredLayerIdcLen ( ) { return xCeilLog2( getVPS()->getNumDirectRefLayers( getLayerIdInVps() )); } + +Int getNumActiveRefLayerPics( ); +Int getRefPicLayerId ( Int i ); + +Void setActiveMotionPredRefLayers ( ); + +Int getNumActiveMotionPredRefLayers( ) { return m_numActiveMotionPredRefLayers; } +Int getActiveMotionPredRefLayerId ( Int i ) { return m_activeMotionPredRefLayerId[i]; } + +Bool getInterRefEnabledInRPLFlag( ); + +Void setRefPicSetInterLayer ( std::vector* m_refPicSetInterLayer ); +TComPic* getPicFromRefPicSetInterLayer( Int layerId ); + +#endif protected: @@ -1879,4 +2044,5 @@ TComPic* xGetLongTermRefPic(TComList& rcListPic, Int poc, Bool pocHasMsb); #if H_MV + Int xCeilLog2( Int val ); TComPic* xGetInterLayerRefPic( std::vector& rcListIlPic, Int layerId ); #endif Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h (revision 534) @@ -260,4 +260,7 @@ #if H_MV #define MAX_NUM_LAYERS 64 +#define MAX_VPS_PROFILE_TIER_LEVEL 64 +#define MAX_VPS_ADD_OUTPUT_LAYER_SETS 1024 +#define MAX_VPS_OUTPUTLAYER_SETS ( MAX_VPS_ADD_OUTPUT_LAYER_SETS + MAX_VPS_OP_SETS_PLUS1 ) #endif Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCAVLC.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCAVLC.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCAVLC.cpp (revision 534) @@ -456,4 +456,10 @@ { READ_FLAG( uiCode, "tiles_fixed_structure_flag"); pcVUI->setTilesFixedStructureFlag(uiCode); +#if H_MV + if ( pcSPS->getLayerId() > 0 ) + { + READ_FLAG( uiCode, "tile_boundaries_aligned_flag" ); pcVUI->setTileBoundariesAlignedFlag( uiCode == 1 ); + } +#endif READ_FLAG( uiCode, "motion_vectors_over_pic_boundaries_flag"); pcVUI->setMotionVectorsOverPicBoundariesFlag(uiCode); READ_FLAG( uiCode, "restricted_ref_pic_lists_flag"); pcVUI->setRestrictedRefPicListsFlag(uiCode); @@ -577,4 +583,8 @@ UInt uiCode; READ_CODE( 4, uiCode, "sps_video_parameter_set_id"); pcSPS->setVPSId ( uiCode ); +#if H_MV + if ( pcSPS->getLayerId() == 0 ) + { +#endif READ_CODE( 3, uiCode, "sps_max_sub_layers_minus1" ); pcSPS->setMaxTLayers ( uiCode+1 ); READ_FLAG( uiCode, "sps_temporal_id_nesting_flag" ); pcSPS->setTemporalIdNestingFlag ( uiCode > 0 ? true : false ); @@ -584,6 +594,8 @@ assert( uiCode == 1 ); } - parsePTL(pcSPS->getPTL(), 1, pcSPS->getMaxTLayers() - 1); +#if H_MV + } +#endif READ_UVLC( uiCode, "sps_seq_parameter_set_id" ); pcSPS->setSPSId( uiCode ); READ_UVLC( uiCode, "chroma_format_idc" ); pcSPS->setChromaFormatIdc( uiCode ); @@ -743,4 +755,24 @@ #else READ_FLAG( uiCode, "inter_view_mv_vert_constraint_flag" ); pcSPS->setInterViewMvVertConstraintFlag(uiCode == 1 ? true : false); + //// sps_extension_vui_parameters( ) + if( pcSPS->getVuiParameters()->getBitstreamRestrictionFlag() ) + { + READ_UVLC( uiCode, "num_ilp_restricted_ref_layers" ); pcSPS->setNumIlpRestrictedRefLayers( uiCode ); + for( Int i = 0; i < pcSPS->getNumIlpRestrictedRefLayers( ); i++ ) + { + READ_UVLC( uiCode, "min_spatial_segment_offset_plus1" ); pcSPS->setMinSpatialSegmentOffsetPlus1( i, uiCode ); + if( pcSPS->getMinSpatialSegmentOffsetPlus1( i ) > 0 ) + { + READ_FLAG( uiCode, "ctu_based_offset_enabled_flag[ i ]"); pcSPS->setCtuBasedOffsetEnabledFlag(i, uiCode == 1 ); + if( pcSPS->getCtuBasedOffsetEnabledFlag( i ) ) + { + READ_UVLC( uiCode, "min_horizontal_ctu_offset_plus1[ i ]"); pcSPS->setMinHorizontalCtuOffsetPlus1( i, uiCode ); + } + } + } + } + + //// sps_extension_vui_parameters( ) END + READ_UVLC( uiCode, "sps_shvc_reserved_zero_idc" ); READ_FLAG( uiCode, "sps_extension2_flag"); if ( uiCode ) @@ -752,4 +784,5 @@ } #else + UInt uiCamParPrecision = 0; Bool bCamParSlice = false; @@ -834,17 +867,19 @@ assert( pcVPS->getNumHrdParameters() < MAX_VPS_OP_SETS_PLUS1 ); #if H_MV - assert( pcVPS->getMaxNuhLayerId() < MAX_VPS_NUH_LAYER_ID_PLUS1 ); - READ_CODE( 6, uiCode, "vps_max_nuh_layer_id" ); pcVPS->setMaxNuhLayerId( uiCode ); + assert( pcVPS->getVpsMaxLayerId() < MAX_VPS_NUH_LAYER_ID_PLUS1 ); + READ_CODE( 6, uiCode, "vps_max_layer_id" ); pcVPS->setVpsMaxLayerId( uiCode ); + + READ_UVLC( uiCode, "vps_max_num_layer_sets_minus1" ); pcVPS->setVpsNumLayerSetsMinus1( uiCode ); + for( UInt opsIdx = 1; opsIdx <= pcVPS->getVpsNumLayerSetsMinus1(); opsIdx ++ ) + { + for( UInt i = 0; i <= pcVPS->getVpsMaxLayerId(); i ++ ) #else assert( pcVPS->getMaxNuhReservedZeroLayerId() < MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1 ); READ_CODE( 6, uiCode, "vps_max_nuh_reserved_zero_layer_id" ); pcVPS->setMaxNuhReservedZeroLayerId( uiCode ); -#endif + READ_UVLC( uiCode, "vps_max_op_sets_minus1" ); pcVPS->setMaxOpSets( uiCode + 1 ); for( UInt opsIdx = 1; opsIdx <= ( pcVPS->getMaxOpSets() - 1 ); opsIdx ++ ) { // Operation point set -#if H_MV - for( UInt i = 0; i <= pcVPS->getMaxNuhLayerId(); i ++ ) -#else for( UInt i = 0; i <= pcVPS->getMaxNuhReservedZeroLayerId(); i ++ ) #endif @@ -893,5 +928,4 @@ READ_FLAG( uiCode, "splitting_flag" ); pcVPS->setSplittingFlag( uiCode == 1 ? true : false ); - // Parse scalability_mask[i] for( Int sIdx = 0; sIdx < MAX_NUM_SCALABILITY_TYPES; sIdx++ ) { @@ -899,69 +933,42 @@ } - Int numScalabilityTypes = pcVPS->getNumScalabilityTypes(); - - // Parse dimension_id_len_minus1[j] - for( Int sIdx = 0; sIdx < numScalabilityTypes; sIdx++ ) + for( Int sIdx = 0; sIdx < pcVPS->getNumScalabilityTypes( ) - ( pcVPS->getSplittingFlag() ? 1 : 0 ); sIdx++ ) { READ_CODE( 3, uiCode, "dimension_id_len_minus1[j]" ); pcVPS->setDimensionIdLen( sIdx, uiCode + 1 ); } - // vps_nuh_layer_id_present_flag + if ( pcVPS->getSplittingFlag() ) + { + pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1, pcVPS->inferLastDimsionIdLenMinus1() ); + } + READ_FLAG( uiCode, "vps_nuh_layer_id_present_flag" ); pcVPS->setVpsNuhLayerIdPresentFlag( uiCode == 1 ? true : false ); - // parse layer_id_in_nuh[i] and derive LayerIdInVps - // already updated to JCT3V-D0220 - for( Int layer = 0; layer <= pcVPS->getMaxLayers() - 1; layer++ ) - { - UInt layerIdInNuh; - if ( pcVPS->getVpsNuhLayerIdPresentFlag() && ( layer != 0 ) ) - { - READ_CODE( 6, uiCode, "layer_id_in_nuh[i]" ); layerIdInNuh = uiCode; + for( Int i = 0; i <= pcVPS->getMaxLayers() - 1; i++ ) + { + if ( pcVPS->getVpsNuhLayerIdPresentFlag() && ( i > 0 ) ) + { + READ_CODE( 6, uiCode, "layer_id_in_nuh[i]" ); pcVPS->setLayerIdInNuh( i, uiCode ); } else { - layerIdInNuh = layer; - } - - pcVPS->setLayerIdInNuh( layer, layerIdInNuh ); - pcVPS->setLayerIdInVps( layerIdInNuh, layer ); - - // parse dimension_id[i][j] - for( Int sIdx = 0; sIdx < numScalabilityTypes; sIdx++ ) - { - READ_CODE( pcVPS->getDimensionIdLen( sIdx ), uiCode, "dimension_id[i][j]" ); pcVPS->setDimensionId( layer, sIdx, uiCode ); - } - } - - for( Int layerSet = 1; layerSet <= pcVPS->getMaxOpSets() - 1; layerSet++ ) - { - READ_FLAG( uiCode, "vps_profile_present_flag[lsIdx]" ); pcVPS->setVpsProfilePresentFlag( layerSet, uiCode == 1 ? true : false ); - if( pcVPS->getVpsProfilePresentFlag( layerSet ) == false ) - { - READ_UVLC( uiCode, "profile_layer_set_ref_minus1[lsIdx]" ); pcVPS->setProfileLayerSetRefMinus1( layerSet, uiCode ); - } - - parsePTL ( pcVPS->getPTL( layerSet ), pcVPS->getVpsProfilePresentFlag( layerSet ), pcVPS->getMaxTLayers()-1); - if( pcVPS->getVpsProfilePresentFlag( layerSet ) == false ) - { - TComPTL temp = *pcVPS->getPTL( layerSet ); - *pcVPS->getPTL( layerSet ) = *pcVPS->getPTL( pcVPS->getProfileLayerSetRefMinus1( layerSet ) + 1 ); - pcVPS->getPTL( layerSet )->copyLevelFrom( &temp ); - } - } - - READ_UVLC( uiCode, "num_output_layer_sets" ); pcVPS->setNumOutputLayerSets( uiCode ); + pcVPS->setLayerIdInNuh( i, i );; + } + + pcVPS->setLayerIdInVps( pcVPS->getLayerIdInNuh( i ), i ); - for( Int layerSet = 0; layerSet < pcVPS->getNumOutputLayerSets(); layerSet++ ) - { - READ_UVLC( uiCode, "output_layer_set_idx[i]" ); pcVPS->setOutputLayerSetIdx( layerSet, uiCode ); - for( Int layer = 0; layer <= pcVPS->getMaxNuhLayerId(); layer++ ) - { - if( pcVPS->getLayerIdIncludedFlag( pcVPS->getOutputLayerSetIdx( layerSet ), layer ) == true ) - { - READ_FLAG( uiCode, "output_layer_flag" ); pcVPS->setOutputLayerFlag( layerSet, layer, uiCode == 1 ? true : false ); - } - } - } + for( Int j = 0; j < pcVPS->getNumScalabilityTypes() ; j++ ) + { + if ( !pcVPS->getSplittingFlag() ) + { + READ_CODE( pcVPS->getDimensionIdLen( j ), uiCode, "dimension_id[i][j]" ); pcVPS->setDimensionId( i, j, uiCode ); + } + else + { + pcVPS->setDimensionId( i, j, pcVPS->inferDimensionId( i, j) ); + } + } + } + for( Int i = 1; i <= pcVPS->getMaxLayers() - 1; i++ ) @@ -972,9 +979,80 @@ } } - + + for( Int i = 0; i < pcVPS->getMaxLayers() - 1; i++ ) + { + READ_CODE( 3, uiCode, "max_tid_il_ref_pics_plus1[i]" ); pcVPS->setMaxTidIlRefPicPlus1( i , uiCode ); + } + + READ_CODE( 10, uiCode, "vps_number_layer_sets_minus1" ); pcVPS->setVpsNumberLayerSetsMinus1 ( uiCode ); + READ_CODE( 6, uiCode, "vps_num_profile_tier_level_minus1" ); pcVPS->setVpsNumProfileTierLevelMinus1( uiCode ); + + for( Int i = 1; i <= pcVPS->getVpsNumProfileTierLevelMinus1(); i++ ) + { + READ_FLAG( uiCode, "vps_profile_present_flag[i]" ); pcVPS->setVpsProfilePresentFlag( i, uiCode == 1 ); + if( !pcVPS->getVpsProfilePresentFlag( i ) ) + { + READ_CODE( 6, uiCode, "profile_ref_minus1[i]" ); pcVPS->setProfileRefMinus1( i, uiCode ); + } + parsePTL ( pcVPS->getPTL( i ), pcVPS->getVpsProfilePresentFlag( i ), pcVPS->getMaxTLayers()-1); + if( !pcVPS->getVpsProfilePresentFlag( i ) ) + { + TComPTL temp = *pcVPS->getPTL( i ); + *pcVPS->getPTL( i ) = *pcVPS->getPTL( pcVPS->getProfileRefMinus1( i ) + 1 ); + pcVPS->getPTL( i )->copyLevelFrom( &temp ); + } + } + + Int numOutputLayerSets = pcVPS->getVpsNumberLayerSetsMinus1( ) + 1; + + READ_FLAG( uiCode, "more_output_layer_sets_than_default_flag" ); pcVPS->setMoreOutputLayerSetsThanDefaultFlag( uiCode == 1 ); + + if ( pcVPS->getMoreOutputLayerSetsThanDefaultFlag( ) ) + { + READ_CODE( 10, uiCode, "num_add_output_layer_sets_minus1" ); pcVPS->setNumAddOutputLayerSetsMinus1( uiCode ); + numOutputLayerSets += ( pcVPS->getNumAddOutputLayerSetsMinus1( ) + 1); + } + + if( numOutputLayerSets > 1) + { + READ_FLAG( uiCode, "default_one_target_output_layer_flag" ); pcVPS->setDefaultOneTargetOutputLayerFlag( uiCode == 1); + } + + for( Int i = 1; i < numOutputLayerSets; i++ ) + { + if( i > pcVPS->getVpsNumberLayerSetsMinus1( ) ) + { + READ_UVLC( uiCode, "output_layer_set_idx_minus1[i]" ); pcVPS->setOutputLayerSetIdxMinus1( i, uiCode ); + for( Int j = 0; j < pcVPS->getNumLayersInIdList( j ) - 1; j++ ) + { + READ_FLAG( uiCode, "output_layer_flag" ); pcVPS->setOutputLayerFlag( i, j, uiCode == 1 ); + } + } + if ( pcVPS->getProfileLevelTierIdxLen() > 0 ) + { + READ_CODE( pcVPS->getProfileLevelTierIdxLen(), uiCode,"profile_level_tier_idx[ i ]" ); pcVPS->setProfileLevelTierIdx( i , uiCode ); + } + } + + READ_FLAG( uiCode , "max_one_active_ref_layer_flag" ); pcVPS->setMaxOneActiveRefLayerFlag( uiCode == 1 ); + READ_UVLC( uiCode, "direct_dep_type_len_minus2"); pcVPS->setDirectDepTypeLenMinus2 ( uiCode ); + + for( Int i = 1; i <= pcVPS->getMaxLayers() - 1; i++ ) + { + for( Int j = 0; j < i; j++ ) + { + if (pcVPS->getDirectDependencyFlag( i, j) ) + { + READ_CODE( pcVPS->getDirectDepTypeLenMinus2( ) + 2, uiCode, "direct_dependency_type[i][j]" ); pcVPS->setDirectDependencyType( i, j , uiCode); + } + } + } + + READ_FLAG ( uiCode, "vps_shvc_reserved_zero_flag" ); + +#if H_3D READ_FLAG( uiCode, "vps_extension2_flag" ); if (uiCode) { -#if H_3D m_pcBitstream->readOutTrailingBits(); @@ -1039,9 +1117,4 @@ } READ_FLAG( uiCode, "iv_mv_scaling_flag"); pcVPS->setIvMvScalingFlag( uiCode == 1 ? true : false ); -#else - while ( xMoreRbspData() ) - { - READ_FLAG( uiCode, "vps_extension2_data_flag"); - } #endif } @@ -1049,5 +1122,5 @@ pcVPS->checkVPSExtensionSyntax(); - pcVPS->calcIvRefLayers(); + pcVPS->setRefLayers(); #else @@ -1147,5 +1220,14 @@ if(!rpcSlice->getDependentSliceSegmentFlag()) { +#if H_MV + if ( rpcSlice->getPPS()->getNumExtraSliceHeaderBits() > 0 ) + { + READ_FLAG( uiCode, "discardable_flag" ); rpcSlice->setDiscardableFlag( uiCode == 1 ); + } + + for (Int i = 1; i < rpcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++) +#else for (Int i = 0; i < rpcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++) +#endif { READ_FLAG(uiCode, "slice_reserved_undetermined_flag[]"); // ignored @@ -1175,4 +1257,7 @@ rps->setNumberOfPictures(0); rpcSlice->setRPS(rps); +#if H_MV + rpcSlice->setEnableTMVPFlag(false); +#endif } else @@ -1332,4 +1417,30 @@ } } +#if H_MV + Int layerIdInVps = rpcSlice->getLayerIdInVps(); + if( rpcSlice->getLayerId() > 0 && vps->getNumDirectRefLayers( layerIdInVps ) > 0 ) + { + READ_FLAG( uiCode, "inter_layer_pred_enabled_flag" ); rpcSlice->setInterLayerPredEnabledFlag( uiCode == 1 ); + if( rpcSlice->getInterLayerPredEnabledFlag() && vps->getNumDirectRefLayers( layerIdInVps ) > 1 ) + { + if( !vps->getMaxOneActiveRefLayerFlag()) + { + READ_CODE( rpcSlice->getNumInterLayerRefPicsMinus1Len( ), uiCode, "num_inter_layer_ref_pics_minus1" ); rpcSlice->setNumInterLayerRefPicsMinus1( uiCode ); + } + for( Int i = 0; i < rpcSlice->getNumActiveRefLayerPics(); i++ ) + { + READ_CODE( rpcSlice->getInterLayerPredLayerIdcLen( ), uiCode, "inter_layer_pred_layer_idc" ); rpcSlice->setInterLayerPredLayerIdc( i, uiCode ); + } + } + } + + rpcSlice->setActiveMotionPredRefLayers( ); + + if( vps->getNumSamplePredRefLayers( layerIdInVps ) > 0 && rpcSlice->getNumActiveRefLayerPics() > 0 ) + { + READ_FLAG( uiCode, "inter_layer_sample_pred_only_flag" ); rpcSlice->setInterLayerSamplePredOnlyFlag( uiCode == 1 ); + } + +#endif if(sps->getUseSAO()) { @@ -1472,4 +1583,17 @@ if ( rpcSlice->getEnableTMVPFlag() ) { +#if H_MV + if( rpcSlice->getLayerId() > 0 && rpcSlice->getNumActiveMotionPredRefLayers() > 0 ) + { + READ_FLAG( uiCode, "alt_collocated_indication_flag" ); rpcSlice->setAltCollocatedIndicationFlag( uiCode == 1 ); + } + + if( rpcSlice->getAltCollocatedIndicationFlag() && rpcSlice->getNumActiveMotionPredRefLayers() > 1 ) + { + READ_UVLC( uiCode, "collocated_ref_layer_idx" ); rpcSlice->setCollocatedRefLayerIdx( uiCode ); + } + else + { +#endif if ( rpcSlice->getSliceType() == B_SLICE ) { @@ -1493,4 +1617,7 @@ rpcSlice->setColRefIdx(0); } +#if H_MV + } +#endif } if ( (pps->getUseWP() && rpcSlice->getSliceType()==P_SLICE) || (pps->getWPBiPred() && rpcSlice->getSliceType()==B_SLICE) ) Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.cpp (revision 534) @@ -52,7 +52,4 @@ m_aaiCodedScale = new Int* [ MAX_NUM_LAYERS ]; m_aiViewId = new Int [ MAX_NUM_LAYERS ]; -#if !H_3D_FIX - m_aiLayerIdx = new Int [ MAX_NUM_LAYERS ]; -#endif m_bViewReceived = new Bool [ MAX_NUM_LAYERS ]; @@ -520,4 +517,5 @@ #if H_MV TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer ); + TComSlice::markCurrPic( pcPic ); TComSlice::markIvRefPicsAsUnused ( m_ivPicLists, targetDecLayerIdSet, m_parameterSetManagerDecoder.getActiveVPS(), m_layerId, poc ); #endif @@ -675,4 +673,5 @@ #if H_MV + m_apcSlicePilot->setRefPicSetInterLayer( & m_refPicSetInterLayer ); m_apcSlicePilot->setLayerId( nalu.m_layerId ); #endif @@ -1036,4 +1035,7 @@ { TComSPS* sps = new TComSPS(); +#if H_MV + sps->setLayerId( getLayerId() ); +#endif #if H_3D // Preliminary fix. assuming that all sps refer to the same SPS. 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 Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibExtractor/TExtrTop.cpp =================================================================== --- branches/HTM-DEV-0.3-dev2/source/Lib/TLibExtractor/TExtrTop.cpp (revision 533) +++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibExtractor/TExtrTop.cpp (revision 534) @@ -101,5 +101,5 @@ { rcVpsInfoHandle << "MaxLayers = " << m_cVPS.getMaxLayers() << std::endl; - rcVpsInfoHandle << "MaxNuhLayerId = " << m_cVPS.getMaxNuhLayerId() << std::endl; + rcVpsInfoHandle << "MaxNuhLayerId = " << m_cVPS.getVpsMaxLayerId() << std::endl; for ( Int layerIdxInVps = 0; layerIdxInVps < m_cVPS.getMaxLayers(); layerIdxInVps++ )