Changeset 1153 in SHVCSoftware for branches


Ignore:
Timestamp:
8 Jul 2015, 00:28:51 (9 years ago)
Author:
seregin
Message:

macro cleanup: PER_LAYER_PTL

Location:
branches/SHM-dev/source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r1152 r1153  
    15911591#endif
    15921592#endif
    1593 #if !PER_LAYER_PTL
    1594   for(i = 1; i < vps->getNumLayerSets(); i++)
    1595   {
    1596     vps->setProfileLevelTierIdx(i, i);
    1597 #if !OUTPUT_LAYER_SETS_CONFIG
    1598     vps->setOutputLayerSetIdx(i, i);
    1599 #endif
    1600   } 
    1601 #endif
    16021593#endif
    16031594#if VPS_DPB_SIZE_TABLE
     
    16631654
    16641655#if !MULTIPLE_PTL_SUPPORT
    1665 #if PER_LAYER_PTL
    16661656  vps->getProfileLevelTierIdx()->resize(vps->getNumOutputLayerSets());
    16671657  vps->getProfileLevelTierIdx(0)->push_back( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 ? 1 : 0 ); // Default 0-th output layer set
     
    16831673    }
    16841674  }
    1685 #endif
    16861675#endif
    16871676
  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

    r1151 r1153  
    20282028  ::memset(m_directDependencyType, 0, sizeof(m_directDependencyType));
    20292029
    2030 #if !PER_LAYER_PTL
    2031   ::memset(m_profileLevelTierIdx,  0, sizeof(m_profileLevelTierIdx));
    2032 #endif
    20332030  m_maxOneActiveRefLayerFlag = true;
    20342031#if O0062_POC_LSB_NOT_PRESENT_FLAG
     
    35633560}
    35643561
    3565 #if PER_LAYER_PTL
    35663562Int TComVPS::calculateLenOfSyntaxElement( Int const numVal )
    35673563{
     
    35733569  return numBits;
    35743570}
    3575 #endif
    35763571
    35773572Void TComVPS::calculateMaxSLInLayerSets()
  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

    r1152 r1153  
    678678#endif
    679679#endif
    680 #if PER_LAYER_PTL
    681680  std::vector< std::vector<Int> >  m_profileLevelTierIdx;
    682 #else
    683   Int        m_profileLevelTierIdx[64];     
    684 #endif
    685681  Bool       m_maxOneActiveRefLayerFlag;
    686682#if O0062_POC_LSB_NOT_PRESENT_FLAG
     
    10581054#endif
    10591055#endif
    1060 #if PER_LAYER_PTL
     1056
    10611057  Bool getNecessaryLayerFlag(Int const i, Int const j) { return m_necessaryLayerFlag[i][j]; }
    10621058  std::vector< std::vector<Int> >* getProfileLevelTierIdx() { return &m_profileLevelTierIdx; }
     
    10681064#endif
    10691065  Int    calculateLenOfSyntaxElement( Int const numVal );
    1070 #else
    1071   Int    getProfileLevelTierIdx(Int i)                        { return m_profileLevelTierIdx[i]; }
    1072   Void   setProfileLevelTierIdx(Int i, Int x)                 { m_profileLevelTierIdx[i] = x   ; }
    1073 #endif
     1066
    10741067  Bool   getMaxOneActiveRefLayerFlag()                                          { return m_maxOneActiveRefLayerFlag;             }
    10751068  Void   setMaxOneActiveRefLayerFlag(Bool x)                                    { m_maxOneActiveRefLayerFlag = x;                }
  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

    r1152 r1153  
    5757#if PTL_SIGNALLING
    5858#define LIST_OF_PTL                      1      ///< JCTVC-R0272: Signalling the PTL for the 0-th OLS
    59 #define PER_LAYER_PTL                    1      ///< Signal profile-tier-level information for each layer.
    6059#endif
    6160#define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
  • TabularUnified branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1152 r1153  
    28742874  READ_UVLC(  uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 );
    28752875#endif
    2876 #if PER_LAYER_PTL
    28772876  Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
    2878 #endif
    28792877#if !MULTIPLE_PTL_SUPPORT
    28802878  vps->getPTLForExtnPtr()->resize(vps->getNumProfileTierLevel());
     
    29512949  vps->setOutputLayerFlag(0, 0, true);
    29522950  vps->deriveNecessaryLayerFlag(0);
    2953 #if PER_LAYER_PTL
    29542951  vps->getProfileLevelTierIdx()->resize(numOutputLayerSets);
    29552952  vps->getProfileLevelTierIdx(0)->push_back( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 ? 1 : 0);
    2956 #endif
    29572953
    29582954  for(i = 1; i < numOutputLayerSets; i++)
     
    30143010    vps->deriveNecessaryLayerFlag(i); 
    30153011
    3016 #if PER_LAYER_PTL
    30173012    vps->getProfileLevelTierIdx(i)->assign(vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet), -1);
    30183013    for(j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet) ; j++)
     
    30443039      }
    30453040    }
    3046 #else
    3047     Int numBits = 1;
    3048     while ((1 << numBits) < (vps->getNumProfileTierLevel()))
    3049     {
    3050       numBits++;
    3051     }
    3052     READ_CODE( numBits, uiCode, "profile_tier_level_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
    3053 #endif
    30543041
    30553042    NumOutputLayersInOutputLayerSet[i] = 0;
  • TabularUnified branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1152 r1153  
    21252125#else
    21262126  WRITE_UVLC( vps->getNumProfileTierLevel() - 1, "vps_num_profile_tier_level_minus1");
    2127 #if PER_LAYER_PTL
    21282127  Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
    2129 #endif
    21302128#endif
    21312129#if LIST_OF_PTL
     
    22212219      }
    22222220    }
    2223 #if PER_LAYER_PTL
    2224     for(j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet) ; j++)
     2221
     2222    for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
    22252223    {
    22262224      if( vps->getNecessaryLayerFlag(i, j) && (vps->getNumProfileTierLevel() - 1) > 0 )
     
    22292227      }
    22302228    }
    2231 #else
    2232     Int numBits = 1;
    2233     while ((1 << numBits) < (vps->getNumProfileTierLevel()))
    2234     {
    2235       numBits++;
    2236     }
    2237     WRITE_CODE( vps->getProfileLevelTierIdx(i), numBits, "profile_level_tier_idx[i]" );     
    2238 #endif
    22392229
    22402230    NumOutputLayersInOutputLayerSet[i] = 0;
Note: See TracChangeset for help on using the changeset viewer.