Changeset 1131 in SHVCSoftware


Ignore:
Timestamp:
7 Jul 2015, 03:31:59 (9 years ago)
Author:
seregin
Message:

macro cleanup: R0071_IRAP_EOS_CROSS_LAYER_IMPACTS

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

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r1130 r1131  
    839839#endif
    840840  Int*    cfg_waveFrontSynchro[MAX_LAYERS];
    841 
    842 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    843841  Int*    cfg_layerSwitchOffBegin[MAX_LAYERS];
    844842  Int*    cfg_layerSwitchOffEnd[MAX_LAYERS];
    845 #endif
    846843
    847844#if MULTIPLE_PTL_SUPPORT
    … …  
    941938    cfg_auxId[layer]                = &m_acLayerCfg[layer].m_auxId;
    942939#endif
    943 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    944     cfg_layerSwitchOffBegin[layer] = &m_acLayerCfg[layer].m_layerSwitchOffBegin;
    945     cfg_layerSwitchOffEnd[layer]   = &m_acLayerCfg[layer].m_layerSwitchOffEnd;
    946 #endif
     940    cfg_layerSwitchOffBegin[layer]  = &m_acLayerCfg[layer].m_layerSwitchOffBegin;
     941    cfg_layerSwitchOffEnd[layer]    = &m_acLayerCfg[layer].m_layerSwitchOffEnd;
    947942#if MULTIPLE_PTL_SUPPORT
    948943    cfg_layerPTLIdx[layer]          = &m_acLayerCfg[layer].m_layerPTLIdx;
    … …  
    16861681#endif
    16871682  ("AdaptiveResolutionChange",     m_adaptiveResolutionChange, 0, "Adaptive resolution change frame number. Should coincide with EL RAP picture. (0: disable)")
    1688 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    16891683  ("LayerSwitchOffBegin%d", cfg_layerSwitchOffBegin, 0, MAX_LAYERS, "Switch layer %d off after given poc")
    16901684  ("LayerSwitchOffEnd%d", cfg_layerSwitchOffEnd, 0, MAX_LAYERS, "Switch layer %d on at given poc")
    1691 #endif
    16921685  ("SkipPictureAtArcSwitch",     m_skipPictureAtArcSwitch, false, "Code the higher layer picture in ARC up-switching as a skip picture. (0: disable)")
    16931686#if N0383_IL_CONSTRAINED_TILE_SETS_SEI
    … …  
    19041897#endif
    19051898
    1906 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
     1899#if SVC_EXTENSION
    19071900  for (Int layer = 0; layer < MAX_LAYERS; layer++)
    19081901  {

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

    r1090 r1131  
    147147#endif
    148148
    149 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    150149  Int       m_layerSwitchOffBegin;
    151150  Int       m_layerSwitchOffEnd;
    152 #endif
    153151
    154152#if MULTIPLE_PTL_SUPPORT

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r1130 r1131  
    788788
    789789    m_acTEncTop[layer].setAdaptiveResolutionChange               ( m_adaptiveResolutionChange );
    790 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    791     m_acTEncTop[layer].setLayerSwitchOffBegin                    (m_acLayerCfg[layer].m_layerSwitchOffBegin);
    792     m_acTEncTop[layer].setLayerSwitchOffEnd                      (m_acLayerCfg[layer].m_layerSwitchOffEnd);
    793 #endif
     790    m_acTEncTop[layer].setLayerSwitchOffBegin                    ( m_acLayerCfg[layer].m_layerSwitchOffBegin );
     791    m_acTEncTop[layer].setLayerSwitchOffEnd                      ( m_acLayerCfg[layer].m_layerSwitchOffEnd );
    794792#if AUXILIARY_PICTURES
    795793    m_acTEncTop[layer].setChromaFormatIDC                        ( m_acLayerCfg[layer].m_chromaFormatIDC );

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

    r1130 r1131  
    138138#define VPS_EXTN_PROFILE_INFO            1      ///< Include profile information for layer sets in VPS extension
    139139#define VPS_EXTN_DIRECT_REF_LAYERS       1      ///< Include indication of direct dependency of layers in VPS extension
    140 #define R0071_IRAP_EOS_CROSS_LAYER_IMPACTS 1
    141140
    142141#define VPS_VUI_TILES_NOT_IN_USE__FLAG   1      ///< JCTVC-O0226: VPS VUI flag to indicate tile not in use

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

    r1130 r1131  
    106106  m_isLastNALWasEos = false;
    107107#endif
    108 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    109108  m_lastPicHasEos = false;
    110 #endif
    111109#if NO_CLRAS_OUTPUT_FLAG
    112110  m_noClrasOutputFlag          = false;
    … …  
    852850      setNoClrasOutputFlag(true);
    853851    }
    854 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    855852    else if( m_lastPicHasEos )
    856853    {
    857854      setNoClrasOutputFlag(true);
    858855    }
    859 #endif
    860856    else if ( m_apcSlicePilot->getBlaPicFlag() )
    861857    {
    … …  
    14831479    }
    14841480#endif
    1485 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
     1481
     1482#if SVC_EXTENSION
    14861483    xCheckLayerReset();
    14871484    xSetLayerInitializedFlag();
    14881485#endif
     1486
    14891487    // Buffer initialize for prediction.
    14901488    m_cPrediction.initTempBuff(m_apcSlicePilot->getSPS()->getChromaFormatIdc());
    … …  
    19931991  setFirstPicInLayerDecodedFlag(true);
    19941992#endif
    1995 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
     1993#if SVC_EXTENSION
    19961994  m_lastPicHasEos = false;
    19971995#endif
    … …  
    22482246#if Q0177_EOS_CHECKS
    22492247      assert( m_isLastNALWasEos == false );
    2250 #if !R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    2251       //Check layer id of the nalu. if it is not 0, give a warning message and just return without doing anything.
    2252       if (nalu.m_layerId > 0)
    2253       {
    2254         printf( "\nThis bitstream has EOS with non-zero layer id.\n" );
    2255         return false;
    2256       }
    2257 #endif
     2248
    22582249      m_isLastNALWasEos = true;
    2259 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    22602250      m_lastPicHasEos = true;
    2261 #endif
    22622251#endif
    22632252      m_associatedIRAPType = NAL_UNIT_INVALID;
    … …  
    26872676#endif
    26882677
    2689 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    26902678Void TDecTop::xCheckLayerReset()
    26912679{
    … …  
    27722760  }
    27732761}
    2774 #endif
    2775 
    2776 #if SVC_EXTENSION
     2762
    27772763Void TDecTop::xDeriveSmallestLayerId(TComVPS* vps)
    27782764{
    … …  
    28112797  }
    28122798}
    2813 #endif
    28142799
    28152800Void TDecTop::xSetSpatialEnhLayerFlag(TComSlice* slice, TComPic* pic)

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

    r1111 r1131  
    124124  Bool                    m_isLastNALWasEos;
    125125#endif
    126 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    127126  Bool                    m_lastPicHasEos;
    128 #endif
    129127  static UInt             m_prevPOC;        // POC of the previous slice
    130128  static UInt             m_uiPrevLayerId;  // LayerId of the previous slice
    … …  
    310308  Void      xDecodeSEI( TComInputBitstream* bs, const NalUnitType nalUnitType );
    311309
     310#if SVC_EXTENSION
    312311#if NO_CLRAS_OUTPUT_FLAG
    313312  Int  getNoClrasOutputFlag()                { return m_noClrasOutputFlag;}
    … …  
    324323  Void resetPocRestrictionCheckParameters();
    325324#endif
    326 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    327325  Void xCheckLayerReset();
    328326  Void xSetNoRaslOutputFlag();

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

    r1130 r1131  
    371371  Int       m_elRapSliceBEnabled;
    372372  Int       m_adaptiveResolutionChange;
    373 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    374373  int       m_layerSwitchOffBegin;
    375374  int       m_layerSwitchOffEnd;
    376 #endif
    377375  Bool      m_altOutputLayerFlag;
    378376  Int       m_skipPictureAtArcSwitch;
    … …  
    10141012  Void      setAdaptiveResolutionChange(Int x)               { m_adaptiveResolutionChange = x;    }
    10151013  Int       getAdaptiveResolutionChange()                    { return m_adaptiveResolutionChange; }
    1016 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    1017   Void      setLayerSwitchOffBegin(Int x)    { m_layerSwitchOffBegin = x;    }
    1018   Int       getLayerSwitchOffBegin()         { return m_layerSwitchOffBegin; }
    1019   Void      setLayerSwitchOffEnd(Int x)      { m_layerSwitchOffEnd = x;      }
    1020   Int       getLayerSwitchOffEnd()           { return m_layerSwitchOffEnd;   }
    1021 #endif
    1022   Void      setSkipPictureAtArcSwitch(Int x) { m_skipPictureAtArcSwitch = x;    }
    1023   Int       getSkipPictureAtArcSwitch()      { return m_skipPictureAtArcSwitch; }
     1014  Void      setLayerSwitchOffBegin(Int x)                    { m_layerSwitchOffBegin = x;    }
     1015  Int       getLayerSwitchOffBegin()                         { return m_layerSwitchOffBegin; }
     1016  Void      setLayerSwitchOffEnd(Int x)                      { m_layerSwitchOffEnd = x;      }
     1017  Int       getLayerSwitchOffEnd()                           { return m_layerSwitchOffEnd;   }
     1018  Void      setSkipPictureAtArcSwitch(Int x)                 { m_skipPictureAtArcSwitch = x;    }
     1019  Int       getSkipPictureAtArcSwitch()                      { return m_skipPictureAtArcSwitch; }
    10241020#if AUXILIARY_PICTURES
    1025   Void         setChromaFormatIDC(ChromaFormat x) { m_chromaFormatIDC = x;    }
    1026   ChromaFormat getChromaFormatIDC()               { return m_chromaFormatIDC; }
    1027 #endif
    1028   Bool      getAltOuputLayerFlag() const { return m_altOutputLayerFlag; }
    1029   Void      setAltOuputLayerFlag(Bool b) { m_altOutputLayerFlag = b;    }
     1021  Void         setChromaFormatIDC(ChromaFormat x)            { m_chromaFormatIDC = x;    }
     1022  ChromaFormat getChromaFormatIDC()                          { return m_chromaFormatIDC; }
     1023#endif
     1024  Bool      getAltOuputLayerFlag() const                     { return m_altOutputLayerFlag; }
     1025  Void      setAltOuputLayerFlag(Bool b)                     { m_altOutputLayerFlag = b;    }
    10301026#if O0149_CROSS_LAYER_BLA_FLAG
    1031   Bool      getCrossLayerBLAFlag() const { return m_crossLayerBLAFlag; }
    1032   Void      setCrossLayerBLAFlag(Bool b) { m_crossLayerBLAFlag = b;    }
     1027  Bool      getCrossLayerBLAFlag() const                     { return m_crossLayerBLAFlag; }
     1028  Void      setCrossLayerBLAFlag(Bool b)                     { m_crossLayerBLAFlag = b;    }
    10331029#endif
    10341030#if FAST_INTRA_SHVC
    1035   Bool      getUseFastIntraScalable         ()      { return m_useFastIntraScalable; }
    1036   Void      setUseFastIntraScalable         ( Bool  b )     { m_useFastIntraScalable = b; }
     1031  Bool      getUseFastIntraScalable         ()               { return m_useFastIntraScalable; }
     1032  Void      setUseFastIntraScalable         ( Bool  b )      { m_useFastIntraScalable = b; }
    10371033#endif
    10381034#if VPS_EXTN_DIRECT_REF_LAYERS

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r1130 r1131  
    122122  m_lastPocPeriodId = -1;
    123123#endif
    124 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    125124  m_noRaslOutputFlag = false;
    126125  m_prevPicHasEos    = false;
    127 #endif
    128126#endif //SVC_EXTENSION
    129127
    … …  
    11111109      continue;
    11121110    }
    1113 #endif
    1114 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
     1111
    11151112    if (pocCurr > m_pcEncTop->getLayerSwitchOffBegin() && pocCurr < m_pcEncTop->getLayerSwitchOffEnd())
    11161113    {
    … …  
    12081205    }
    12091206#endif
    1210 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
     1207
    12111208    // Set the nal unit type
    12121209    pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR, isField));
    1213 #endif
     1210
    12141211#if NO_CLRAS_OUTPUT_FLAG
    12151212    if (m_layerId == 0 &&
    … …  
    12251222        m_pcEncTop->setNoClrasOutputFlag(true);
    12261223      }
    1227 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    12281224      else if (m_prevPicHasEos)
    12291225      {
    12301226        m_pcEncTop->setNoClrasOutputFlag(true);
    12311227      }
    1232 #endif
    12331228      else if (pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP
    12341229            || pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_RADL
    … …  
    12581253    }
    12591254#endif
    1260 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    12611255    xCheckLayerReset(pcSlice);
    12621256    xSetNoRaslOutputFlag(pcSlice);
    12631257    xSetLayerInitializedFlag(pcSlice);
    1264 #endif
     1258
    12651259    if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && m_layerId > 0 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())
    12661260    {
    … …  
    13651359    }
    13661360   
    1367 #if !R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    1368     // Set the nal unit type
    1369     pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR, isField));
    1370 #endif
    13711361#if SVC_EXTENSION
    13721362    if (m_layerId > 0)
    … …  
    15351525      }     
    15361526    }
     1527#else
     1528    // Set the nal unit type
     1529    pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR, isField));
    15371530#endif //#if SVC_EXTENSION
    15381531
    … …  
    29262919      m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
    29272920
    2928 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    2929       if (pcSlice->isIRAP())
     2921#if SVC_EXTENSION
     2922      if( pcSlice->isIRAP() )
    29302923      {
    29312924        //the inference for NoOutputPriorPicsFlag
    … …  
    34513444    }
    34523445
    3453 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
     3446#if SVC_EXTENSION
    34543447    m_prevPicHasEos = false;
    34553448    if (m_pcCfg->getLayerSwitchOffBegin() < m_pcCfg->getLayerSwitchOffEnd())
    … …  
    53415334#endif
    53425335
    5343 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    53445336Void TEncGOP::xCheckLayerReset(TComSlice *slice)
    53455337{
    … …  
    54575449  }
    54585450}
    5459 #endif // R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    5460 
    54615451#endif //SVC_EXTENSION
    54625452

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h

    r1089 r1131  
    175175  Int   m_lastPocPeriodId;
    176176#endif
    177 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    178177  Bool  m_noRaslOutputFlag;
    179178  Bool  m_prevPicHasEos;
    180 #endif
    181179#endif
    182180 
    … …  
    315313  Void free_mem2DintWithPad(Int **array2D, Int iPadY, Int iPadX);
    316314#endif
    317 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    318315  Void xCheckLayerReset(TComSlice *slice);
    319316  Void xSetNoRaslOutputFlag(TComSlice *slice);
    320317  Void xSetLayerInitializedFlag(TComSlice *slice);
    321 #endif
    322318#endif //SVC_EXTENSION
    323319};// END CLASS DEFINITION TEncGOP

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h

    r1093 r1131  
    156156  Int                     m_currPocMsb;
    157157#endif
    158 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
    159158  Bool                    m_prevPicHasEos;
    160 #endif
    161159#endif //SVC_EXTENSION
    162160protected:
Note: See TracChangeset for help on using the changeset viewer.