Changeset 1204 in SHVCSoftware


Ignore:
Timestamp:
8 Jul 2015, 21:01:37 (9 years ago)
Author:
seregin
Message:

macro cleanup: POC_RESET_RESTRICTIONS

Location:
branches/SHM-dev/source/Lib
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r1203 r1204  
    23132313  Bool     isRASL()   { return (m_eNalUnitType == NAL_UNIT_CODED_SLICE_RASL_N || m_eNalUnitType == NAL_UNIT_CODED_SLICE_RASL_R); }
    23142314
    2315 #if POC_RESET_RESTRICTIONS
    23162315  Bool     isIDR()    { return (m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
    23172316                                  || m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP); }
    … …  
    23282327                                  || m_eNalUnitType == NAL_UNIT_RESERVED_VCL_N12
    23292328                                  || m_eNalUnitType == NAL_UNIT_RESERVED_VCL_N14 ); }
    2330 #endif
     2329
    23312330  Bool      getDiscardableFlag  ()                           { return m_bDiscardableFlag;    }
    23322331  Void      setDiscardableFlag  (Bool b)                     { m_bDiscardableFlag = b;       }

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

    r1203 r1204  
    4646#define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
    4747#define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
    48 #define POC_RESET_RESTRICTIONS           1      ///< Restrictions on semantics of POC reset-related syntax elements, including one item from R0223
    4948#define POC_RESET_VALUE_RESTRICTION      1      ///< R0223: Restriction on the value of full_poc_reset_flag
    5049#define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1203 r1204  
    19161916    {
    19171917      READ_CODE( 2, uiCode,       "poc_reset_idc"); pcSlice->setPocResetIdc(uiCode);
    1918 #if POC_RESET_RESTRICTIONS
     1918
    19191919      /* The value of poc_reset_idc shall not be equal to 1 or 2 for a RASL picture, a RADL picture,
    19201920      a sub-layer non-reference picture, or a picture that has TemporalId greater than 0,
    … …  
    19341934        assert( ! ( pcSlice->isCRA() || pcSlice->isBLA() ) );
    19351935      }
    1936 #endif
    19371936    }
    19381937    else

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r1203 r1204  
    4646UInt  TDecTop::m_uiPrevLayerId = MAX_UINT;
    4747Bool  TDecTop::m_bFirstSliceInSequence = true;
    48 #if POC_RESET_RESTRICTIONS
    4948Bool  TDecTop::m_checkPocRestrictionsForCurrAu       = false;
    5049Int   TDecTop::m_pocResetIdcOrCurrAu                 = -1;
    … …  
    5655Bool  TDecTop::m_picNonIdrWithRadlPresentFlag        = false;
    5756Bool  TDecTop::m_picNonIdrNoLpPresentFlag            = false;
    58 #endif
    5957#if POC_RESET_VALUE_RESTRICTION
    6058Int   TDecTop::m_crossLayerPocResetPeriodId          = -1;
    … …  
    121119#endif
    122120
    123 #if POC_RESET_RESTRICTIONS
    124121  resetPocRestrictionCheckParameters();
    125 #endif
    126122  m_pocResettingFlag        = false;
    127123  m_pocDecrementedInDPBFlag = false;
    … …  
    712708
    713709  m_apcSlicePilot->setNalUnitType(nalu.m_nalUnitType);
    714 #if POC_RESET_RESTRICTIONS
     710#if SVC_EXTENSION
    715711  m_apcSlicePilot->setTLayer( nalu.m_temporalId );
    716712#endif
    … …  
    889885    if(( m_layerId < m_uiPrevLayerId) ||( ( m_layerId == m_uiPrevLayerId) && bNewPOC)) // Decoding a lower layer than or same layer as previous - mark all earlier pictures as not in current AU
    890886    {
    891 #if POC_RESET_RESTRICTIONS
    892887      // New access unit; reset all variables related to POC reset restrictions
    893888      resetPocRestrictionCheckParameters();
    894 #endif
     889
    895890      markAllPicsAsNoCurrAu(m_apcSlicePilot->getVPS());
    896891
    … …  
    14241419#if POC_RESET_IDC_DECODER
    14251420    m_pcPic->setCurrAuFlag( true );
    1426 #if POC_RESET_RESTRICTIONS
     1421
    14271422    if( m_pcPic->getLayerId() > 0 && m_apcSlicePilot->isIDR() && !m_nonBaseIdrPresentFlag )
    14281423    {
    … …  
    15071502      }
    15081503    }
    1509 #endif
    15101504#endif
    15111505
    … …  
    25062500}
    25072501#endif
    2508 #if POC_RESET_RESTRICTIONS
     2502
    25092503Void TDecTop::resetPocRestrictionCheckParameters()
    25102504{
    … …  
    25192513  TDecTop::m_picNonIdrNoLpPresentFlag            = false;
    25202514}
    2521 #endif
    25222515
    25232516Void TDecTop::xCheckLayerReset()

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h

    r1203 r1204  
    164164public:
    165165#if SVC_EXTENSION
    166 #if POC_RESET_RESTRICTIONS
    167166  static Bool                    m_checkPocRestrictionsForCurrAu;
    168167  static Int                     m_pocResetIdcOrCurrAu;
    … …  
    174173  static Bool                    m_picNonIdrWithRadlPresentFlag;
    175174  static Bool                    m_picNonIdrNoLpPresentFlag;
    176 #endif
    177175#if POC_RESET_VALUE_RESTRICTION
    178176  static Int                     m_crossLayerPocResetPeriodId;
    … …  
    301299  Void initAsymLut(TComSlice *pcSlice);
    302300#endif
    303 #if POC_RESET_RESTRICTIONS
    304301  Void resetPocRestrictionCheckParameters();
    305 #endif
    306302  Void xCheckLayerReset();
    307303  Void xSetNoRaslOutputFlag();
Note: See TracChangeset for help on using the changeset viewer.