Ignore:
Timestamp:
13 Jul 2013, 10:26:41 (11 years ago)
Author:
tech
Message:

MergeMerged tags/HTM-DEV-1.0.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp

    r532 r534  
    215215#endif
    216216#if H_MV
    217   in>>entry.m_numInterViewRefPics;
    218   for( Int i = 0; i < entry.m_numInterViewRefPics; i++ )
    219   {
    220     in>>entry.m_interViewRefs[i];
    221   }
    222   for( Int i = 0; i < entry.m_numInterViewRefPics; i++ )
     217  in>>entry.m_numActiveRefLayerPics;
     218  for( Int i = 0; i < entry.m_numActiveRefLayerPics; i++ )
     219  {
     220    in>>entry.m_interLayerPredLayerIdc[i];
     221  }
     222  for( Int i = 0; i < entry.m_numActiveRefLayerPics; i++ )
    223223  {
    224224    in>>entry.m_interViewRefPosL[0][i];
    225225  }
    226   for( Int i = 0; i < entry.m_numInterViewRefPics; i++ )
     226  for( Int i = 0; i < entry.m_numActiveRefLayerPics; i++ )
    227227  {
    228228    in>>entry.m_interViewRefPosL[1][i];
     229  }
     230  if (entry.m_numActiveRefLayerPics > 0 )
     231  {
     232    in>>entry.m_collocatedRefLayerIdx;
    229233  }
    230234#endif
    … …  
    398402  ("LayerIdInNuh",          m_layerIdInNuh       , std::vector<Int>(1,0), "LayerId in Nuh")
    399403  ("SplittingFlag",         m_splittingFlag      , false                , "Splitting Flag")   
     404
     405  // Layer Sets + Output Layer Sets + Profile Tier Level
     406  ("VpsNumLayerSets",       m_vpsNumLayerSets    , 1                    , "Number of layer sets")   
     407  ("LayerIdsInSet_%d",      m_layerIdsInSets     , std::vector<Int>(1,0), MAX_VPS_OP_SETS_PLUS1 ,"LayerIds of Layer set") 
     408  ("DefaultOneTargetOutputLayerFlag", m_defaultOneTargetOutputLayerFlag,  false , "Output highest layer of layer sets by default")     
     409  ("OutputLayerSetIdx",     m_outputLayerSetIdx  , std::vector<Int>(0,0), "Indices of layer sets used as additional output layer sets") 
     410  ("LayerIdsInAddOutputLayerSet_%d", m_layerIdsInAddOutputLayerSet      , std::vector<Int>(1,0), MAX_VPS_ADD_OUTPUT_LAYER_SETS, "LayerIds of additional output layers") 
     411  ("ProfileLevelTierIdx",   m_profileLevelTierIdx, std::vector<Int>(1,0), "Indices to profile level tier")
     412 
     413  // Layer dependencies
     414  ("DirectRefLayers_%d",    m_directRefLayers    , std::vector<Int>(0,0), MAX_NUM_LAYERS, "LayerIds of direct reference layers")
     415  ("DependencyTypes_%d",    m_dependencyTypes    , std::vector<Int>(0,0), MAX_NUM_LAYERS, "Dependency types of direct reference layers, 0: Sample 1: Motion 2: Sample+Motion")
    400416#endif
    401417  ("SourceWidth,-wdt",      m_iSourceWidth,        0, "Source picture width")
    … …  
    756772        cOSS<<"Frame"<<i;
    757773        opts.addOptions()( cOSS.str(), m_GOPListMvc[k][i-1], GOPEntry() );
     774        if ( i != 1 )
     775        {
     776          opts.opt_list.back()->opt->opt_duplicate = true;
     777        }       
    758778      }
    759779    }
    … …  
    762782      std::ostringstream cOSS1;
    763783      cOSS1<<"FrameI"<<"_l"<<k;
     784
    764785      opts.addOptions()(cOSS1.str(), m_GOPListMvc[k][MAX_GOP], GOPEntry());
     786      if ( k > 1 )
     787      {
     788        opts.opt_list.back()->opt->opt_duplicate = true;
     789      }       
     790
    765791
    766792      for( Int i = 1; i < MAX_GOP + 1; i++ )
    … …  
    769795        cOSS2<<"Frame"<<i<<"_l"<<k;
    770796        opts.addOptions()(cOSS2.str(), m_GOPListMvc[k][i-1], GOPEntry());
     797        if ( i != 1 || k > 0 )
     798        {
     799          opts.opt_list.back()->opt->opt_duplicate = true;
     800        }       
    771801      }
    772802    }
    … …  
    13111341#endif
    13121342
    1313   xConfirmPara(  m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. "   );
    1314 
    1315  for( Int dim = 0; dim < m_dimIds.size(); dim++ )
     1343  xConfirmPara(  m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. "   );   Int dimBitOffset[MAX_NUM_SCALABILITY_TYPES+1];
     1344
     1345  dimBitOffset[ 0 ] = 0;
     1346  for (Int j = 1; j <= ((Int) m_dimIds.size() - m_splittingFlag ? 1 : 0); j++ )
    13161347 {
    1317    xConfirmPara( m_dimIds[dim].size() < m_numberOfLayers,  "DimensionId must be given for all layers and all dimensions. ");   
    1318    xConfirmPara( ( dim != viewDimPosition ) &&  (m_dimIds[dim][0] != 0), "DimensionId of layer 0 must be 0. " );
    1319    xConfirmPara( m_dimensionIdLen[dim] < 1 || m_dimensionIdLen[dim] > 8, "DimensionIdLen must be greater than 0 and less than 9 in all dimensions. " );
     1348    dimBitOffset[ j ] = dimBitOffset[ j - 1 ] + m_dimensionIdLen[ j - 1];
     1349  }
     1350
     1351  if ( m_splittingFlag )
     1352  {
     1353    dimBitOffset[ (Int) m_dimIds.size() ] = 6;
     1354  }
     1355 
     1356  for( Int j = 0; j < m_dimIds.size(); j++ )
     1357  {   
     1358    xConfirmPara( m_dimIds[j].size() < m_numberOfLayers,  "DimensionId must be given for all layers and all dimensions. ");   
     1359    xConfirmPara( ( j != viewDimPosition ) &&  (m_dimIds[j][0] != 0), "DimensionId of layer 0 must be 0. " );
     1360    xConfirmPara( m_dimensionIdLen[j] < 1 || m_dimensionIdLen[j] > 8, "DimensionIdLen must be greater than 0 and less than 9 in all dimensions. " );
     1361     
     1362
    13201363   for( Int i = 1; i < m_numberOfLayers; i++ )
    13211364   {     
    1322      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. " );
     1365      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. " );
     1366      if ( m_splittingFlag )
     1367      {
     1368        Int layerIdInNuh = (m_layerIdInNuh.size()!=1) ? m_layerIdInNuh[i] :  i;
     1369        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. ");
     1370      }
    13231371   }
    13241372 }
    … …  
    13611409 }
    13621410
     1411  /// Layer sets
     1412  xConfirmPara( m_vpsNumLayerSets < 0 || m_vpsNumLayerSets > 1024, "VpsNumLayerSets must be greater than 0 and less than 1025") ;
     1413  for( Int lsIdx = 0; lsIdx < m_vpsNumLayerSets; lsIdx++ )
     1414  {
     1415    if (lsIdx == 0)
     1416    {
     1417      xConfirmPara( m_layerIdsInSets[lsIdx].size() != 1 || m_layerIdsInSets[lsIdx][0] != 0 , "0-th layer shall only include layer 0. ");
     1418    }
     1419    for ( Int i = 0; i < m_layerIdsInSets[lsIdx].size(); i++ )
     1420    {
     1421      xConfirmPara( m_layerIdsInSets[lsIdx][i] < 0 || m_layerIdsInSets[lsIdx].size() >= MAX_NUM_LAYER_IDS, "LayerIdsInSet must be greater than and less than 64" );
     1422    }
     1423  }
     1424
     1425  // Output layer sets
     1426  xConfirmPara( m_outputLayerSetIdx.size() > 1024, "The number of output layer set indices must be less than 1025.") ;
     1427  for (Int lsIdx = 0; lsIdx < m_outputLayerSetIdx.size(); lsIdx++)
     1428  {   
     1429    Int refLayerSetIdx = m_outputLayerSetIdx[ lsIdx ];
     1430    xConfirmPara(  refLayerSetIdx < 0 || refLayerSetIdx >= m_vpsNumLayerSets, "Output layer set idx must be greater or equal to 0 and less than the VpsNumLayerSets." );
     1431
     1432    for (Int i = 0; i < m_layerIdsInAddOutputLayerSet[ lsIdx ].size(); i++)
     1433    {
     1434      Bool isAlsoInLayerSet = false;
     1435      for (Int j = 0; j < m_layerIdsInSets[ refLayerSetIdx ].size(); j++ )
     1436      {
     1437        if ( m_layerIdsInSets[ refLayerSetIdx ][ j ] == m_layerIdsInAddOutputLayerSet[ lsIdx ][ i ] )
     1438        {
     1439          isAlsoInLayerSet = true;
     1440          break;
     1441        }       
     1442      }
     1443      xConfirmPara( !isAlsoInLayerSet, "All output layers of a output layer set be included in corresponding layer set.");
     1444    }
     1445  }
     1446  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" );
     1447
     1448  // Layer Dependencies 
     1449  for (Int i = 0; i < m_numberOfLayers; i++ )
     1450  {
     1451    xConfirmPara( (i == 0)  && m_directRefLayers[0].size() != 0, "Layer 0 shall not have reference layers." );
     1452    xConfirmPara( m_directRefLayers[i].size() != m_dependencyTypes[ i ].size(), "Each reference layer shall have a reference type." );
     1453    for (Int j = 0; j < m_directRefLayers[i].size(); j++)
     1454    {
     1455      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");
     1456      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");
     1457    }       
     1458  } 
    13631459#endif
    13641460  xConfirmPara( m_iGOPSize < 1 ,                                                            "GOP Size must be greater or equal to 1" );
    … …  
    15181614  for( Int i = 0; i < MAX_GOP; i++ )
    15191615  {
    1520     if( m_GOPListMvc[0][i].m_numInterViewRefPics != 0 )
     1616    if( m_GOPListMvc[0][i].m_numActiveRefLayerPics != 0 )
    15211617    {
    15221618      printf( "\nError: Frame%d inter_layer refs not available in layer 0\n", i );
    … …  
    15301626  if( m_numberOfLayers > 1 )
    15311627  {
    1532     for( Int k = 1; k < m_numberOfLayers; k++ )
     1628    for( Int layer = 1; layer < m_numberOfLayers; layer++ )
    15331629    {
    15341630      for( Int i = 0; i < MAX_GOP+1; i++ )
    15351631      {
    1536         for( Int j = 0; j < m_GOPListMvc[k][i].m_numInterViewRefPics; j++ )
     1632        GOPEntry gopEntry = m_GOPListMvc[layer][i]; 
     1633        for( Int j = 0; j < gopEntry.m_numActiveRefLayerPics; j++ )
    15371634        {
    1538           Int iAbsViewId = m_GOPListMvc[k][i].m_interViewRefs[j] + k;
    1539           if( iAbsViewId < 0 || iAbsViewId >= k )
     1635          Int ilPredLayerIdc = gopEntry.m_interLayerPredLayerIdc[j];
     1636          if( ilPredLayerIdc < 0 || ilPredLayerIdc >= m_directRefLayers[layer].size() )
    15401637          {
    1541             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 );
     1638            printf( "\nError: inter-layer ref idc %d is not available for Frame%d_l%d\n", gopEntry.m_interLayerPredLayerIdc[j], i, layer );
    15421639            bErrorIvpEnhV = true;
    15431640          }
    1544           if( m_GOPListMvc[k][i].m_interViewRefPosL[0][j] < -1 || m_GOPListMvc[k][i].m_interViewRefPosL[0][j] > m_GOPListMvc[k][i].m_numRefPicsActive )
     1641          if( gopEntry.m_interViewRefPosL[0][j] < -1 || gopEntry.m_interViewRefPosL[0][j] > gopEntry.m_numRefPicsActive )
    15451642          {
    1546             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 );
     1643            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 );
    15471644            bErrorIvpEnhV = true;
    15481645          }
    1549           if( m_GOPListMvc[k][i].m_interViewRefPosL[1][j] < -1  || m_GOPListMvc[k][i].m_interViewRefPosL[1][j] > m_GOPListMvc[k][i].m_numRefPicsActive )
     1646          if( gopEntry.m_interViewRefPosL[1][j] < -1  || gopEntry.m_interViewRefPosL[1][j] > gopEntry.m_numRefPicsActive )
    15501647          {
    1551             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 );
     1648            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 );
    15521649            bErrorIvpEnhV = true;
    15531650          }
    … …  
    15551652        if( i == MAX_GOP ) // inter-view refs at I pic position in base view
    15561653        {
    1557           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' )
     1654          if( gopEntry.m_sliceType != 'B' && gopEntry.m_sliceType != 'P' && gopEntry.m_sliceType != 'I' )
    15581655          {
    1559             printf( "\nError: slice type of FrameI_l%d must be equal to B or P or I\n", k );
     1656            printf( "\nError: slice type of FrameI_l%d must be equal to B or P or I\n", layer );
    15601657            bErrorIvpEnhV = true;
    15611658          }
    15621659
    1563           if( m_GOPListMvc[k][MAX_GOP].m_POC != 0 )
     1660          if( gopEntry.m_POC != 0 )
    15641661          {
    1565             printf( "\nError: POC %d not possible for FrameI_l%d, must be 0\n", m_GOPListMvc[k][MAX_GOP].m_POC, k );
     1662            printf( "\nError: POC %d not possible for FrameI_l%d, must be 0\n", gopEntry.m_POC, layer );
    15661663            bErrorIvpEnhV = true;
    15671664          }
    15681665
    1569           if( m_GOPListMvc[k][MAX_GOP].m_temporalId != 0 )
     1666          if( gopEntry.m_temporalId != 0 )
    15701667          {
    1571             printf( "\nWarning: Temporal id of FrameI_l%d must be 0 (cp. I-frame in base layer)\n", k );
    1572             m_GOPListMvc[k][MAX_GOP].m_temporalId = 0;
     1668            printf( "\nWarning: Temporal id of FrameI_l%d must be 0 (cp. I-frame in base layer)\n", layer );
     1669            gopEntry.m_temporalId = 0;
    15731670          }
    15741671
    1575           if( m_GOPListMvc[k][MAX_GOP].m_numRefPics != 0 )
     1672          if( gopEntry.m_numRefPics != 0 )
    15761673          {
    1577             printf( "\nWarning: temporal references not possible for FrameI_l%d\n", k );
    1578             for( Int j = 0; j < m_GOPListMvc[k][MAX_GOP].m_numRefPics; j++ )
     1674            printf( "\nWarning: temporal references not possible for FrameI_l%d\n", layer );
     1675            for( Int j = 0; j < m_GOPListMvc[layer][MAX_GOP].m_numRefPics; j++ )
    15791676            {
    1580               m_GOPListMvc[k][MAX_GOP].m_referencePics[j] = 0;
     1677              gopEntry.m_referencePics[j] = 0;
    15811678            }
    1582             m_GOPListMvc[k][MAX_GOP].m_numRefPics = 0;
     1679            gopEntry.m_numRefPics = 0;
    15831680          }
    15841681
    1585           if( m_GOPListMvc[k][MAX_GOP].m_interRPSPrediction )
     1682          if( gopEntry.m_interRPSPrediction )
    15861683          {
    1587             printf( "\nError: inter RPS prediction not possible for FrameI_l%d, must be 0\n", k );
     1684            printf( "\nError: inter RPS prediction not possible for FrameI_l%d, must be 0\n", layer );
    15881685            bErrorIvpEnhV = true;
    15891686          }
    15901687
    1591           if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'I' && m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics != 0 )
     1688          if( gopEntry.m_sliceType == 'I' && gopEntry.m_numActiveRefLayerPics != 0 )
    15921689          {
    1593             printf( "\nError: inter-layer prediction not possible for FrameI_l%d with slice type I, #IL_ref_pics must be 0\n", k );
     1690            printf( "\nError: inter-layer prediction not possible for FrameI_l%d with slice type I, #IL_ref_pics must be 0\n", layer );
    15941691            bErrorIvpEnhV = true;
    15951692          }
    15961693
    1597           if( m_GOPListMvc[k][MAX_GOP].m_numRefPicsActive > m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics )
     1694          if( gopEntry.m_numRefPicsActive > gopEntry.m_numActiveRefLayerPics )
    15981695          {
    1599             m_GOPListMvc[k][MAX_GOP].m_numRefPicsActive = m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics;
     1696            gopEntry.m_numRefPicsActive = gopEntry.m_numActiveRefLayerPics;
    16001697          }
    16011698
    1602           if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'P' )
     1699          if( gopEntry.m_sliceType == 'P' )
    16031700          {
    1604             if( m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics < 1 )
     1701            if( gopEntry.m_numActiveRefLayerPics < 1 )
    16051702            {
    1606               printf( "\nError: #IL_ref_pics must be at least one for FrameI_l%d with slice type P\n", k );
     1703              printf( "\nError: #IL_ref_pics must be at least one for FrameI_l%d with slice type P\n", layer );
    16071704              bErrorIvpEnhV = true;
    16081705            }
    16091706            else
    16101707            {
    1611               for( Int j = 0; j < m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics; j++ )
     1708              for( Int j = 0; j < gopEntry.m_numActiveRefLayerPics; j++ )
    16121709              {
    1613                 if( m_GOPListMvc[k][MAX_GOP].m_interViewRefPosL[1][j] != -1 )
     1710                if( gopEntry.m_interViewRefPosL[1][j] != -1 )
    16141711                {
    1615                   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 );
     1712                  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 );
    16161713                  bErrorIvpEnhV = true;
    16171714                }
    … …  
    16201717          }
    16211718
    1622           if( m_GOPListMvc[k][MAX_GOP].m_sliceType == 'B' && m_GOPListMvc[k][MAX_GOP].m_numInterViewRefPics < 1 )
     1719          if( gopEntry.m_sliceType == 'B' && gopEntry.m_numActiveRefLayerPics < 1 )
    16231720          {
    1624             printf( "\nError: #IL_ref_pics must be at least one for FrameI_l%d with slice type B\n", k );
     1721            printf( "\nError: #IL_ref_pics must be at least one for FrameI_l%d with slice type B\n", layer );
    16251722            bErrorIvpEnhV = true;
    16261723          }
Note: See TracChangeset for help on using the changeset viewer.