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


Ignore:
Timestamp:
30 Apr 2014, 00:04:11 (12 years ago)
Author:
seregin
Message:

remove macro N0147_IRAP_ALIGN_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

    r755 r758  
    775775#endif
    776776
    777 #if N0147_IRAP_ALIGN_FLAG
    778777  assert(m_aiNumRefIdx[REF_PIC_LIST_0] > 0);
    779778  assert(m_aiNumRefIdx[REF_PIC_LIST_1] > 0);
    780 #else
    781   assert(m_aiNumRefIdx[REF_PIC_LIST_0] > 1);
    782   assert(m_aiNumRefIdx[REF_PIC_LIST_1] > 1);
    783 #endif
    784779
    785780  //set L0 inter-layer reference picture modification
    … …  
    789784  Bool hasModification = (m_aiNumRefIdx[REF_PIC_LIST_0] == numberOfRpsCurrTempList) ? false : true;
    790785#endif
    791 #if N0147_IRAP_ALIGN_FLAG
    792786  hasModification = hasModification && ( m_aiNumRefIdx[REF_PIC_LIST_0] > 1 );
    793 #endif
    794787  refPicListModification->setRefPicListModificationFlagL0(hasModification);
    795788  if(hasModification)
    … …  
    838831  //set L1 inter-layer reference picture modification
    839832  hasModification = (m_aiNumRefIdx[REF_PIC_LIST_1] >= numberOfRpsCurrTempList) ? false : true;
    840 #if N0147_IRAP_ALIGN_FLAG
    841833  hasModification = hasModification && ( m_aiNumRefIdx[REF_PIC_LIST_1] > 1 );
    842 #endif
    843834
    844835  refPicListModification->setRefPicListModificationFlagL1(hasModification);
    … …  
    23322323  m_crossLayerPictureTypeAlignFlag = true;
    23332324#endif
    2334 #if N0147_IRAP_ALIGN_FLAG
    23352325  m_crossLayerIrapAlignFlag = true;
    2336 #endif
    23372326#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    23382327  m_crossLayerAlignedIdrOnlyFlag = false;

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

    r755 r758  
    569569  Bool       m_crossLayerPictureTypeAlignFlag;
    570570#endif
    571 #if N0147_IRAP_ALIGN_FLAG
    572571  Bool       m_crossLayerIrapAlignFlag;
    573 #endif
    574572#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    575573  Bool       m_crossLayerAlignedIdrOnlyFlag;
    … …  
    931929  Void   setCrossLayerAlignedIdrOnlyFlag(Bool x)                              { m_crossLayerAlignedIdrOnlyFlag = x;                         }
    932930#endif
    933 #if N0147_IRAP_ALIGN_FLAG
    934931  Bool   getCrossLayerIrapAlignFlag()                                           { return m_crossLayerIrapAlignFlag;                      }
    935932  Void   setCrossLayerIrapAlignFlag(Bool x)                                     { m_crossLayerIrapAlignFlag = x;                         }
    936 #endif
    937933#if O0225_MAX_TID_FOR_REF_LAYERS
    938934  UInt   getMaxTidIlRefPicsPlus1(Int layerId, Int refLayerId)                     { return m_maxTidIlRefPicsPlus1[layerId][refLayerId];           }

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

    r757 r758  
    211211#define P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG   1  ///< a flag to indicatate whether picture types for IRAP are IDR across layers.
    212212
    213 #define N0147_IRAP_ALIGN_FLAG            1      ///< a flag to indicatate whether IRAPs are aligned across layers
    214 #if N0147_IRAP_ALIGN_FLAG
    215213#define O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS  1  ///< Remove IRAP align depedency constraints on poc_Reset_flag.
    216214#define IRAP_ALIGN_FLAG_IN_VPS_VUI       1       ///< Move IRAP align flag to VPS VUI
    217 #endif
    218215#define FAST_INTRA_SHVC                  1      ///< JCTVC-M0115: reduction number of intra modes in the EL (encoder only)
    219216#if FAST_INTRA_SHVC
Note: See TracChangeset for help on using the changeset viewer.