Changeset 76 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib/TLibCommon


Ignore:
Timestamp:
11 Mar 2013, 23:29:54 (12 years ago)
Author:
seregin
Message:

remove SET_SLICE_LAYER_ID

Location:
branches/HM-10.0-dev-SHM/source/Lib/TLibCommon
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComPicSym.cpp

    r54 r76  
    185185  {
    186186    m_apcTComSlice[m_uiNumAllocatedSlice-1]->copySliceInfo( m_apcTComSlice[m_uiNumAllocatedSlice-2] );
    187 #if SET_SLICE_LAYER_ID
     187#if SVC_EXTENSION
    188188    m_apcTComSlice[m_uiNumAllocatedSlice-1]->initSlice( m_apcTComSlice[m_uiNumAllocatedSlice-1]->getLayerId() );
    189189#else

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

    r71 r76  
    140140
    141141
    142 #if SET_SLICE_LAYER_ID
     142#if SVC_EXTENSION
    143143Void TComSlice::initSlice( UInt layerId )
    144144#else
    … …  
    146146#endif
    147147{
    148 #if SET_SLICE_LAYER_ID
     148#if SVC_EXTENSION
    149149  m_layerId = layerId;
    150150#endif

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

    r54 r76  
    13441344  TComSlice();
    13451345  virtual ~TComSlice();
    1346 #if SET_SLICE_LAYER_ID
     1346#if SVC_EXTENSION
    13471347  Void      initSlice       ( UInt layerId );
    13481348#else

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

    r74 r76  
    4949#define SVC_UPSAMPLING                   1      ///< upsampling filters
    5050#define PHASE_DERIVATION_IN_INTEGER      1      ///< upsampling filters implementation using only integer arithmetic
    51 #define SET_SLICE_LAYER_ID               1      ///< set layerId to the slice
    52 #define BUGFIX_925                       1      ///< bug fix ticket #925
    5351#define ENCODER_BUGFIX                   1      ///< L0167: encoder bug fix for inter mode
    5452#define CHROMA_UPSAMPLING                1      ///< L0335: Chroma upsampling with 5 bits coefficients
Note: See TracChangeset for help on using the changeset viewer.