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


Ignore:
Timestamp:
8 Jul 2015, 03:09:51 (10 years ago)
Author:
seregin
Message:

macro cleanup: DPB_PARAMS_MAXTLAYERS, MULTIPLE_PTL_SUPPORT

Location:
branches/SHM-dev/source/App/TAppEncoder
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r1172 r1182  
    6565  MAINREXT = 4,
    6666  HIGHTHROUGHPUTREXT = 5, // Placeholder profile for development
    67 #if MULTIPLE_PTL_SUPPORT
     67#if SVC_EXTENSION
    6868  MULTIVIEWMAIN = 6,
    6969  SCALABLEMAIN = 7,
    … …  
    307307  {"main-RExt",            Profile::MAINREXT           },
    308308  {"high-throughput-RExt", Profile::HIGHTHROUGHPUTREXT },
    309 #if MULTIPLE_PTL_SUPPORT
     309#if SVC_EXTENSION
    310310  {"multiview-main",       Profile::MULTIVIEWMAIN      },       //This is not used in this software
    311311  {"scalable-main",        Profile::SCALABLEMAIN       },
    … …  
    346346    {"main_444_12_intra",  MAIN_444_12_INTRA},
    347347    {"main_444_16_intra",  MAIN_444_16_INTRA},
    348 #if MULTIPLE_PTL_SUPPORT
     348#if SVC_EXTENSION
    349349    {"multiview-main",     MULTIVIEWMAIN    },
    350350    {"scalable-main",      SCALABLEMAIN     },
    … …  
    495495}
    496496
    497 #if MULTIPLE_PTL_SUPPORT
     497#if SVC_EXTENSION
    498498namespace Profile
    499499{
    … …  
    835835  Int*    cfg_layerSwitchOffEnd[MAX_LAYERS];
    836836
    837 #if MULTIPLE_PTL_SUPPORT
    838837  Bool    tmpIntraConstraintFlag;
    839838  Bool    tmpLowerBitRateConstraintFlag;
    840839  UInt    tmpBitDepthConstraint;
    841840  Int*    cfg_layerPTLIdx[MAX_VPS_LAYER_IDX_PLUS1];
    842 #endif
    843 
    844   for(UInt layer = 0; layer < MAX_LAYERS; layer++)
     841
     842  for( UInt layer = 0; layer < MAX_LAYERS; layer++ )
    845843  {
    846844    cfg_InputFile[layer]    = &m_acLayerCfg[layer].m_cInputFile;
    … …  
    931929    cfg_layerSwitchOffBegin[layer]  = &m_acLayerCfg[layer].m_layerSwitchOffBegin;
    932930    cfg_layerSwitchOffEnd[layer]    = &m_acLayerCfg[layer].m_layerSwitchOffEnd;
    933 #if MULTIPLE_PTL_SUPPORT
    934931    cfg_layerPTLIdx[layer]          = &m_acLayerCfg[layer].m_layerPTLIdx;
    935 #endif
    936932  }
    937933
    … …  
    954950  string* cfg_listOfOutputLayers     = new string[MAX_VPS_OUTPUT_LAYER_SETS_PLUS1];
    955951  string* cfg_outputLayerSetIdx      = new string;
    956 #if MULTIPLE_PTL_SUPPORT
    957952  string* cfg_listOfLayerPTLOfOlss   = new string[MAX_VPS_OUTPUT_LAYER_SETS_PLUS1];
    958 #endif
    959953#if AVC_BASE
    960954  string  cfg_BLInputFile;
    … …  
    978972  Int tmpConstraintChromaFormat;
    979973  string inputColourSpaceConvert;
    980 #if MULTIPLE_PTL_SUPPORT
     974#if SVC_EXTENSION
    981975  ExtendedProfileName extendedProfile[MAX_NUM_LAYER_IDS + 1];
    982976#else
    … …  
    12071201
    12081202  // Profile and level
    1209 #if MULTIPLE_PTL_SUPPORT
     1203#if SVC_EXTENSION
    12101204  ("NumProfileTierLevel",                             m_numPTLInfo,                                         1, "Number of Profile, Tier and Level information")
    12111205  ("Profile%d",                                       extendedProfile,          NONE, (MAX_NUM_LAYER_IDS + 1),  "Profile name to use for encoding. Use main (for main), main10 (for main10), main-still-picture, main-RExt (for Range Extensions profile), any of the RExt specific profile names, or none")
    … …  
    18761870
    18771871#if SVC_EXTENSION
    1878   for (Int layer = 0; layer < MAX_LAYERS; layer++)
    1879   {
    1880     if (m_acLayerCfg[layer].m_layerSwitchOffBegin < m_acLayerCfg[layer].m_layerSwitchOffEnd)
    1881     {
    1882       if (m_iGOPSize > 0 && (m_acLayerCfg[layer].m_layerSwitchOffBegin % m_iGOPSize) != 0)
     1872  for( Int layer = 0; layer < MAX_LAYERS; layer++)
     1873  {
     1874    if( m_acLayerCfg[layer].m_layerSwitchOffBegin < m_acLayerCfg[layer].m_layerSwitchOffEnd )
     1875    {
     1876      if( m_iGOPSize > 0 && (m_acLayerCfg[layer].m_layerSwitchOffBegin % m_iGOPSize) != 0 )
    18831877      {
    18841878        printf("LayerSwitchOffBegin%d: Must be multiple of GOP size.\n", layer);
    18851879        exit(EXIT_FAILURE);
    18861880      }
    1887       if (m_acLayerCfg[layer].m_iIntraPeriod > 0 && (m_acLayerCfg[layer].m_layerSwitchOffEnd % m_acLayerCfg[layer].m_iIntraPeriod) != 0)
     1881      if( m_acLayerCfg[layer].m_iIntraPeriod > 0 && (m_acLayerCfg[layer].m_layerSwitchOffEnd % m_acLayerCfg[layer].m_iIntraPeriod) != 0 )
    18881882      {
    18891883        printf("LayerSwitchOffEnd%d: Must be IRAP picture.\n", layer);
    … …  
    18911885      }
    18921886    }
    1893   }
    1894 #endif
    1895 
    1896 #if MULTIPLE_PTL_SUPPORT
    1897   for( Int layer = 0; layer < MAX_LAYERS; layer++ )
    1898   {
     1887
    18991888    m_acLayerCfg[layer].m_bitDepthConstraint = tmpBitDepthConstraint;
    19001889    m_acLayerCfg[layer].m_intraConstraintFlag = tmpIntraConstraintFlag;
    … …  
    20061995  }
    20071996
    2008 #if SVC_EXTENSION
    2009   ChromaFormat m_chromaFormatIDC = m_acLayerCfg[0].m_chromaFormatIDC;
    2010 #endif
    2011 
    20121997  if (m_profile == Profile::HIGHTHROUGHPUTREXT )
    20131998  {
    … …  
    20192004    if (m_bitDepthConstraint == 0 && tmpConstraintChromaFormat == 0)
    20202005    {
    2021 #if SVC_EXTENSION
    2022       Bool m_useExtendedPrecision    = m_acLayerCfg[0].m_useExtendedPrecision;
    2023       Int  m_internalBitDepth[]      = {m_acLayerCfg[0].m_internalBitDepth[CHANNEL_TYPE_LUMA], m_acLayerCfg[0].m_internalBitDepth[CHANNEL_TYPE_CHROMA]};
    2024       ChromaFormat m_chromaFormatIDC = m_acLayerCfg[0].m_chromaFormatIDC;
    2025 #endif
    20262006      // produce a valid combination, if possible.
    20272007      const Bool bUsingGeneralRExtTools  = m_useResidualRotation                    ||
    … …  
    20662046  for(Int layer = 0; layer < MAX_LAYERS; layer++)
    20672047  {
    2068 #if !MULTIPLE_PTL_SUPPORT
    2069     m_acLayerCfg[layer].m_chromaFormatConstraint = m_chromaFormatConstraint;
    2070     m_acLayerCfg[layer].m_bitDepthConstraint = m_bitDepthConstraint;
    2071 #endif
    2072 
    20732048    // If number of scaled ref. layer offsets is non-zero, at least one of the offsets should be specified
    20742049    if(m_acLayerCfg[layer].m_numRefLayerLocationOffsets)
    … …  
    24642439  scanStringToArray( *cfg_numOutputLayersInOutputLayerSet, m_numOutputLayerSets - 1, "NumOutputLayersInOutputLayerSets", m_numOutputLayersInOutputLayerSet );
    24652440  m_numOutputLayersInOutputLayerSet.insert(m_numOutputLayersInOutputLayerSet.begin(), 1);
     2441
    24662442  // Layers in the output layer set
    24672443  m_listOfOutputLayers.resize(m_numOutputLayerSets);
    2468 
    2469 #if MULTIPLE_PTL_SUPPORT
    24702444  m_listOfLayerPTLofOlss.resize(m_numOutputLayerSets);
    2471 #endif
    24722445
    24732446  Int startOlsCtr = 1;
    … …  
    24772450    startOlsCtr = m_numLayerSets;
    24782451  }
     2452
    24792453  for( Int olsCtr = 1; olsCtr < m_numOutputLayerSets; olsCtr++ )
    24802454  {
    … …  
    24902464      assert( scanStringToArray( cfg_listOfOutputLayers[olsCtr], m_numOutputLayersInOutputLayerSet[olsCtr], "ListOfOutputLayers", m_listOfOutputLayers[olsCtr] ) );
    24912465    }
    2492 #if MULTIPLE_PTL_SUPPORT
     2466
    24932467    Int olsToLsIndex = (olsCtr >= (m_numLayerSets + m_numAddLayerSets)) ? m_outputLayerSetIdx[olsCtr - (m_numLayerSets + m_numAddLayerSets)] : olsCtr;
    24942468
    24952469    // This is a fix to allow setting of PTL for additional layer sets
    2496     if (olsCtr >= m_numLayerSets && olsCtr < (m_numLayerSets + m_numAddLayerSets))
     2470    if( olsCtr >= m_numLayerSets && olsCtr < (m_numLayerSets + m_numAddLayerSets) )
    24972471    {
    24982472      scanStringToArrayNumEntries(cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[olsToLsIndex], "List of PTL for each layers in OLS", m_listOfLayerPTLofOlss[olsCtr]);
    … …  
    25212495      }
    25222496    }
    2523 #endif
    2524   }
    2525 #if MULTIPLE_PTL_SUPPORT
     2497  }
     2498
    25262499  m_listOfLayerPTLofOlss[0].push_back(*cfg_layerPTLIdx[0]);
    25272500  delete [] cfg_listOfLayerPTLOfOlss;
    2528 #endif
    25292501  delete cfg_numOutputLayersInOutputLayerSet;
    25302502  delete [] cfg_listOfOutputLayers;
    … …  
    29052877  m_saoOffsetBitShift[CHANNEL_TYPE_CHROMA] = m_acLayerCfg[layerIdx].m_saoOffsetBitShift[CHANNEL_TYPE_CHROMA];
    29062878
    2907 #if MULTIPLE_PTL_SUPPORT
    29082879  Int layerPTLIdx = m_acLayerCfg[layerIdx].m_layerPTLIdx;
    29092880  Profile::Name m_profile           = m_profileList[layerPTLIdx];
    … …  
    29112882  Bool m_intraConstraintFlag        = m_acLayerCfg[layerIdx].m_intraConstraintFlag;
    29122883  Bool m_lowerBitRateConstraintFlag = m_acLayerCfg[layerIdx].m_lowerBitRateConstraintFlag;
    2913 #endif
    29142884#else
    29152885Void TAppEncCfg::xCheckParameter()
    … …  
    29252895    fprintf(stderr, "******************************************************************\n");
    29262896  }
    2927 #if SVC_EXTENSION && MULTIPLE_PTL_SUPPORT
     2897#if SVC_EXTENSION
    29282898  Int ii = 0;
    29292899  while( ii < m_numPTLInfo )
    … …  
    30192989  else
    30202990  {
    3021 #if MULTIPLE_PTL_SUPPORT
     2991#if SVC_EXTENSION
    30222992    xConfirmPara(m_bitDepthConstraint!=((m_profile==Profile::MAIN10 || m_profile==Profile::SCALABLEMAIN10)?10:8), "BitDepthConstraint must be 8 for MAIN profile and 10 for MAIN10 or Scalable-main10 profile.");
    30232993#else
    … …  
    44344404    printf("Frame index                       : %u - %d (%d frames)\n", m_FrameSkip, m_FrameSkip+m_framesToBeEncoded-1, m_framesToBeEncoded );
    44354405  }
    4436 #if !MULTIPLE_PTL_SUPPORT
     4406#if !SVC_EXTENSION
    44374407  if (m_profile == Profile::MAINREXT)
    44384408  {

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

    r1172 r1182  
    124124  Bool      m_cabacZeroWordPaddingEnabled;
    125125
    126 #if MULTIPLE_PTL_SUPPORT
     126#if SVC_EXTENSION
    127127  Int           m_numPTLInfo;
    128128  Profile::Name m_profileList[MAX_NUM_LAYER_IDS + 1];

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp

    r1147 r1182  
    220220#endif
    221221  printf("Internal Format                   : %dx%d %dHz\n", m_iSourceWidth, m_iSourceHeight, m_iFrameRate );
    222 #if MULTIPLE_PTL_SUPPORT
    223222  printf("PTL index                         : %d\n", m_layerPTLIdx );
    224 #endif
    225223#if O0194_DIFFERENT_BITDEPTH_EL_BL
    226224  printf("Input bit depth                   : (Y:%d, C:%d)\n", m_inputBitDepth[CHANNEL_TYPE_LUMA], m_inputBitDepth[CHANNEL_TYPE_CHROMA] );

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

    r1149 r1182  
    147147  Int       m_layerSwitchOffEnd;
    148148
    149 #if MULTIPLE_PTL_SUPPORT
    150149  // profile/level
    151150  Int       m_layerPTLIdx;
    152 #endif
    153151
    154152public:

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r1173 r1182  
    193193#endif
    194194
    195 #if MULTIPLE_PTL_SUPPORT
    196195  //Populate PTL in VPS
    197196  TComVPS *pVPS = m_acTEncTop[0].getVPS();
    … …  
    209208  pVPS->setNumProfileTierLevel(m_numPTLInfo);
    210209
    211   std::vector<int> myvector;
     210  std::vector<Int> myvector;
    212211  vps->getProfileLevelTierIdx()->resize(m_numOutputLayerSets);
    213   for (int ii = 0; ii < m_numOutputLayerSets; ii++)
     212  for( Int ii = 0; ii < m_numOutputLayerSets; ii++ )
    214213  {
    215214    myvector =  m_listOfLayerPTLofOlss[ii];
    216215
    217     for (std::vector<int>::iterator it = myvector.begin() ; it != myvector.end(); ++it)
     216    for( std::vector<Int>::iterator it = myvector.begin() ; it != myvector.end(); ++it )
    218217    {
    219218      pVPS->addProfileLevelTierIdx(ii, it[0]);
    220219    }
    221220  }
    222 #endif
    223221
    224222  assert( m_numLayers <= MAX_LAYERS );
    … …  
    243241#endif
    244242   
    245 #if MULTIPLE_PTL_SUPPORT
    246243    Int layerPTLIdx = m_acLayerCfg[layer].m_layerPTLIdx;
    247244    m_acTEncTop[layer].setProfile                                         ( m_profileList[layerPTLIdx] );
    … …  
    255252    m_acTEncTop[layer].setIntraConstraintFlag                             ( m_acLayerCfg[layer].m_intraConstraintFlag );
    256253    m_acTEncTop[layer].setLowerBitRateConstraintFlag                      ( m_acLayerCfg[layer].m_lowerBitRateConstraintFlag );
    257 #else
    258     m_acTEncTop[layer].setProfile                                         ( m_profile );
    259     m_acTEncTop[layer].setLevel                                           ( m_levelTier, m_level );
    260     m_acTEncTop[layer].setProgressiveSourceFlag                           ( m_progressiveSourceFlag );
    261     m_acTEncTop[layer].setInterlacedSourceFlag                            ( m_interlacedSourceFlag );
    262     m_acTEncTop[layer].setNonPackedConstraintFlag                         ( m_nonPackedConstraintFlag );
    263     m_acTEncTop[layer].setFrameOnlyConstraintFlag                         ( m_frameOnlyConstraintFlag );
    264     m_acTEncTop[layer].setBitDepthConstraintValue                         ( m_bitDepthConstraint );
    265     m_acTEncTop[layer].setChromaFormatConstraintValue                     ( m_acLayerCfg[layer].m_chromaFormatConstraint );
    266     m_acTEncTop[layer].setIntraConstraintFlag                             ( m_intraConstraintFlag );
    267     m_acTEncTop[layer].setLowerBitRateConstraintFlag                      ( m_lowerBitRateConstraintFlag );
    268 #endif
    269254
    270255    m_acTEncTop[layer].setPrintMSEBasedSequencePSNR                       ( m_printMSEBasedSequencePSNR);
    … …  
    15551540  vps->deriveNecessaryLayerFlag();
    15561541  vps->checkNecessaryLayerFlagCondition();
    1557 
    1558 #if !MULTIPLE_PTL_SUPPORT
    1559   vps->getProfileLevelTierIdx()->resize(vps->getNumOutputLayerSets());
    1560   vps->getProfileLevelTierIdx(0)->push_back( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 ? 1 : 0 ); // Default 0-th output layer set
    1561   for(i = 1; i < vps->getNumOutputLayerSets(); i++)
    1562   {
    1563     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i );
    1564     Int numLayerInLayerSet = vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet );
    1565     for(Int j = 0; j < numLayerInLayerSet; j++)
    1566     {
    1567       Int layerIdxInVps = vps->getLayerIdxInVps( vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j) );
    1568       if( vps->getNecessaryLayerFlag(i, j) )
    1569       {
    1570         vps->getProfileLevelTierIdx(i)->push_back( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 ? layerIdxInVps + 1 : layerIdxInVps);
    1571       }
    1572       else
    1573       {
    1574         vps->getProfileLevelTierIdx(i)->push_back( -1 );
    1575       }
    1576     }
    1577   }
    1578 #endif
    1579 
    15801542  vps->calculateMaxSLInLayerSets();
    15811543
    15821544  // Initialize dpb_size_table() for all ouput layer sets in the VPS extension
    1583   for(i = 1; i < vps->getNumOutputLayerSets(); i++)
     1545  for( i = 1; i < vps->getNumOutputLayerSets(); i++ )
    15841546  {
    15851547    Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i );
    … …  
    16011563  }
    16021564#endif
     1565
    16031566    vps->setMaxOneActiveRefLayerFlag(maxDirectRefLayers > 1 ? false : true);
    16041567#if O0062_POC_LSB_NOT_PRESENT_FLAG
Note: See TracChangeset for help on using the changeset viewer.