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


Ignore:
Timestamp:
29 Apr 2014, 23:47:35 (12 years ago)
Author:
seregin
Message:

remove macro N0120_MAX_TID_REF_PRESENT_FLAG

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

Legend:

Unmodified
Added
Removed

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

    r753 r755  
    23382338  m_crossLayerAlignedIdrOnlyFlag = false;
    23392339#endif
    2340 #if N0120_MAX_TID_REF_PRESENT_FLAG
    23412340  m_maxTidRefPresentFlag = true;
    2342 #endif
    23432341  for( Int i = 0; i < MAX_VPS_LAYER_ID_PLUS1 - 1; i++)
    23442342  {

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

    r744 r755  
    580580  UInt       m_maxTidIlRefPicsPlus1[MAX_VPS_LAYER_ID_PLUS1 - 1];
    581581#endif
    582 #if N0120_MAX_TID_REF_PRESENT_FLAG
    583582  Bool       m_maxTidRefPresentFlag;
    584 #endif
    585583#if VPS_TSLAYERS
    586584  Bool       m_maxTSLayersPresentFlag;
    … …  
    944942  Void   setMaxTidIlRefPicsPlus1(Int layerId, UInt maxSublayer)   { m_maxTidIlRefPicsPlus1[layerId] = maxSublayer;            }
    945943#endif
    946 #if N0120_MAX_TID_REF_PRESENT_FLAG
    947944  Bool   getMaxTidRefPresentFlag()                                  { return m_maxTidRefPresentFlag ;}
    948945  Void   setMaxTidRefPresentFlag(Bool x)                            { m_maxTidRefPresentFlag = x;}
    949 #endif
    950946#if VPS_TSLAYERS
    951947  Bool   getMaxTSLayersPresentFlag()                                  { return m_maxTSLayersPresentFlag ;}

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

    r754 r755  
    197197#define EARLY_REF_PIC_MARKING            0      ///< Valencia meeting - remove early marking of inter-layer reference pictures
    198198                                                ///< Decoded picture marking of sub-layer non-reference pictures
    199 #define N0120_MAX_TID_REF_PRESENT_FLAG   1      ///< JCTVC-N0120: max_tid_ref_pics_plus1_present_flag
    200199#define N0120_MAX_TID_REF_CFG            1      ///< set max_tid_il_ref_pics_plus1 and max_tid_ref_present_flag in the config. file (configuration setting)
    201200#define O0225_MAX_TID_FOR_REF_LAYERS     1
Note: See TracChangeset for help on using the changeset viewer.