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


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/TLibCommon
Files:
8 edited

Legend:

Unmodified
Added
Removed

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