Changeset 754 in SHVCSoftware


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

remove macro SVC_UPSAMPLING

Location:
branches/SHM-6-dev/source
Files:
15 edited

Legend:

Unmodified
Added
Removed

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

    r721 r754  
    15351535    if( m_isField )
    15361536    {
    1537 #if SVC_UPSAMPLING
     1537#if SVC_EXTENSION
    15381538#if LAYER_CTB
    15391539#if AUXILIARY_PICTURES
    … …  
    15551555    else
    15561556    {
    1557 #if SVC_UPSAMPLING
     1557#if SVC_EXTENSION
    15581558#if LAYER_CTB
    15591559#if AUXILIARY_PICTURES
    … …  
    19941994    rpcPicYuvRec = new TComPicYuv;
    19951995
    1996 #if SVC_UPSAMPLING
     1996#if SVC_EXTENSION
    19971997#if LAYER_CTB
    19981998#if AUXILIARY_PICTURES

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComPic.cpp

    r595 r754  
    7272{
    7373}
    74 #if SVC_UPSAMPLING
     74#if SVC_EXTENSION
    7575#if AUXILIARY_PICTURES
    7676Void TComPic::create( Int iWidth, Int iHeight, ChromaFormat chromaFormatIDC, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, Window &conformanceWindow, Window &defaultDisplayWindow,
    … …  
    184184 
    185185  deleteSEIs(m_SEIs);
    186 #if SVC_EXTENSION && SVC_UPSAMPLING
     186#if SVC_EXTENSION
    187187  for( Int i = 0; i < MAX_LAYERS; i++ )
    188188  {

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComPic.h

    r722 r754  
    9797  virtual ~TComPic();
    9898 
     99#if SVC_EXTENSION
    99100#if AUXILIARY_PICTURES
    100 #if SVC_UPSAMPLING
    101101  Void          create( Int iWidth, Int iHeight, ChromaFormat chromaFormatIDC, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, Window &conformanceWindow, Window &defaultDisplayWindow,
    102102                        Int *numReorderPics, TComSPS* pcSps = NULL, Bool bIsVirtual = false );
    103103#else
    104   Void          create( Int iWidth, Int iHeight, ChromaFormat chromaFormatIDC, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, Window &conformanceWindow, Window &defaultDisplayWindow,
    105                         Int *numReorderPics, Bool bIsVirtual = false );                       
    106 #endif
    107 #else
    108 #if SVC_UPSAMPLING
    109104  Void          create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, Window &conformanceWindow, Window &defaultDisplayWindow,
    110105                        Int *numReorderPics, TComSPS* pcSps = NULL, Bool bIsVirtual = false );
     106#endif
    111107#else
    112108  Void          create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, Window &conformanceWindow, Window &defaultDisplayWindow,
    113                         Int *numReorderPics, Bool bIsVirtual = false );                        
    114 #endif
    115 #endif
     109                        Int *numReorderPics, Bool bIsVirtual = false );
     110#endif //SVC_EXTENSION
     111
    116112  virtual Void  destroy();
    117113 

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComPicYuv.cpp

    r750 r754  
    6767{
    6868}
     69
     70#if SVC_EXTENSION
    6971#if AUXILIARY_PICTURES
    70 #if SVC_UPSAMPLING
    7172Void TComPicYuv::create( Int iPicWidth, Int iPicHeight, ChromaFormat chromaFormatIDC, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, TComSPS* pcSps )
    7273#else
    73 Void TComPicYuv::create( Int iPicWidth, Int iPicHeight, ChromaFormat chromaFormatIDC, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth )
    74 #endif
    75 #else
    76 #if SVC_UPSAMPLING
    7774Void TComPicYuv::create( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, TComSPS* pcSps )
     75#endif
    7876#else
    7977Void TComPicYuv::create( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth )
    8078#endif
    81 #endif
    8279{
    8380  m_iPicWidth       = iPicWidth;
    8481  m_iPicHeight      = iPicHeight;
    8582 
    86 #if SVC_UPSAMPLING
     83#if SVC_EXTENSION
    8784  if(pcSps != NULL)
    8885  {

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComPicYuv.h

    r750 r754  
    4242#include "CommonDef.h"
    4343#include "TComRom.h"
    44 #if SVC_UPSAMPLING
     44#if SVC_EXTENSION
    4545#include "TComSlice.h"
    4646#endif
    … …  
    9494  ChromaFormat m_chromaFormatIDC; ////< Chroma Format
    9595#endif
    96 #if SVC_UPSAMPLING
    9796  Window  m_conformanceWindow;
    98 #endif
    9997#if M0040_ADAPTIVE_RESOLUTION_CHANGE
    10098  Bool    m_isReconstructed;
    … …  
    112110  //  Memory management
    113111  // ------------------------------------------------------------------------------------------------
     112#if SVC_EXTENSION
    114113#if AUXILIARY_PICTURES
    115 #if SVC_UPSAMPLING
    116114  Void  create      ( Int iPicWidth, Int iPicHeight, ChromaFormat chromaFormatIDC, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, TComSPS* pcSps = NULL);
    117115#else
    118   Void  create      ( Int iPicWidth, Int iPicHeight, ChromaFormat chromaFormatIDC, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth );
    119 #endif 
    120 #else
    121 #if SVC_UPSAMPLING
    122116  Void  create      ( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, TComSPS* pcSps = NULL);
     117#endif
    123118#else
    124119  Void  create      ( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth );
    125 #endif 
    126 #endif
     120#endif //SVC_EXTENSION
    127121 
    128122  Void  destroy     ();
    … …  
    187181#if SVC_EXTENSION
    188182  Void   setHeight   ( Int iPicHeight )     { m_iPicHeight = iPicHeight; }
    189 #if SVC_UPSAMPLING
    190183  Window& getConformanceWindow()                           { return  m_conformanceWindow;             }
    191184  Void    setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
    192 #endif
    193185#if M0040_ADAPTIVE_RESOLUTION_CHANGE
    194186  Void  setReconstructed(Bool x) { m_isReconstructed = x;    }

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComPrediction.cpp

    r724 r754  
    781781}
    782782
    783 #if SVC_UPSAMPLING
     783#if SVC_EXTENSION
    784784#if O0215_PHASE_ALIGNMENT
    785785#if O0194_JOINT_US_BITSHIFT
    … …  
    807807#endif
    808808#endif
    809 #endif
     809#endif //SVC_EXTENSION
    810810//! \}

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComPrediction.h

    r703 r754  
    4848#include "TComWeightPrediction.h"
    4949
    50 #if SVC_UPSAMPLING
     50#if SVC_EXTENSION
    5151#include "TComUpsampleFilter.h"
    5252#endif
    … …  
    7272 
    7373  TComInterpolationFilter m_if;
    74  
    75 #if SVC_UPSAMPLING
    76   TComUpsampleFilter      m_cUsf;
    77 #endif
    7874
    7975  Pel*   m_pLumaRecBuffer;       ///< array for downsampled reconstructed luma sample
    … …  
    9490  Void xDCPredFiltering( Int* pSrc, Int iSrcStride, Pel*& rpDst, Int iDstStride, Int iWidth, Int iHeight );
    9591  Bool xCheckIdenticalMotion    ( TComDataCU* pcCU, UInt PartAddr);
     92 
     93#if SVC_EXTENSION
     94  TComUpsampleFilter      m_cUsf;
     95#endif
    9696
    9797public:
    … …  
    118118
    119119#if SVC_EXTENSION
    120 #if SVC_UPSAMPLING
    121120#if O0215_PHASE_ALIGNMENT
    122121#if O0194_JOINT_US_BITSHIFT
    … …  
    132131#endif
    133132#endif
    134 #endif
    135133#endif //SVC_EXTENSION
    136134};

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

    r708 r754  
    1 
     1#include "TypeDef.h"
     2#if SVC_EXTENSION
    23#include "TComUpsampleFilter.h"
    3 #include "TypeDef.h"
    4 
    5 #if SVC_UPSAMPLING
     4
    65#define CNU -1 ///< Coefficients Not Used
    76

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

    r748 r754  
    179179#define DERIVE_LAYER_ID_LIST_VARIABLES   1      ///< Derived variables based on the variables in VPS - for use in syntax table parsing
    180180
    181 #define SVC_UPSAMPLING                   1      ///< upsampling filters
    182181#define ROUNDING_OFFSET                  1      ///< JCTVC-N0111: upsampling rounding offset using scalling factors
    183182#define N0214_INTERMEDIATE_BUFFER_16BITS 1      ///< JCTVC-N0214: support base layer input more than 8 bits

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

    r749 r754  
    228228
    229229        m_cIlpPic[j] = new  TComPic;
     230
    230231#if AUXILIARY_PICTURES
    231232#if REPN_FORMAT_IN_VPS
    232 #if SVC_UPSAMPLING
    233233        m_cIlpPic[j]->create(picWidth, picHeight, slice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    234234#else
    235         m_cIlpPic[j]->create(picWidth, picHeight, slice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    236 #endif
    237 #else
    238 #if SVC_UPSAMPLING
    239235        m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), pcSPS->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    240 #else
    241         m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), pcSPS->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    242 #endif
    243236#endif
    244237#else
    245238#if REPN_FORMAT_IN_VPS
    246 #if SVC_UPSAMPLING
    247239        m_cIlpPic[j]->create(picWidth, picHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    248240#else
    249         m_cIlpPic[j]->create(picWidth, picHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    250 #endif
    251 #else
    252 #if SVC_UPSAMPLING
    253241        m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    254 #else
    255         m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    256 #endif
    257242#endif
    258243#endif
    … …  
    404389      }
    405390    }
    406 #endif
    407    
     391
    408392#if AUXILIARY_PICTURES
    409393#if REPN_FORMAT_IN_VPS
    410 #if SVC_UPSAMPLING
    411394    rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    412395                     conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    413396#else
    414     rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    415                      conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    416 #endif
    417 #else
    418 #if SVC_UPSAMPLING
    419397    rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    420398                     conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    421 #else
    422     rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    423                      conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    424 #endif
    425399#endif
    426400#else
    427401#if REPN_FORMAT_IN_VPS
    428 #if SVC_UPSAMPLING
    429402    rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    430403                     conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    431404#else
    432     rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    433                      conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    434 #endif
    435 #else
    436 #if SVC_UPSAMPLING
    437405    rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    438406                     conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    439 #else
     407#endif
     408#endif
     409
     410#else //SVC_EXTENSION
    440411    rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    441412                     conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    442 #endif
    443 #endif
    444 #endif
     413#endif //SVC_EXTENSION
     414   
    445415    m_cListPic.pushBack( rpcPic );
    446416   
    … …  
    481451  rpcPic->destroy();
    482452
     453#if SVC_EXTENSION
    483454#if AUXILIARY_PICTURES
    484455#if REPN_FORMAT_IN_VPS
    485 #if SVC_UPSAMPLING
    486456  rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    487457                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    488 
    489 #else
    490   rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    491                    conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    492 #endif
    493 #else
    494 #if SVC_UPSAMPLING
     458#else
    495459  rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    496460                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    497 
    498 #else
    499   rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    500                    conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    501 #endif
    502461#endif
    503462#else
    504463#if REPN_FORMAT_IN_VPS
    505 #if SVC_UPSAMPLING
    506464  rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    507465                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    508466
    509467#else
    510   rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    511                    conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    512 #endif
    513 #else
    514 #if SVC_UPSAMPLING
    515468  rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    516469                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    517 
    518 #else
     470#endif
     471#endif
     472#else  //SVC_EXTENSION
    519473  rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    520474                   conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    521 #endif
    522 #endif
    523 #endif
     475#endif //SVC_EXTENSION
    524476}
    525477
    … …  
    796748
    797749#if AUXILIARY_PICTURES
    798 #if SVC_UPSAMPLING
    799750#if AVC_SYNTAX
    800751      pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), repFormat->getChromaFormatVpsIdc(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, activeSPS, true);
    … …  
    803754#endif
    804755#else
    805       pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), repFormat->getChromaFormatVpsIdc(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    806 #endif
    807 #else
    808 #if SVC_UPSAMPLING
    809756#if AVC_SYNTAX
    810757      pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, activeSPS, true);
    811758#else
    812759      pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, NULL, true);
    813 #endif
    814 #else
    815       pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), onformanceWindow, defaultDisplayWindow, numReorderPics, true);
    816760#endif
    817761#endif
    … …  
    16951639        }
    16961640#endif
    1697 #if SVC_UPSAMPLING
     1641#if SVC_EXTENSION
    16981642        if( pcPic->isSpatialEnhLayer(refLayerIdc) )
    16991643        {
    … …  
    17371681        }
    17381682        pcSlice->setFullPelBaseRec ( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc) );
    1739 #endif
     1683#endif //SVC_EXTENSION
    17401684      }
    17411685    }

  • 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.