Changeset 1170 in SHVCSoftware


Ignore:
Timestamp:
8 Jul 2015, 01:24:10 (9 years ago)
Author:
seregin
Message:

macro cleanup: PTL_SIGNALLING, VPS_EXTN_PROFILE_INFO

Location:
branches/SHM-dev/source/Lib
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

    r1168 r1170  
    19981998  ::memset(m_layerIdxInVps, 0, sizeof(m_layerIdxInVps));
    19991999
    2000 #if VPS_EXTN_PROFILE_INFO
    20012000  ::memset(m_profilePresentFlag, 0, sizeof(m_profilePresentFlag));
    2002 #endif
    20032001#if VPS_EXTN_OP_LAYER_SETS
    20042002  ::memset(m_layerIdIncludedFlag, 0, sizeof(m_layerIdIncludedFlag));
    … …  
    30463044
    30473045#if SVC_EXTENSION
    3048 
    3049 #if VPS_EXTN_PROFILE_INFO
    30503046Void ProfileTierLevel::copyProfileInfo(ProfileTierLevel *ptl)
    30513047{
    … …  
    30623058  this->setFrameOnlyConstraintFlag( ptl->getFrameOnlyConstraintFlag()); 
    30633059}
    3064 #endif
    30653060
    30663061Window& TComPPS::getScaledRefLayerWindowForLayer(Int layerId)
    … …  
    37493744#endif //REPN_FORMAT_IN_VPS
    37503745
    3751 #if VPS_EXTN_PROFILE_INFO
    37523746Void TComPTL::copyProfileInfo(TComPTL *ptl)
    37533747{
    … …  
    37553749  this->getGeneralPTL()->copyProfileInfo(ptl->getGeneralPTL());
    37563750}
    3757 #endif
    3758 
    37593751
    37603752Bool TComSlice::setBaseColPic(  TComList<TComPic*>& rcListPic, UInt refLayerIdc )

  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

    r1168 r1170  
    244244  Void setLowerBitRateConstraintFlag(Bool b)       { m_lowerBitRateConstraintFlag = b; }
    245245
    246 #if VPS_EXTN_PROFILE_INFO
     246#if SVC_EXTENSION
    247247  Void copyProfileInfo(ProfileTierLevel *ptl);
    248248#endif
    … …  
    268268  ProfileTierLevel* getSubLayerPTL(Int i)  { return &m_subLayerPTL[i]; }
    269269
    270 #if VPS_EXTN_PROFILE_INFO
     270#if SVC_EXTENSION
    271271  Void copyProfileInfo(TComPTL *ptl);
    272272#endif
    … …  
    633633#endif
    634634  Bool       m_ilpSshSignalingEnabledFlag;
    635 #if VPS_EXTN_PROFILE_INFO
     635
    636636  // Profile-tier-level signalling related
    637637  Bool       m_profilePresentFlag[MAX_VPS_LAYER_SETS_PLUS1];    // The value with index 0 will not be used.
    638638#if !MULTIPLE_PTL_SUPPORT
    639639  std::vector<TComPTL>    m_pcPTLForExtn; 
    640 #endif
    641640#endif
    642641#if VPS_EXTN_OP_LAYER_SETS
    … …  
    965964  Bool   getIlpSshSignalingEnabledFlag()                        { return m_ilpSshSignalingEnabledFlag;}
    966965  Void   setIlpSshSignalingEnabledFlag(Bool x)                  { m_ilpSshSignalingEnabledFlag = x;}
    967 #if VPS_EXTN_PROFILE_INFO
     966
    968967  Bool   getProfilePresentFlag(Int id)                          { return m_profilePresentFlag[id]; }
    969968  Void   setProfilePresentFlag(Int id, Bool x)                  { m_profilePresentFlag[id] = x;    }
    … …  
    972971  std::vector<TComPTL>* getPTLForExtnPtr()                      { return &m_pcPTLForExtn;          }
    973972  TComPTL* getPTLForExtn(Int id)                                { return &m_pcPTLForExtn[id];      }
    974 #endif
    975973#endif
    976974#if VPS_EXTN_OP_LAYER_SETS

  • branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

    r1169 r1170  
    5252#define POC_RESET_RESTRICTIONS           1      ///< Restrictions on semantics of POC reset-related syntax elements, including one item from R0223
    5353#define POC_RESET_VALUE_RESTRICTION      1      ///< R0223: Restriction on the value of full_poc_reset_flag
    54 #define PTL_SIGNALLING                   1      ///< Overall macro for all PTL-related signalling
    5554
    5655#define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
    … …  
    111110
    112111#define VPS_EXTN_OP_LAYER_SETS           1      ///< Include output layer sets in VPS extension
    113 #define VPS_EXTN_PROFILE_INFO            1      ///< Include profile information for layer sets in VPS extension
    114112
    115113#define VPS_VUI_TILES_NOT_IN_USE__FLAG   1      ///< JCTVC-O0226: VPS VUI flag to indicate tile not in use

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1169 r1170  
    28672867  }
    28682868  READ_FLAG( uiCode, "all_ref_layers_active_flag" ); vps->setIlpSshSignalingEnabledFlag(uiCode ? true : false);
    2869 #if VPS_EXTN_PROFILE_INFO
     2869
    28702870  // Profile-tier-level signalling
    28712871  READ_UVLC(  uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 );
    … …  
    28942894#endif
    28952895  }
    2896 #endif
    28972896
    28982897  if( vps->getNumLayerSets() > 1 )

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1169 r1170  
    21172117   }
    21182118   WRITE_FLAG( vps->getIlpSshSignalingEnabledFlag(), "all_ref_layers_active_flag" );
    2119 #if VPS_EXTN_PROFILE_INFO
     2119
    21202120  // Profile-tier-level signalling
    21212121  WRITE_UVLC( vps->getNumProfileTierLevel() - 1, "vps_num_profile_tier_level_minus1");
    … …  
    21402140#endif
    21412141  }
    2142 #endif
    21432142
    21442143  Int numOutputLayerSets = vps->getNumOutputLayerSets();
Note: See TracChangeset for help on using the changeset viewer.