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


Ignore:
Timestamp:
8 Jul 2015, 23:14:20 (10 years ago)
Author:
seregin
Message:

rename Q0048_CGS_3D_ASYMLUT to CGS_3D_ASYMLUT

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

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp

    r1090 r1212  
    77#include "TEnc3DAsymLUT.h"
    88
    9 #if Q0048_CGS_3D_ASYMLUT
    10 
     9#if CGS_3D_ASYMLUT
    1110TEnc3DAsymLUT::TEnc3DAsymLUT()
    1211{

  • branches/SHM-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.h

    r877 r1212  
    1515#endif
    1616
    17 #if Q0048_CGS_3D_ASYMLUT
     17#if CGS_3D_ASYMLUT
    1818
    1919typedef struct _ColorInfo

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1209 r1212  
    154154
    155155Void TEncCavlc::codePPS( TComPPS* pcPPS
    156 #if Q0048_CGS_3D_ASYMLUT
     156#if CGS_3D_ASYMLUT
    157157  , TEnc3DAsymLUT * pc3DAsymLUT
    158158#endif
    … …  
    253253#if SVC_EXTENSION
    254254  pps_extension_flags[PPS_EXT__MLAYER] = pcPPS->getExtensionFlag() ? 1 : 0;
    255 #if Q0048_CGS_3D_ASYMLUT
     255#if CGS_3D_ASYMLUT
    256256  UInt bits = 0;
    257257#endif
    … …  
    347347              }
    348348            }
    349 #if Q0048_CGS_3D_ASYMLUT
     349#if CGS_3D_ASYMLUT
    350350            bits = getNumberOfWrittenBits();
    351351            WRITE_FLAG( pcPPS->getCGSFlag() , "colour_mapping_enabled_flag" );
    … …  
    24672467}
    24682468
    2469 #if Q0048_CGS_3D_ASYMLUT
     2469#if CGS_3D_ASYMLUT
    24702470Void TEncCavlc::xCode3DAsymLUT( TCom3DAsymLUT * pc3DAsymLUT )
    24712471{

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h

    r1207 r1212  
    4848#include "TEncEntropy.h"
    4949#include "SyntaxElementWriter.h"
    50 #if Q0048_CGS_3D_ASYMLUT
     50#if CGS_3D_ASYMLUT
    5151#include "../TLibCommon/TCom3DAsymLUT.h"
    5252#include "TEnc3DAsymLUT.h"
    … …  
    5757
    5858class TEncTop;
    59 #if Q0048_CGS_3D_ASYMLUT
     59#if CGS_3D_ASYMLUT
    6060class TCom3DAsymLUT;
    6161#endif
    … …  
    9191  Void  codeSPS                 ( TComSPS* pcSPS );
    9292  Void  codePPS                 ( TComPPS* pcPPS
    93 #if Q0048_CGS_3D_ASYMLUT
     93#if CGS_3D_ASYMLUT
    9494    , TEnc3DAsymLUT * pc3DAsymLUT
    9595#endif
    … …  
    163163#endif
    164164  Void  codeVpsVuiBspHrdParams  (TComVPS * const);
    165 #if Q0048_CGS_3D_ASYMLUT
     165#if CGS_3D_ASYMLUT
    166166#if R0179_ENC_OPT_3DLUT_SIZE
    167167public:

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

    r1203 r1212  
    404404  UInt      m_ilcIdc[1024];
    405405#endif
    406 #if Q0048_CGS_3D_ASYMLUT
     406#if CGS_3D_ASYMLUT
    407407  Int       m_nCGSFlag;
    408408  Int       m_nCGSMaxOctantDepth;
    … …  
    11411141  Bool                                getOverlaySEIPersistenceFlag()                                           { return m_overlayInfoPersistenceFlag; }
    11421142#endif
    1143 #if Q0048_CGS_3D_ASYMLUT
     1143#if CGS_3D_ASYMLUT
    11441144  Void      setCGSFlag(Int n)             { m_nCGSFlag = n;    }
    11451145  Int       getCGSFlag()                  { return m_nCGSFlag; }

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.cpp

    r1207 r1212  
    7878}
    7979
    80 #if Q0048_CGS_3D_ASYMLUT
     80#if CGS_3D_ASYMLUT
    8181Void TEncEntropy::encodePPS( TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT  )
    8282{

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.h

    r1207 r1212  
    5151class TEncCavlc;
    5252class SEI;
    53 #if Q0048_CGS_3D_ASYMLUT
     53#if CGS_3D_ASYMLUT
    5454class TEnc3DAsymLUT;
    5555#endif
    … …  
    7373  virtual Void  codeSPS                 ( TComSPS* pcSPS )                                      = 0;
    7474  virtual Void  codePPS                 ( TComPPS* pcPPS
    75 #if Q0048_CGS_3D_ASYMLUT
     75#if CGS_3D_ASYMLUT
    7676    , TEnc3DAsymLUT * pc3DAsymLUT
    7777#endif
    … …  
    153153  Void encodeSPS               ( TComSPS* pcSPS );
    154154  Void encodePPS               ( TComPPS* pcPPS
    155 #if Q0048_CGS_3D_ASYMLUT
     155#if CGS_3D_ASYMLUT
    156156    , TEnc3DAsymLUT * pc3DAsymLUT
    157157#endif

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

    r1211 r1212  
    113113  m_associatedIrapPocBeforeReset = 0;
    114114  m_pcPredSearch        = NULL;
    115 #if Q0048_CGS_3D_ASYMLUT
     115#if CGS_3D_ASYMLUT
    116116  m_temp = NULL;
    117117  m_pColorMappedPic = NULL;
    … …  
    136136TEncGOP::~TEncGOP()
    137137{
    138 #if Q0048_CGS_3D_ASYMLUT
     138#if CGS_3D_ASYMLUT
    139139  if(m_pColorMappedPic)
    140140  {
    … …  
    193193  m_ppcTEncTop           = pcTEncTop->getLayerEnc();
    194194  m_pcPredSearch         = pcTEncTop->getPredSearch();                       ///< encoder search class
    195 #if Q0048_CGS_3D_ASYMLUT
     195#if CGS_3D_ASYMLUT
    196196  if( pcTEncTop->getLayerId() )
    197197  {
    … …  
    13941394        g_posScalingFactor[refLayerIdc][1] = ((heightBL << 16) + (heightEL >> 1)) / heightEL;
    13951395
    1396 #if Q0048_CGS_3D_ASYMLUT
     1396#if CGS_3D_ASYMLUT
    13971397        TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
    13981398        if( pcSlice->getPPS()->getCGSFlag() )
    … …  
    14351435        else
    14361436        {
    1437 #if Q0048_CGS_3D_ASYMLUT
     1437#if CGS_3D_ASYMLUT
    14381438          pcPic->setFullPelBaseRec( refLayerIdc, pBaseColRec );
    14391439#else
    … …  
    22832283      assert( pcSlice->getPPS()->getLayerId() == 0 || pcSlice->getPPS()->getLayerId() == m_layerId || m_pcEncTop->getVPS()->getRecursiveRefLayerFlag(m_layerId, pcSlice->getPPS()->getLayerId()) );
    22842284#endif
    2285 #if SVC_EXTENSION && Q0048_CGS_3D_ASYMLUT
     2285#if SVC_EXTENSION && CGS_3D_ASYMLUT
    22862286      m_pcEntropyCoder->encodePPS(pcSlice->getPPS(), &m_Enc3DAsymLUTPPS);
    22872287#else
    … …  
    23352335      m_bSeqFirst = false;
    23362336    }
    2337 #if Q0048_CGS_3D_ASYMLUT
     2337#if CGS_3D_ASYMLUT
    23382338    else if( m_pcCfg->getCGSFlag() && pcSlice->getLayerId() && pcSlice->getCGSOverWritePPS() )
    23392339    {
    … …  
    37433743    printf("]");
    37443744  }
    3745 #if Q0048_CGS_3D_ASYMLUT
     3745#if CGS_3D_ASYMLUT
    37463746  pcPic->setFrameBit( (Int)uibits );
    37473747  if( m_layerId && pcSlice->getPPS()->getCGSFlag() )
    … …  
    48254825#endif
    48264826
    4827 #if Q0048_CGS_3D_ASYMLUT
     4827#if CGS_3D_ASYMLUT
    48284828Void TEncGOP::xDetermin3DAsymLUT( TComSlice * pSlice , TComPic * pCurPic , UInt refLayerIdc , TEncCfg * pCfg , Bool bSignalPPS )
    48294829{

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

    r1209 r1212  
    5454#include "TEncSbac.h"
    5555#include "SEIwrite.h"
    56 #if Q0048_CGS_3D_ASYMLUT
     56#if CGS_3D_ASYMLUT
    5757#include "TEnc3DAsymLUT.h"
    5858#endif
    … …  
    154154  TEncTop**               m_ppcTEncTop;
    155155  TEncSearch*             m_pcPredSearch;                       ///< encoder search class
    156 #if Q0048_CGS_3D_ASYMLUT
     156#if CGS_3D_ASYMLUT
    157157  TEnc3DAsymLUT           m_Enc3DAsymLUTPicUpdate;
    158158  TEnc3DAsymLUT           m_Enc3DAsymLUTPPS;
    … …  
    286286  SEIOverlayInfo* xCreateSEIOverlayInfo();
    287287#endif
    288 #if Q0048_CGS_3D_ASYMLUT
     288#if CGS_3D_ASYMLUT
    289289  Void xDetermin3DAsymLUT( TComSlice * pSlice , TComPic * pCurPic , UInt refLayerIdc , TEncCfg * pCfg , Bool bSignalPPS );
    290290  Void downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest);

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp

    r1207 r1212  
    235235
    236236Void TEncSbac::codePPS( TComPPS* pcPPS
    237 #if Q0048_CGS_3D_ASYMLUT
     237#if CGS_3D_ASYMLUT
    238238  , TEnc3DAsymLUT * pc3DAsymLUT
    239239#endif

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.h

    r1207 r1212  
    9090  Void  codeSPS                ( TComSPS* pcSPS     );
    9191  Void  codePPS                ( TComPPS* pcPPS     
    92 #if Q0048_CGS_3D_ASYMLUT
     92#if CGS_3D_ASYMLUT
    9393    , TEnc3DAsymLUT * pc3DAsymLUT
    9494#endif

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

    r1209 r1212  
    635635            || !zeroPhase
    636636#endif
    637 #if Q0048_CGS_3D_ASYMLUT
     637#if CGS_3D_ASYMLUT
    638638            || m_cPPS.getCGSFlag() > 0
    639639#endif
    … …  
    680680            || !equalOffsets
    681681            || !zeroPhase
    682 #if Q0048_CGS_3D_ASYMLUT
     682#if CGS_3D_ASYMLUT
    683683            || m_cPPS.getCGSFlag() > 0
    684684#endif
    … …  
    10411041    m_cPPS.setPhaseVerChroma( m_refLocationOffsetLayerId[i], m_phaseVerChroma[i] );
    10421042  }
    1043 #if Q0048_CGS_3D_ASYMLUT
     1043#if CGS_3D_ASYMLUT
    10441044  m_cPPS.setCGSFlag( m_nCGSFlag );
    10451045#endif
Note: See TracChangeset for help on using the changeset viewer.