Changeset 238 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
24 May 2013, 01:35:11 (13 years ago)
Author:
seregin
Message:

VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE macro clean up, related code was included under macro VPS_EXTN_DIRECT_REF_LAYERS

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

Legend:

Unmodified
Added
Removed

  • branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecGop.cpp

    r191 r238  
    247247    for (Int iRefIndex = 0; iRefIndex < pcSlice->getNumRefIdx(RefPicList(iRefList)); iRefIndex++)
    248248    {
    249 #if REF_IDX_FRAMEWORK && VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     249#if REF_IDX_FRAMEWORK && VPS_EXTN_DIRECT_REF_LAYERS
    250250      if( pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->isILR( m_layerId ) )
    251251      {

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

    r224 r238  
    248248    if(m_layerId > 0)
    249249    {
    250 #if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     250#if VPS_EXTN_DIRECT_REF_LAYERS
    251251      TDecTop *pcTDecTopBase = (TDecTop *)getRefLayerDec( m_layerId );
    252252#else
    … …  
    822822      else
    823823      {
    824 #if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     824#if VPS_EXTN_DIRECT_REF_LAYERS
    825825        TDecTop *pcTDecTop = (TDecTop *)getRefLayerDec( m_layerId );
    826826#else
    … …  
    831831      }
    832832#else
    833 #if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     833#if VPS_EXTN_DIRECT_REF_LAYERS
    834834      TDecTop *pcTDecTop = (TDecTop *)getRefLayerDec( m_layerId );
    835835#else
    … …  
    12731273}
    12741274
    1275 #if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     1275#if VPS_EXTN_DIRECT_REF_LAYERS
    12761276TDecTop* TDecTop::getRefLayerDec( UInt layerId )
    12771277{

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

    r191 r238  
    156156  Void      setLayerDec(TDecTop **p)    { m_ppcTDecTop = p; }
    157157  TDecTop*  getLayerDec(UInt layer)     { return m_ppcTDecTop[layer]; }
    158 #if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     158#if VPS_EXTN_DIRECT_REF_LAYERS
    159159  TDecTop*  getRefLayerDec(UInt layerId);
    160160#endif
Note: See TracChangeset for help on using the changeset viewer.