Changeset 567 in SHVCSoftware for branches/SHM-5.0-dev/source


Ignore:
Timestamp:
27 Jan 2014, 18:33:04 (11 years ago)
Author:
seregin
Message:

rename layers present SEI to layers not present SEI

Location:
branches/SHM-5.0-dev/source
Files:
13 edited

Legend:

Unmodified
Added
Removed

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

    r560 r567  
    921921  ("SEIGradualDecodingRefreshInfo",  m_gradualDecodingRefreshInfoEnabled,      0, "Control generation of gradual decoding refresh information SEI message")
    922922  ("SEIDecodingUnitInfo",             m_decodingUnitInfoSEIEnabled,                       0, "Control generation of decoding unit information SEI message.")
    923 #if M0043_LAYERS_PRESENT_SEI
    924   ("SEILayersPresent",               m_layersPresentSEIEnabled,                0, "Control generation of layers present SEI message")
     923#if LAYERS_NOT_PRESENT_SEI
     924  ("SEILayersNotPresent",            m_layersNotPresentSEIEnabled,             0, "Control generation of layers not present SEI message")
    925925#endif
    926926  ("SEISOPDescription",              m_SOPDescriptionSEIEnabled,              0, "Control generation of SOP description SEI messages")

  • branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncCfg.h

    r559 r567  
    280280  Int       m_gradualDecodingRefreshInfoEnabled;
    281281  Int       m_decodingUnitInfoSEIEnabled;
    282 #if M0043_LAYERS_PRESENT_SEI
    283   Int       m_layersPresentSEIEnabled;
     282#if LAYERS_NOT_PRESENT_SEI
     283  Int       m_layersNotPresentSEIEnabled;
    284284#endif
    285285  Int       m_SOPDescriptionSEIEnabled;

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

    r564 r567  
    483483    m_acTEncTop[layer].setGradualDecodingRefreshInfoEnabled( m_gradualDecodingRefreshInfoEnabled );
    484484    m_acTEncTop[layer].setDecodingUnitInfoSEIEnabled( m_decodingUnitInfoSEIEnabled );
    485 #if M0043_LAYERS_PRESENT_SEI
    486     m_acTEncTop[layer].setLayersPresentSEIEnabled( m_layersPresentSEIEnabled );
     485#if LAYERS_NOT_PRESENT_SEI
     486    m_acTEncTop[layer].setLayersNotPresentSEIEnabled( m_layersNotPresentSEIEnabled );
    487487#endif
    488488    m_acTEncTop[layer].setSOPDescriptionSEIEnabled( m_SOPDescriptionSEIEnabled );
    … …  
    797797  m_cTEncTop.setGradualDecodingRefreshInfoEnabled( m_gradualDecodingRefreshInfoEnabled );
    798798  m_cTEncTop.setDecodingUnitInfoSEIEnabled( m_decodingUnitInfoSEIEnabled );
    799 #if M0043_LAYERS_PRESENT_SEI
    800   m_cTEncTop.setLayersPresentSEIEnabled( m_layersPresentSEIEnabled );
     799#if LAYERS_NOT_PRESENT_SEI
     800  m_cTEncTop.setLayersNotPresentSEIEnabled( m_layersNotPresentSEIEnabled );
    801801#endif
    802802  m_cTEncTop.setSOPDescriptionSEIEnabled( m_SOPDescriptionSEIEnabled );

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/SEI.h

    r442 r567  
    7272    SCALABLE_NESTING                     = 133,
    7373    REGION_REFRESH_INFO                  = 134,
    74 #if M0043_LAYERS_PRESENT_SEI
    75     LAYERS_PRESENT                       = 137,
     74#if LAYERS_NOT_PRESENT_SEI
     75    LAYERS_NOT_PRESENT                   = 137,
    7676#endif
    7777#if N0383_IL_CONSTRAINED_TILE_SETS_SEI
    … …  
    319319};
    320320
    321 #if M0043_LAYERS_PRESENT_SEI
    322 class SEILayersPresent : public SEI
    323 {
    324 public:
    325   PayloadType payloadType() const { return LAYERS_PRESENT; }
    326 
    327   SEILayersPresent() {}
    328   virtual ~SEILayersPresent() {}
     321#if LAYERS_NOT_PRESENT_SEI
     322class SEILayersNotPresent : public SEI
     323{
     324public:
     325  PayloadType payloadType() const { return LAYERS_NOT_PRESENT; }
     326
     327  SEILayersNotPresent() {}
     328  virtual ~SEILayersNotPresent() {}
    329329
    330330  UInt m_activeVpsId;
    331331  UInt m_vpsMaxLayers;
    332   Bool m_layerPresentFlag[MAX_LAYERS];
     332  Bool m_layerNotPresentFlag[MAX_LAYERS];
    333333};
    334334#endif

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

    r566 r567  
    178178
    179179#define VIEW_ID_RELATED_SIGNALING        1      ///< Introduce syntax elements view_id and view_id_val
    180 #define M0043_LAYERS_PRESENT_SEI         0      ///< JCTVC-M0043: add layers present SEI. Macro shall be equal to 0 according to the JCTVC-N0174 discussion. The code is to be removed.
     180#define LAYERS_NOT_PRESENT_SEI           1      ///< JCTVC-M0043: add layers not present SEI.
    181181#define N0383_IL_CONSTRAINED_TILE_SETS_SEI  1
    182182#define N0065_LAYER_POC_ALIGNMENT        1

  • branches/SHM-5.0-dev/source/Lib/TLibDecoder/SEIread.cpp

    r442 r567  
    9393    fprintf( g_hTrace, "===========Tone Mapping Info SEI message ===========\n");
    9494    break;
    95 #if M0043_LAYERS_PRESENT_SEI
    96   case SEI::LAYERS_PRESENT:
     95#if LAYERS_NOT_PRESENT_SEI
     96  case SEI::LAYERS_NOT_PRESENT:
    9797    fprintf( g_hTrace, "=========== Layers Present SEI message ===========\n");
    9898    break;
    … …  
    119119 * unmarshal a single SEI message from bitstream bs
    120120 */
    121 #if M0043_LAYERS_PRESENT_SEI
     121#if LAYERS_NOT_PRESENT_SEI
    122122void SEIReader::parseSEImessage(TComInputBitstream* bs, SEIMessages& seis, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps)
    123123#else
    … …  
    130130  do
    131131  {
    132 #if M0043_LAYERS_PRESENT_SEI
     132#if LAYERS_NOT_PRESENT_SEI
    133133    xReadSEImessage(seis, nalUnitType, vps, sps);
    134134#else
    … …  
    145145}
    146146
    147 #if M0043_LAYERS_PRESENT_SEI
     147#if LAYERS_NOT_PRESENT_SEI
    148148Void SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps)
    149149#else
    … …  
    254254      xParseSEIToneMappingInfo((SEIToneMappingInfo&) *sei, payloadSize);
    255255      break;
    256 #if M0043_LAYERS_PRESENT_SEI
    257     case SEI::LAYERS_PRESENT:
     256#if LAYERS_NOT_PRESENT_SEI
     257    case SEI::LAYERS_NOT_PRESENT:
    258258      if (!vps)
    259259      {
    260         printf ("Warning: Found Layers present SEI message, but no active VPS is available. Ignoring.");
     260        printf ("Warning: Found Layers not present SEI message, but no active VPS is available. Ignoring.");
    261261      }
    262262      else
    263263      {
    264         sei = new SEILayersPresent;
    265         xParseSEILayersPresent((SEILayersPresent&) *sei, payloadSize, vps);
     264        sei = new SEILayersNotPresent;
     265        xParseSEILayersNotPresent((SEILayersNotPresent&) *sei, payloadSize, vps);
    266266      }
    267267      break;
    … …  
    279279    case SEI::SCALABLE_NESTING:
    280280      sei = new SEIScalableNesting;
    281 #if M0043_LAYERS_PRESENT_SEI
     281#if LAYERS_NOT_PRESENT_SEI
    282282      xParseSEIScalableNesting((SEIScalableNesting&) *sei, nalUnitType, payloadSize, vps, sps);
    283283#else
    … …  
    741741}
    742742
    743 #if M0043_LAYERS_PRESENT_SEI
    744 Void SEIReader::xParseSEILayersPresent(SEILayersPresent &sei, UInt payloadSize, TComVPS *vps)
     743#if LAYERS_NOT_PRESENT_SEI
     744Void SEIReader::xParseSEILayersNotPresent(SEILayersNotPresent &sei, UInt payloadSize, TComVPS *vps)
    745745{
    746746  UInt uiCode;
    … …  
    752752  for (; i < sei.m_vpsMaxLayers; i++)
    753753  {
    754     READ_FLAG( uiCode,         "layer_present_flag"   ); sei.m_layerPresentFlag[i] = uiCode ? true : false;
     754    READ_FLAG( uiCode,         "layer_not_present_flag"   ); sei.m_layerNotPresentFlag[i] = uiCode ? true : false;
    755755  }
    756756  for (; i < MAX_LAYERS; i++)
    757757  {
    758     sei.m_layerPresentFlag[i] = false;
     758    sei.m_layerNotPresentFlag[i] = false;
    759759  }
    760760  xParseByteAlign();
    … …  
    830830#endif
    831831
    832 #if M0043_LAYERS_PRESENT_SEI
     832#if LAYERS_NOT_PRESENT_SEI
    833833Void SEIReader::xParseSEIScalableNesting(SEIScalableNesting& sei, const NalUnitType nalUnitType, UInt payloadSize, TComVPS *vps, TComSPS *sps)
    834834#else
    … …  
    876876  // read nested SEI messages
    877877  do {
    878 #if M0043_LAYERS_PRESENT_SEI
     878#if LAYERS_NOT_PRESENT_SEI
    879879    xReadSEImessage(sei.m_nestedSEIs, nalUnitType, vps, sps);
    880880#else

  • branches/SHM-5.0-dev/source/Lib/TLibDecoder/SEIread.h

    r442 r567  
    5656  SEIReader() {};
    5757  virtual ~SEIReader() {};
    58 #if M0043_LAYERS_PRESENT_SEI
     58#if LAYERS_NOT_PRESENT_SEI
    5959  Void parseSEImessage(TComInputBitstream* bs, SEIMessages& seis, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps);
    6060#else
    … …  
    6262#endif
    6363protected:
    64 #if M0043_LAYERS_PRESENT_SEI
     64#if LAYERS_NOT_PRESENT_SEI
    6565  Void xReadSEImessage                (SEIMessages& seis, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps);
    6666#else
    … …  
    8383  Void xParseSEIInterLayerConstrainedTileSets (SEIInterLayerConstrainedTileSets &sei, UInt payloadSize);
    8484#endif
    85 #if M0043_LAYERS_PRESENT_SEI
    86   Void xParseSEILayersPresent         (SEILayersPresent &sei, UInt payloadSize, TComVPS *vps);
     85#if LAYERS_NOT_PRESENT_SEI
     86  Void xParseSEILayersNotPresent      (SEILayersNotPresent &sei, UInt payloadSize, TComVPS *vps);
    8787  Void xParseSEIScalableNesting       (SEIScalableNesting& sei, const NalUnitType nalUnitType, UInt payloadSize, TComVPS *vps, TComSPS *sps);
    8888#else

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

    r562 r567  
    16561656    }
    16571657#endif
    1658 #if M0043_LAYERS_PRESENT_SEI
     1658#if LAYERS_NOT_PRESENT_SEI
    16591659    m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder.getActiveVPS(), m_parameterSetManagerDecoder.getActiveSPS() );
    16601660#else
    … …  
    16641664  else
    16651665  {
    1666 #if M0043_LAYERS_PRESENT_SEI
     1666#if LAYERS_NOT_PRESENT_SEI
    16671667    m_seiReader.parseSEImessage( bs, m_SEIs, nalUnitType, m_parameterSetManagerDecoder.getActiveVPS(), m_parameterSetManagerDecoder.getActiveSPS() );
    16681668#else
    … …  
    16841684  if(nalUnitType == NAL_UNIT_SUFFIX_SEI)
    16851685  {
    1686 #if M0043_LAYERS_PRESENT_SEI
     1686#if LAYERS_NOT_PRESENT_SEI
    16871687    m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder.getActiveVPS(), m_parameterSetManagerDecoder.getActiveSPS() );
    16881688#else
    … …  
    16921692  else
    16931693  {
    1694 #if M0043_LAYERS_PRESENT_SEI
     1694#if LAYERS_NOT_PRESENT_SEI
    16951695    m_seiReader.parseSEImessage( bs, m_SEIs, nalUnitType, m_parameterSetManagerDecoder.getActiveVPS(), m_parameterSetManagerDecoder.getActiveSPS() );
    16961696#else

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/SEIwrite.cpp

    r442 r567  
    8787    fprintf( g_hTrace, "=========== Tone Mapping Info SEI message ===========\n");
    8888    break;
    89 #if M0043_LAYERS_PRESENT_SEI
    90   case SEI::LAYERS_PRESENT:
     89#if LAYERS_NOT_PRESENT_SEI
     90  case SEI::LAYERS_NOT_PRESENT:
    9191    fprintf( g_hTrace, "=========== Layers Present SEI message ===========\n");
    9292    break;
    … …  
    150150    xWriteSEIToneMappingInfo(*static_cast<const SEIToneMappingInfo*>(&sei));
    151151    break;
    152 #if M0043_LAYERS_PRESENT_SEI
    153   case SEI::LAYERS_PRESENT:
    154     xWriteSEILayersPresent(*static_cast<const SEILayersPresent*>(&sei));
     152#if LAYERS_NOT_PRESENT_SEI
     153  case SEI::LAYERS_NOT_PRESENT:
     154    xWriteSEILayersNotPresent(*static_cast<const SEILayersNotPresent*>(&sei));
    155155    break;
    156156#endif
    … …  
    536536}
    537537
    538 #if M0043_LAYERS_PRESENT_SEI
    539 Void SEIWriter::xWriteSEILayersPresent(const SEILayersPresent& sei)
     538#if LAYERS_NOT_PRESENT_SEI
     539Void SEIWriter::xWriteSEILayersNotPresent(const SEILayersNotPresent& sei)
    540540{
    541541  WRITE_UVLC( sei.m_activeVpsId,           "lp_sei_active_vps_id" );
    542542  for (UInt i = 0; i < sei.m_vpsMaxLayers; i++)
    543543  {
    544     WRITE_FLAG( sei.m_layerPresentFlag[i], "layer_present_flag"   );
     544    WRITE_FLAG( sei.m_layerNotPresentFlag[i], "layer_not_present_flag"   );
    545545  }
    546546  xWriteByteAlign();

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/SEIwrite.h

    r442 r567  
    6464  Void xWriteSEIGradualDecodingRefreshInfo(const SEIGradualDecodingRefreshInfo &sei);
    6565  Void xWriteSEIToneMappingInfo(const SEIToneMappingInfo& sei);
    66 #if M0043_LAYERS_PRESENT_SEI
    67   Void xWriteSEILayersPresent(const SEILayersPresent& sei);
     66#if LAYERS_NOT_PRESENT_SEI
     67  Void xWriteSEILayersNotPresent(const SEILayersNotPresent& sei);
    6868#endif
    6969  Void xWriteSEISOPDescription(const SEISOPDescription& sei);

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

    r560 r567  
    305305  Int       m_gradualDecodingRefreshInfoEnabled;
    306306  Int       m_decodingUnitInfoSEIEnabled;
    307 #if M0043_LAYERS_PRESENT_SEI
    308   Int       m_layersPresentSEIEnabled;
     307#if LAYERS_NOT_PRESENT_SEI
     308  Int       m_layersNotPresentSEIEnabled;
    309309#endif
    310310  Int       m_SOPDescriptionSEIEnabled;
    … …  
    748748  Void  setDecodingUnitInfoSEIEnabled(Int b)                { m_decodingUnitInfoSEIEnabled = b;    }
    749749  Int   getDecodingUnitInfoSEIEnabled()                     { return m_decodingUnitInfoSEIEnabled; }
    750 #if M0043_LAYERS_PRESENT_SEI
    751   Void  setLayersPresentSEIEnabled(Int b)                { m_layersPresentSEIEnabled = b; }
    752   Int   getLayersPresentSEIEnabled()                     { return m_layersPresentSEIEnabled; }
     750#if LAYERS_NOT_PRESENT_SEI
     751  Void  setLayersNotPresentSEIEnabled(Int b)             { m_layersNotPresentSEIEnabled = b; }
     752  Int   getLayersNotPresentSEIEnabled()                  { return m_layersNotPresentSEIEnabled; }
    753753#endif
    754754  Void  setSOPDescriptionSEIEnabled(Int b)                { m_SOPDescriptionSEIEnabled = b; }

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

    r564 r567  
    167167}
    168168
    169 #if M0043_LAYERS_PRESENT_SEI
    170 SEILayersPresent* TEncGOP::xCreateSEILayersPresent ()
     169#if LAYERS_NOT_PRESENT_SEI
     170SEILayersNotPresent* TEncGOP::xCreateSEILayersNotPresent ()
    171171{
    172172  UInt i = 0;
    173   SEILayersPresent *seiLayersPresent = new SEILayersPresent();
    174   seiLayersPresent->m_activeVpsId = m_pcCfg->getVPS()->getVPSId();
    175   seiLayersPresent->m_vpsMaxLayers = m_pcCfg->getVPS()->getMaxLayers();
    176   for ( ; i < seiLayersPresent->m_vpsMaxLayers; i++)
    177   {
    178     seiLayersPresent->m_layerPresentFlag[i] = true;
     173  SEILayersNotPresent *seiLayersNotPresent = new SEILayersNotPresent();
     174  seiLayersNotPresent->m_activeVpsId = m_pcCfg->getVPS()->getVPSId();
     175  seiLayersNotPresent->m_vpsMaxLayers = m_pcCfg->getVPS()->getMaxLayers();
     176  for ( ; i < seiLayersNotPresent->m_vpsMaxLayers; i++)
     177  {
     178    seiLayersNotPresent->m_layerNotPresentFlag[i] = true;
    179179  }
    180180  for ( ; i < MAX_LAYERS; i++)
    181181  {
    182     seiLayersPresent->m_layerPresentFlag[i] = false;
    183   }
    184   return seiLayersPresent;
     182    seiLayersNotPresent->m_layerNotPresentFlag[i] = false;
     183  }
     184  return seiLayersNotPresent;
    185185}
    186186#endif
    … …  
    363363  }
    364364
    365 #if M0043_LAYERS_PRESENT_SEI
    366   if(m_pcCfg->getLayersPresentSEIEnabled())
    367   {
    368     SEILayersPresent *sei = xCreateSEILayersPresent ();
     365#if LAYERS_NOT_PRESENT_SEI
     366  if(m_pcCfg->getLayersNotPresentSEIEnabled())
     367  {
     368    SEILayersNotPresent *sei = xCreateSEILayersNotPresent ();
    369369    m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
    370370    m_seiWriter.writeSEImessage(nalu.m_Bitstream, *sei, sps);

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

    r562 r567  
    181181
    182182  SEIActiveParameterSets* xCreateSEIActiveParameterSets (TComSPS *sps);
    183 #if M0043_LAYERS_PRESENT_SEI
    184   SEILayersPresent*       xCreateSEILayersPresent ();
     183#if LAYERS_NOT_PRESENT_SEI
     184  SEILayersNotPresent*    xCreateSEILayersNotPresent ();
    185185#endif
    186186  SEIFramePacking*        xCreateSEIFramePacking();
Note: See TracChangeset for help on using the changeset viewer.