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


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/Lib/TLibDecoder
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.