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


Ignore:
Timestamp:
24 May 2013, 01:35:11 (12 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
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r236 r238  
    5656#define VPS_EXTN_PROFILE_INFO            1      ///< Include profile information for layer sets in VPS extension
    5757#define VPS_EXTN_DIRECT_REF_LAYERS       1      ///< Include indication of direct dependency of layers in VPS extension
    58 #define VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE   1
    5958#define VPS_OUTPUT_LAYER_SET_IDX         1      ///< M0268: Signal output_layer_set_idx[i] as output_layer_set_idx_minus1[i]
    6059#define VPS_MOVE_DIR_DEPENDENCY_FLAG     1      ///< M0268: Move the syntax element direct_dependency_flag to follow the syntax element dimension_id

  • 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

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

    r195 r238  
    535535    if (m_layerId > 0)
    536536    {
    537 #if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     537#if VPS_EXTN_DIRECT_REF_LAYERS
    538538      TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(m_layerId)->getListPic();
    539539#else
    … …  
    26312631    for (Int iRefIndex = 0; iRefIndex < pcSlice->getNumRefIdx(RefPicList(iRefList)); iRefIndex++)
    26322632    {
    2633 #if REF_IDX_FRAMEWORK && VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     2633#if REF_IDX_FRAMEWORK && VPS_EXTN_DIRECT_REF_LAYERS
    26342634      if( pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->isILR(m_layerId) )
    26352635      {

  • branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r211 r238  
    507507      if(m_layerId > 0)
    508508      {
    509 #if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     509#if VPS_EXTN_DIRECT_REF_LAYERS
    510510        TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( m_layerId );
    511511#else
    … …  
    535535      if(m_layerId > 0)
    536536      {
    537 #if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     537#if VPS_EXTN_DIRECT_REF_LAYERS
    538538        TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( m_layerId );
    539539#else
    … …  
    11921192
    11931193#if SVC_EXTENSION
    1194 #if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     1194#if VPS_EXTN_DIRECT_REF_LAYERS
    11951195TEncTop* TEncTop::getRefLayerEnc( UInt layerId )
    11961196{

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

    r191 r238  
    230230  Void      encode( TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int iPicIdInGOP  );
    231231  Void      encodePrep( TComPicYuv* pcPicYuvOrg );
    232 #if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
     232#if VPS_EXTN_DIRECT_REF_LAYERS
    233233  TEncTop*  getRefLayerEnc(UInt layerId);
    234234#endif
Note: See TracChangeset for help on using the changeset viewer.