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


Ignore:
Timestamp:
8 Jul 2015, 22:33:03 (10 years ago)
Author:
seregin
Message:

macro cleanup: POC_RESET_IDC_ENCODER

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

Legend:

Unmodified
Added
Removed

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

    r1208 r1209  
    134134, m_pocMsbValPresentFlag          ( false )
    135135, m_pocMsbValNeeded               ( false )
    136 #if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
    137136, m_picOrderCntLsb (0)
    138 #endif
    139137#endif //SVC_EXTENSION
    140138{
    … …  
    197195  m_activeNumILRRefIdx        = 0;
    198196  m_interLayerPredEnabledFlag = 0;
     197  m_picOrderCntLsb = 0;
    199198#endif
    200199
    … …  
    226225  m_pocMsbValRequiredFlag         = false;
    227226  m_pocMsbValPresentFlag          = false;
    228 #if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
    229   m_picOrderCntLsb = 0;
    230 #endif
    231227  m_pocMsbValNeeded  = false;
    232228  m_pocResetDeltaPoc = 0;
    … …  
    287283  while ( iterPic != rcListPic.end() )
    288284  {
    289 #if POC_RESET_IDC_ENCODER
    290     if( (pcPic->getPOC() == poc) && (pcPic->getSlice(0)->isReferenced()) )
     285#if SVC_EXTENSION
     286    if( pcPic->getPOC() == poc && pcPic->getSlice(0)->isReferenced() )
    291287#else
    292288    if(pcPic->getPOC() == poc)
    … …  
    886882      rpcPic->setCurrSliceIdx(0);
    887883#if NO_CLRAS_OUTPUT_FLAG
    888 #if POC_RESET_IDC_ENCODER
    889       if (noClrasOutputFlag)
     884      if( noClrasOutputFlag )
    890885      {
    891886        rpcPic->getSlice(0)->setReferenced(false);  // all layers // TODO. This does not mark all layers
    … …  
    893888      else
    894889      {
    895         if (rpcPic->getLayerId() == m_layerId) rpcPic->getSlice(0)->setReferenced(false);  // only current layer
    896       }
    897 #else
    898       if (noClrasOutputFlag)
    899       {
    900         if (rpcPic->getPOC() != pocCurr) rpcPic->getSlice(0)->setReferenced(false);  // all layers
    901       }
    902       else
    903       {
    904         if (rpcPic->getPOC() != pocCurr && rpcPic->getLayerId() == m_layerId) rpcPic->getSlice(0)->setReferenced(false);  // only current layer
    905       }
    906 #endif
     890        if( rpcPic->getLayerId() == m_layerId )
     891        {
     892          rpcPic->getSlice(0)->setReferenced(false);  // only current layer
     893        }
     894      }
    907895#else
    908896      if (rpcPic->getPOC() != pocCurr) rpcPic->getSlice(0)->setReferenced(false);
    … …  
    910898      iterPic++;
    911899    }
    912 #if POC_RESET_IDC_ENCODER
    913     this->getPic()->getSlice(0)->setReferenced(true);   // Mark the current picture back as refererced.
    914 #endif
     900
     901#if SVC_EXTENSION
     902    m_pcPic->getSlice(0)->setReferenced(true);   // Mark the current picture back as refererced.
     903#endif
     904
    915905    if ( getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP
    916906      || getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_RADL
    … …  
    11411131}
    11421132
    1143 #if POC_RESET_IDC_ENCODER
     1133#if SVC_POC
    11441134Void TComSlice::checkLeadingPictureRestrictions(TComList<TComPic*>& rcListPic, Bool usePocBeforeReset)
    11451135#else
    … …  
    12301220         nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL)
    12311221      {
    1232 #if POC_RESET_IDC_ENCODER
     1222#if SVC_POC
    12331223        if( usePocBeforeReset )
    12341224        {
    … …  
    12591249          if(this->getAssociatedIRAPPOC() != rpcPic->getPOC())
    12601250          {
    1261 #if POC_RESET_IDC_ENCODER
     1251#if SVC_POC
    12621252            if( usePocBeforeReset )
    12631253            {
    … …  
    12871277          // rpcPic is a picture that preceded the leading in decoding order since it exist in the DPB
    12881278          // rpcPic would violate the constraint if it was a trailing picture
    1289 #if POC_RESET_IDC_ENCODER
     1279#if SVC_POC
    12901280          if( usePocBeforeReset )
    12911281          {
    … …  
    38473837}
    38483838#endif
    3849 #if POC_RESET_IDC_ENCODER
     3839
    38503840Void TComSlice::decrementRefPocValues(Int const decrementValue)
    38513841{
    … …  
    38783868  }
    38793869}
    3880 #endif
    38813870
    38823871Void TComSlice::setRefPicListModificationSvc()

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

    r1208 r1209  
    18951895  Int         m_iLastIDR;
    18961896  Int         m_iAssociatedIRAP;
    1897 #if POC_RESET_IDC_ENCODER
    1898   Int         m_associatedIrapPocBeforeReset;
    1899 #endif
    19001897  NalUnitType m_iAssociatedIRAPType;
    19011898  static Int  m_prevTid0POC;
    … …  
    19851982
    19861983#if SVC_EXTENSION
     1984  Int         m_associatedIrapPocBeforeReset;
    19871985  Bool        m_firstSliceInPic;
    19881986  Bool        m_availableForTMVPRefFlag;
    … …  
    20122010  Bool        m_pocMsbValNeeded;
    20132011  Int         m_pocResetDeltaPoc;
    2014 #if POC_RESET_IDC_ENCODER
    20152012  Int         m_pocValueBeforeReset;
    2016 #endif
    2017 #if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
    20182013  Int         m_picOrderCntLsb;
    2019 #endif
    20202014#if Q0048_CGS_3D_ASYMLUT
    20212015  Int        m_nCGSOverWritePPS;  // for optimization, not output to bitstream
    … …  
    21372131  Void      setPrevTid0POC( Int x ) { m_prevTid0POC = x; }
    21382132#endif
    2139 #if POC_RESET_IDC_ENCODER
    21402133  Void      setAssociatedIrapPocBeforeReset(Int x) { m_associatedIrapPocBeforeReset = x; }
    21412134  Int       getAssociatedIrapPocBeforeReset(     ) { return m_associatedIrapPocBeforeReset; }
    2142 #endif
    21432135
    21442136  Void      setRefPicList       ( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr = false, TComPic** ilpPic = NULL );
    … …  
    21852177  Void setTLayerInfo( UInt uiTLayer );
    21862178  Void decodingMarking( TComList<TComPic*>& rcListPic, Int iGOPSIze, Int& iMaxRefPicNum );
    2187 #if POC_RESET_IDC_ENCODER
     2179#if SVC_POC
    21882180  Void checkLeadingPictureRestrictions(TComList<TComPic*>& rcListPic, Bool usePocBeforeReset = false);
    21892181#else
    … …  
    23722364  Bool      getRadlPicFlag      ();
    23732365#endif
    2374 #if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
    23752366  Int       getPicOrderCntLsb() { return m_picOrderCntLsb; }
    23762367  Void      setPicOrderCntLsb(Int x) { m_picOrderCntLsb = x; }
    2377 #endif
    2378 
    2379 #if POC_RESET_IDC_ENCODER
     2368
    23802369  Int       getPocValueBeforeReset ()                        { return m_pocValueBeforeReset; }
    23812370  Void      setPocValueBeforeReset (Int x)                   { m_pocValueBeforeReset = x ;   }
    23822371  Void      decrementRefPocValues(Int const decrementValue);
    23832372  Int       getCurrMsb( Int currLsb, Int prevLsb, Int prevMsb, Int maxLsbVal );
    2384 #endif
     2373
    23852374  Int       getReferenceLayerIdc( UInt refLayerId );
    23862375

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

    r1208 r1209  
    6969#define POC_RESET_IDC                    1      ///< JCTVC-P0041: Include poc_reset_idc and related derivation
    7070#if POC_RESET_IDC
    71 #define POC_RESET_IDC_ENCODER            1      ///< JCTVC-P0041: Include support of enabling POC reset at the encoder
    7271#define POC_RESET_IDC_DECODER            1      ///< JCTVC-P0041: Include support of enabling POC reset at the decoder
    7372#endif
Note: See TracChangeset for help on using the changeset viewer.