Changeset 1044 in SHVCSoftware for branches/SHM-dev/source/App


Ignore:
Timestamp:
3 Mar 2015, 02:46:08 (10 years ago)
Author:
interdigital
Message:
  1. change MAX_VPS_LAYER_ID_PLUS1 to MAX_VPS_LAYER_IDX_PLUS1
  2. change layerId to layerIdx whenever layer index is used
  3. replace mistakenly used layer ID with layer index
Location:
branches/SHM-dev/source/App/TAppDecoder
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp

    r1029 r1044  
    195195    // Decoded layer YUV files
    196196#if FIX_CONF_MODE
    197     for(Int layer= 0; layer < MAX_VPS_LAYER_ID_PLUS1; layer++ )
     197    for(Int layer= 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++ )
    198198#else
    199199    for(UInt layer=0; layer<= m_tgtLayerId; layer++)
    … …  
    210210#endif
    211211#if FIX_CONF_MODE
    212   for(Int layer = 0; layer < MAX_VPS_LAYER_ID_PLUS1; layer++ )
     212  for(Int layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++ )
    213213  {
    214214#else

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r1033 r1044  
    8989#if SVC_EXTENSION
    9090#if FIX_CONF_MODE
    91   for(Int i = 0; i < MAX_VPS_LAYER_ID_PLUS1; i++ )
     91  for(Int i = 0; i < MAX_VPS_LAYER_IDX_PLUS1; i++ )
    9292#else
    9393  for( Int i = 0; i <= m_tgtLayerId; i++ )
    … …  
    163163
    164164#if FIX_CONF_MODE
    165   for(UInt layer = 0; layer < MAX_VPS_LAYER_ID_PLUS1; layer++)
     165  for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
    166166#else
    167167  for(UInt layer=0; layer<=m_tgtLayerId; layer++)
    … …  
    406406
    407407#if FIX_CONF_MODE
    408   for(UInt layer = layerIdmin; layer < MAX_VPS_LAYER_ID_PLUS1; layer++)
     408  for(UInt layer = layerIdmin; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
    409409#else
    410410  for(UInt layer = layerIdmin; layer <= m_tgtLayerId; layer++)
    … …  
    595595
    596596#if FIX_CONF_MODE
    597   for(UInt layer = 0; layer < MAX_VPS_LAYER_ID_PLUS1; layer++)
     597  for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
    598598#else
    599599  for(UInt layer = 0; layer <= m_tgtLayerId; layer++)
    … …  
    621621
    622622#if FIX_CONF_MODE
    623   for(UInt layer = 0; layer < MAX_VPS_LAYER_ID_PLUS1; layer++)
     623  for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
    624624#else
    625625  for(UInt layer = 0; layer <= m_tgtLayerId; layer++)
    … …  
    650650#if SVC_EXTENSION
    651651#if FIX_CONF_MODE
    652   for(UInt layer = 0; layer < MAX_VPS_LAYER_ID_PLUS1; layer++)
     652  for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
    653653#else
    654654  for(UInt layer = 0; layer <= m_tgtLayerId; layer++)
    … …  
    671671#if CONFORMANCE_BITSTREAM_MODE
    672672#if FIX_CONF_MODE
    673   for(UInt layer = 0; layer < MAX_VPS_LAYER_ID_PLUS1; layer++)
     673  for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
    674674#else
    675675  for(UInt layer = 0; layer < MAX_LAYERS; layer++)
    … …  
    12821282    std::vector<Int>  listOfPocs;
    12831283#if FIX_ALIGN_BUMPING
    1284     std::vector<Int>  listOfPocsInEachLayer[MAX_VPS_LAYER_ID_PLUS1];
    1285     std::vector<Int>  listOfPocsPositionInEachLayer[MAX_VPS_LAYER_ID_PLUS1];
     1284    std::vector<Int>  listOfPocsInEachLayer[MAX_VPS_LAYER_IDX_PLUS1];
     1285    std::vector<Int>  listOfPocsPositionInEachLayer[MAX_VPS_LAYER_IDX_PLUS1];
    12861286#else
    12871287    std::vector<Int>  listOfPocsInEachLayer[MAX_LAYERS];
    … …  
    13141314    std::vector<Int>  listOfPocs;
    13151315#if FIX_ALIGN_BUMPING
    1316     std::vector<Int>  listOfPocsInEachLayer[MAX_VPS_LAYER_ID_PLUS1];
    1317     std::vector<Int>  listOfPocsPositionInEachLayer[MAX_VPS_LAYER_ID_PLUS1];
     1316    std::vector<Int>  listOfPocsInEachLayer[MAX_VPS_LAYER_IDX_PLUS1];
     1317    std::vector<Int>  listOfPocsPositionInEachLayer[MAX_VPS_LAYER_IDX_PLUS1];
    13181318#else
    13191319    std::vector<Int>  listOfPocsInEachLayer[MAX_LAYERS];
    … …  
    13421342{
    13431343#if FIX_ALIGN_BUMPING
    1344   for(Int i = 0; i < MAX_VPS_LAYER_ID_PLUS1; i++)
     1344  for(Int i = 0; i < MAX_VPS_LAYER_IDX_PLUS1; i++)
    13451345#else
    13461346  for(Int i = 0; i < MAX_LAYERS; i++)
    … …  
    13851385  std::vector<Int>  listOfPocs;
    13861386#if FIX_ALIGN_BUMPING
    1387   std::vector<Int>  listOfPocsInEachLayer[MAX_VPS_LAYER_ID_PLUS1];
    1388   std::vector<Int>  listOfPocsPositionInEachLayer[MAX_VPS_LAYER_ID_PLUS1];
     1387  std::vector<Int>  listOfPocsInEachLayer[MAX_VPS_LAYER_IDX_PLUS1];
     1388  std::vector<Int>  listOfPocsPositionInEachLayer[MAX_VPS_LAYER_IDX_PLUS1];
    13891389#else
    13901390  std::vector<Int>  listOfPocsInEachLayer[MAX_LAYERS];
    … …  
    14421442  std::vector<Int>  listOfPocs;
    14431443#if FIX_ALIGN_BUMPING
    1444   std::vector<Int>  listOfPocsInEachLayer[MAX_VPS_LAYER_ID_PLUS1];
    1445   std::vector<Int>  listOfPocsPositionInEachLayer[MAX_VPS_LAYER_ID_PLUS1];
     1444  std::vector<Int>  listOfPocsInEachLayer[MAX_VPS_LAYER_IDX_PLUS1];
     1445  std::vector<Int>  listOfPocsPositionInEachLayer[MAX_VPS_LAYER_IDX_PLUS1];
    14461446#else
    14471447  std::vector<Int>  listOfPocsInEachLayer[MAX_LAYERS];
    … …  
    16331633    // -------------------------------------
    16341634#if FIX_ALIGN_BUMPING
    1635     for(Int i = 0; i < MAX_VPS_LAYER_ID_PLUS1; i++)
     1635    for(Int i = 0; i < MAX_VPS_LAYER_IDX_PLUS1; i++)
    16361636#else
    16371637    for(Int i = 0; i < MAX_LAYERS; i++)
    … …  
    16851685{
    16861686#if FIX_ALIGN_BUMPING
    1687   for(Int layerIdx = 0; layerIdx < MAX_VPS_LAYER_ID_PLUS1; layerIdx++)
     1687  for(Int layerIdx = 0; layerIdx < MAX_VPS_LAYER_IDX_PLUS1; layerIdx++)
    16881688#else
    16891689  for(Int layerIdx = 0; layerIdx < MAX_LAYERS; layerIdx++)
    … …  
    17441744  dpbStatus.init();
    17451745#if FIX_ALIGN_BUMPING
    1746   for( Int i = 0; i < MAX_VPS_LAYER_ID_PLUS1; i++ )
     1746  for( Int i = 0; i < MAX_VPS_LAYER_IDX_PLUS1; i++ )
    17471747#else
    17481748  for( Int i = 0; i < MAX_LAYERS; i++ )
    … …  
    18181818
    18191819#if FIX_ALIGN_BUMPING
    1820   for(Int i = 0; i < MAX_VPS_LAYER_ID_PLUS1; i++)
     1820  for(Int i = 0; i < MAX_VPS_LAYER_IDX_PLUS1; i++)
    18211821#else
    18221822  for(Int i = 0; i < dpbStatus.m_numLayers; i++)
    … …  
    18381838    std::vector<Int>  listOfPocs;
    18391839#if FIX_ALIGN_BUMPING
    1840     std::vector<Int>  listOfPocsInEachLayer[MAX_VPS_LAYER_ID_PLUS1];
    1841     std::vector<Int>  listOfPocsPositionInEachLayer[MAX_VPS_LAYER_ID_PLUS1];
     1840    std::vector<Int>  listOfPocsInEachLayer[MAX_VPS_LAYER_IDX_PLUS1];
     1841    std::vector<Int>  listOfPocsPositionInEachLayer[MAX_VPS_LAYER_IDX_PLUS1];
    18421842#else
    18431843    std::vector<Int>  listOfPocsInEachLayer[MAX_LAYERS];

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.h

    r1029 r1044  
    144144  Int m_numPicsInSubDpb[MAX_LAYERS];  // Pictures marked as used_for_reference or needed for output in the sub-DPB
    145145#if FIX_ALIGN_BUMPING
    146   Int m_layerIdToSubDpbIdMap[MAX_VPS_LAYER_ID_PLUS1];
     146  Int m_layerIdToSubDpbIdMap[MAX_VPS_LAYER_IDX_PLUS1];
    147147  Int m_targetDecLayerIdList[MAX_LAYERS];
    148148#endif
    … …  
    171171#if FIX_ALIGN_BUMPING
    172172    ::memset( m_targetDecLayerIdList, 0, sizeof(m_targetDecLayerIdList) );
    173     for(Int i = 0; i < MAX_VPS_LAYER_ID_PLUS1; i++)
     173    for(Int i = 0; i < MAX_VPS_LAYER_IDX_PLUS1; i++)
    174174    {
    175175      m_layerIdToSubDpbIdMap[i] = -1;
Note: See TracChangeset for help on using the changeset viewer.