Changeset 1153 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon


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

macro cleanup: PER_LAYER_PTL

Location:
branches/SHM-dev/source/Lib/TLibCommon
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • 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()

  • 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;                }

  • 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
Note: See TracChangeset for help on using the changeset viewer.