Changeset 754 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibEncoder


Ignore:
Timestamp:
29 Apr 2014, 23:42:56 (11 years ago)
Author:
seregin
Message:

remove macro SVC_UPSAMPLING

Location:
branches/SHM-6-dev/source/Lib/TLibEncoder
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r739 r754  
    103103  m_associatedIRAPPOC  = 0;
    104104#endif
    105 #if SVC_UPSAMPLING
     105#if SVC_EXTENSION
    106106  m_pcPredSearch        = NULL;
    107 #endif
    108107#if Q0048_CGS_3D_ASYMLUT
    109108  m_temp = NULL;
    110109  m_pColorMappedPic = NULL;
    111110#endif
     111#endif //SVC_EXTENSION
    112112  return;
    113113}
    … …  
    173173#if SVC_EXTENSION
    174174  m_ppcTEncTop           = pcTEncTop->getLayerEnc();
    175 #endif
    176 #if SVC_UPSAMPLING
    177175  m_pcPredSearch         = pcTEncTop->getPredSearch();                       ///< encoder search class
    178 #endif
    179176#if Q0048_CGS_3D_ASYMLUT
    180177  if( pcTEncTop->getLayerId() )
    … …  
    189186  }
    190187#endif
     188#endif //SVC_EXTENSION
    191189}
    192190
    … …  
    10891087        }
    10901088#endif
    1091 #if SVC_UPSAMPLING
     1089#if SVC_EXTENSION
    10921090        if( pcPic->isSpatialEnhLayer(refLayerIdc) )
    10931091        {
    … …  
    11421140        }
    11431141        pcSlice->setFullPelBaseRec ( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc) );
    1144 #endif
     1142#endif //SVC_EXTENSION
    11451143      }
    11461144

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

    r694 r754  
    135135  UInt                    m_layerId;     
    136136  TEncTop**               m_ppcTEncTop;
    137 #if SVC_UPSAMPLING
    138137  TEncSearch*             m_pcPredSearch;                       ///< encoder search class
    139 #endif 
    140138#if Q0048_CGS_3D_ASYMLUT
    141139  TEnc3DAsymLUT           m_Enc3DAsymLUTPicUpdate;

  • branches/SHM-6-dev/source/Lib/TLibEncoder/TEncPic.cpp

    r595 r754  
    126126 * \return Void
    127127 */
     128#if SVC_EXTENSION
    128129#if AUXILIARY_PICTURES
    129 #if SVC_UPSAMPLING
    130130Void TEncPic::create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, 
    131131                      Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, TComSPS* pcSps, Bool bIsVirtual )
    132 
    133 #else
    134 
    135 Void TEncPic::create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth,
    136                       Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual )
    137 #endif
    138132{
    139 #if SVC_UPSAMPLING
    140133  TComPic::create( iWidth, iHeight, chromaFormat, uiMaxWidth, uiMaxHeight, uiMaxDepth, 
    141134                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSps, bIsVirtual );
    142135#else
    143   TComPic::create( iWidth, iHeight, chromaFormat, uiMaxWidth, uiMaxHeight, uiMaxDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, bIsVirtual );
     136Void TEncPic::create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, 
     137                      Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, TComSPS* pcSps, Bool bIsVirtual )
     138{
     139  TComPic::create( iWidth, iHeight, uiMaxWidth, uiMaxHeight, uiMaxDepth, 
     140                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSps, bIsVirtual );
    144141#endif
    145142  m_uiMaxAQDepth = uiMaxAQDepth;
    … …  
    153150  }
    154151}
    155 #else
    156 #if SVC_UPSAMPLING
    157 Void TEncPic::create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, 
    158                       Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, TComSPS* pcSps, Bool bIsVirtual )
    159 
    160 #else
     152#else  //SVC_EXTENSION
    161153Void TEncPic::create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, 
    162154                      Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual )
    163 #endif
    164155{
    165 #if SVC_UPSAMPLING
    166   TComPic::create( iWidth, iHeight, uiMaxWidth, uiMaxHeight, uiMaxDepth, 
    167                    conformanceWindow, defaultDisplayWindow, numReorderPics, pcSps, bIsVirtual );
    168 #else
    169156  TComPic::create( iWidth, iHeight, uiMaxWidth, uiMaxHeight, uiMaxDepth, 
    170157                   conformanceWindow, defaultDisplayWindow, numReorderPics, bIsVirtual );
    171 #endif
    172158  m_uiMaxAQDepth = uiMaxAQDepth;
    173159  if ( uiMaxAQDepth > 0 )
    … …  
    180166  }
    181167}
    182 #endif
     168#endif //SVC_EXTENSION
    183169
    184170/** Clean up

  • branches/SHM-6-dev/source/Lib/TLibEncoder/TEncPic.h

    r595 r754  
    4141#include "TLibCommon/CommonDef.h"
    4242#include "TLibCommon/TComPic.h"
    43 #if SVC_UPSAMPLING
     43#if SVC_EXTENSION
    4444#include "TLibCommon/TComSlice.h"
    4545#endif
    … …  
    105105  virtual ~TEncPic();
    106106
     107#if SVC_EXTENSION
    107108#if AUXILIARY_PICTURES
    108 #if SVC_UPSAMPLING
    109109  Void          create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, 
    110110                      Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, TComSPS* pcSps, Bool bIsVirtual=false );
    111111#else
    112   Void          create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth,
    113                           Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual = false );
    114 
    115 #endif
    116 #else
    117 #if SVC_UPSAMPLING
    118112  Void          create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth,   
    119113                        Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, TComSPS* pcSps, Bool bIsVirtual = false );
    120 #else
     114#endif
     115#else  //SVC_EXTENSION
    121116  Void          create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth,   
    122117                        Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual = false );
    123 #endif
    124 #endif
     118#endif //SVC_EXTENSION
     119
    125120  virtual Void  destroy();
    126121

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

    r691 r754  
    820820#endif
    821821
     822#if SVC_EXTENSION
    822823#if AUXILIARY_PICTURES
    823 #if SVC_UPSAMPLING
    824824      pcEPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 ,
    825825                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
    826826#else
    827       pcEPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 ,
    828                       m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
    829 #endif
    830 #else
    831 #if SVC_UPSAMPLING
    832827      pcEPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 ,
    833828                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
    834 #else
     829#endif
     830#else  //SVC_EXTENSION
    835831      pcEPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 ,
    836832                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
    837 #endif
    838 #endif
     833#endif //SVC_EXTENSION
    839834      rpcPic = pcEPic;
    840835    }
    … …  
    889884#endif
    890885
     886#if SVC_EXTENSION
    891887#if AUXILIARY_PICTURES
    892 #if SVC_UPSAMPLING
    893888      rpcPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    894889                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
    895890#else
    896       rpcPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    897                       m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
    898 #endif
    899 #else
    900 #if SVC_UPSAMPLING
    901891      rpcPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    902892                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
    903 #else
     893#endif
     894#else  //SVC_EXTENSION
    904895      rpcPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    905896                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
    906 #endif
    907 #endif
     897#endif //SVC_EXTENSION
    908898    }
    909899    m_cListPic.pushBack( rpcPic );
    … …  
    15821572      {
    15831573        m_cIlpPic[j] = new  TComPic;
    1584 #if SVC_UPSAMPLING
    15851574#if AUXILIARY_PICTURES
    15861575        m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true);
    15871576#else
    15881577        m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true);
    1589 #endif
    1590 #else
    1591         m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    15921578#endif
    15931579        for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCUsInFrame(); i++)
    … …  
    16491635      {
    16501636        m_cIlpPic[j] = new  TComPic;
    1651 #if SVC_UPSAMPLING
    16521637#if AUXILIARY_PICTURES
    16531638        m_cIlpPic[j]->create(picWidth, picHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true);
    16541639#else
    16551640        m_cIlpPic[j]->create(picWidth, picHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true);
    1656 #endif
    1657 #else
    1658         m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    16591641#endif
    16601642        for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCUsInFrame(); i++)
Note: See TracChangeset for help on using the changeset viewer.