Changeset 758 in SHVCSoftware


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

remove macro N0147_IRAP_ALIGN_FLAG

Location:
branches/SHM-6-dev/source
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-6-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r756 r758  
    597597  ("CrossLayerPictureTypeAlignFlag", m_crossLayerPictureTypeAlignFlag, true, "align picture type across layers" ) 
    598598#endif
    599 #if N0147_IRAP_ALIGN_FLAG
    600599  ("CrossLayerIrapAlignFlag", m_crossLayerIrapAlignFlag, true, "align IRAP across layers" ) 
    601 #endif
    602600#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    603601  ("CrossLayerAlignedIdrOnlyFlag", m_crossLayerAlignedIdrOnlyFlag, true, "only idr for IRAP across layers" ) 
     
    24122410  printf("Align picture type            : %d\n", m_crossLayerPictureTypeAlignFlag );
    24132411#endif
    2414 #if N0147_IRAP_ALIGN_FLAG
    24152412  printf("Cross layer IRAP alignment    : %d\n", m_crossLayerIrapAlignFlag );
    2416 #endif
    24172413#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    24182414  printf("IDR only for IRAP             : %d\n", m_crossLayerAlignedIdrOnlyFlag );
  • branches/SHM-6-dev/source/App/TAppEncoder/TAppEncCfg.h

    r756 r758  
    361361  Void  xPrintParameter ();                                   ///< print configuration values
    362362  Void  xPrintUsage     ();                                   ///< print usage
     363#if SVC_EXTENSION
    363364#if M0040_ADAPTIVE_RESOLUTION_CHANGE
    364365  Int       m_adaptiveResolutionChange;                       ///< Indicate adaptive resolution change frame
     
    384385  Bool      m_crossLayerPictureTypeAlignFlag;
    385386#endif
    386 #if N0147_IRAP_ALIGN_FLAG
    387387  Bool      m_crossLayerIrapAlignFlag;
    388 #endif
    389388#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    390389  Bool      m_crossLayerAlignedIdrOnlyFlag;
     
    402401  Int  m_nCGSLUTBit;
    403402#endif
     403#endif //SVC_EXTENSION
    404404public:
    405405  TAppEncCfg();
  • branches/SHM-6-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r756 r758  
    13361336    vps->setCrossLayerAlignedIdrOnlyFlag( m_crossLayerAlignedIdrOnlyFlag );
    13371337#endif
    1338 #if N0147_IRAP_ALIGN_FLAG
    13391338    vps->setCrossLayerIrapAlignFlag( m_crossLayerIrapAlignFlag );
    13401339    for(UInt layerCtr = 1;layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
     
    13521351      }
    13531352    }
    1354 #endif
    13551353#if M0040_ADAPTIVE_RESOLUTION_CHANGE
    13561354  vps->setSingleLayerForNonIrapFlag(m_adaptiveResolutionChange > 0 ? true : false);
  • 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
  • branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r756 r758  
    16311631#endif
    16321632
    1633 #if N0147_IRAP_ALIGN_FLAG && !IRAP_ALIGN_FLAG_IN_VPS_VUI
    16341633  READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" );
    16351634  vps->setCrossLayerIrapAlignFlag(uiCode);
    1636 #endif
    16371635
    16381636#if VPS_DPB_SIZE_TABLE
     
    18291827Void TDecCavlc::defaultVPSVUI( TComVPS* vps )
    18301828{
    1831 #if N0147_IRAP_ALIGN_FLAG
    18321829  // When not present, the value of all_layers_idr_aligned_flag is inferred to be equal to 0.
    18331830  vps->setCrossLayerIrapAlignFlag( false );
    1834 #endif
    18351831
    18361832#if M0040_ADAPTIVE_RESOLUTION_CHANGE
  • branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r754 r758  
    11091109  // actual decoding starts here
    11101110  xActivateParameterSets();
    1111 #if !O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS && N0147_IRAP_ALIGN_FLAG
     1111#if !O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS
    11121112  //Note setting O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS to 0 may cause decoder to crash.
    11131113  //When cross_layer_irap_aligned_flag is equal to 0, num_extra_slice_header_bits >=1
     
    17631763#endif
    17641764   
    1765 #if N0147_IRAP_ALIGN_FLAG
    17661765    if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag() )
    17671766    {
     
    17791778      }
    17801779    }
    1781 #endif
    17821780
    17831781    if( m_layerId > 0 && !pcSlice->isIntra() && pcSlice->getEnableTMVPFlag() )
  • branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r755 r758  
    12001200  WRITE_FLAG(vps->getPhaseAlignFlag(), "cross_layer_phase_alignment_flag" );
    12011201#endif
    1202 #if N0147_IRAP_ALIGN_FLAG && !IRAP_ALIGN_FLAG_IN_VPS_VUI
     1202#if !IRAP_ALIGN_FLAG_IN_VPS_VUI
    12031203  WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
    12041204#endif
  • branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r757 r758  
    11601160      if( pocCurr % m_pcCfg->getIntraPeriod() == 0 )
    11611161      {
    1162 #if N0147_IRAP_ALIGN_FLAG
    11631162        if(pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
    11641163        {
     
    11751174        }
    11761175        else
    1177 #endif
     1176        {
    11781177          pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
     1178        }
    11791179      }
    11801180
Note: See TracChangeset for help on using the changeset viewer.