Ignore:
Timestamp:
28 Jun 2013, 00:40:00 (11 years ago)
Author:
seregin
Message:

update to HM11.0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncGOP.h

    r292 r302  
    127127  UInt                    m_tl0Idx;
    128128  UInt                    m_rapIdx;
    129 #if L0045_NON_NESTED_SEI_RESTRICTIONS
    130129  Bool                    m_activeParameterSetSEIPresentInAU;
    131130  Bool                    m_bufferingPeriodSEIPresentInAU;
    132131  Bool                    m_pictureTimingSEIPresentInAU;
    133 #if K0180_SCALABLE_NESTING_SEI
    134132  Bool                    m_nestedBufferingPeriodSEIPresentInAU;
    135133  Bool                    m_nestedPictureTimingSEIPresentInAU;
    136 #endif
    137 #endif
    138134public:
    139135  TEncGOP();
    … …  
    186182  SEIDisplayOrientation*  xCreateSEIDisplayOrientation();
    187183
    188 #if J0149_TONE_MAPPING_SEI
    189184  SEIToneMappingInfo*     xCreateSEIToneMappingInfo();
    190 #endif
    191185
    192186  Void xCreateLeadingSEIMessages (/*SEIMessages seiMessages,*/ AccessUnit &accessUnit, TComSPS *sps);
    193 #if L0045_NON_NESTED_SEI_RESTRICTIONS
    194187  Int xGetFirstSeiLocation (AccessUnit &accessUnit);
    195188  Void xResetNonNestedSEIPresentFlags()
    … …  
    199192    m_pictureTimingSEIPresentInAU      = false;
    200193  }
    201 #if K0180_SCALABLE_NESTING_SEI
    202194  Void xResetNestedSEIPresentFlags()
    203195  {
    … …  
    205197    m_nestedPictureTimingSEIPresentInAU      = false;
    206198  }
    207 #endif
    208 #endif
    209 #if L0386_DB_METRIC
    210199  Void dblMetric( TComPic* pcPic, UInt uiNumSlices );
    211 #endif
    212200#if M0457_COL_PICTURE_SIGNALING
    213201  TComPic* getMotionPredIlp(TComSlice* pcSlice);
Note: See TracChangeset for help on using the changeset viewer.