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


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

macro cleanup: R0150_CGS_SIGNAL_CONSTRAINTS

Location:
branches/SHM-dev/source/Lib/TLibCommon
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TCom3DAsymLUT.cpp

    r1212 r1213  
    285285  rYUVP.U = sPred.U + ( deltaU << m_nResQuanBit );
    286286  rYUVP.V = sPred.V + ( deltaV << m_nResQuanBit );
    287 #if R0150_CGS_SIGNAL_CONSTRAINTS
     287
    288288  // LUT coefficients are less than 12-bit
    289289  assert( -2048 <= rYUVP.Y && rYUVP.Y <= 2047 );
    290290  assert( -2048 <= rYUVP.U && rYUVP.U <= 2047 );
    291291  assert( -2048 <= rYUVP.V && rYUVP.V <= 2047 );
    292 #endif
    293292}
    294293
    … …  
    413412#endif
    414413
    415 #if R0150_CGS_SIGNAL_CONSTRAINTS
    416414Bool TCom3DAsymLUT::isRefLayer( UInt uiRefLayerId )
    417415{
    … …  
    428426  return( bIsRefLayer );
    429427}
    430 #endif
    431428
    432429#if R0164_CGS_LUT_BUGFIX_CHECK

  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TCom3DAsymLUT.h

    r1212 r1213  
    44
    55#include "TypeDef.h"
    6 #if R0150_CGS_SIGNAL_CONSTRAINTS
     6
     7#if CGS_3D_ASYMLUT
    78#include <cassert>
    89#include <vector>
    9 #endif
    10 
    11 #if CGS_3D_ASYMLUT
    1210
    1311typedef struct _SYUVP
    … …  
    2927  virtual ~TCom3DAsymLUT();
    3028
    31   virtual Void  create( Int nMaxOctantDepth , Int nInputBitDepth , Int nInputBitDepthC , Int nOutputBitDepth , Int nOutputBitDepthC , Int nMaxYPartNumLog2
    32 #if R0151_CGS_3D_ASYMLUT_IMPROVE
    33   , Int nAdaptCThresholdU , Int nAdaptCThresholdV
    34 #endif
    35     );
     29  virtual Void  create( Int nMaxOctantDepth, Int nInputBitDepth, Int nInputBitDepthC, Int nOutputBitDepth, Int nOutputBitDepthC, Int nMaxYPartNumLog2, Int nAdaptCThresholdU, Int nAdaptCThresholdV );
    3630  virtual Void  destroy();
    3731
    … …  
    5145  Int   getMaxYPartNumLog2() { return m_nMaxYPartNumLog2; }
    5246  Int   getCurYPartNumLog2() { return m_nCurYPartNumLog2; }
    53 #if R0150_CGS_SIGNAL_CONSTRAINTS
     47
    5448  Void  addRefLayerId( UInt uiRefLayerId ) 
    5549  {
    … …  
    6054  UInt  getRefLayerId( UInt n )  { assert( n < m_vRefLayerId.size() ); return m_vRefLayerId[n];   }
    6155  Bool  isRefLayer( UInt uiRefLayerId );
    62 #endif
     56
    6357#if R0151_CGS_3D_ASYMLUT_IMPROVE
    6458  Void  setAdaptChromaThresholdU( Int n ) { m_nAdaptCThresholdU = n; }
    … …  
    113107  SCuboid *** m_pCuboid;
    114108  const static Int m_nVertexIdxOffset[4][3];
    115 #if R0150_CGS_SIGNAL_CONSTRAINTS
    116109  std::vector<UInt> m_vRefLayerId;
    117 #endif
    118110#if R0151_CGS_3D_ASYMLUT_IMPROVE
    119111  Int   m_nAdaptCThresholdU;

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

    r1212 r1213  
    5858#if CGS_3D_ASYMLUT
    5959#define CGS_GCC_NO_VECTORIZATION         1
    60 #define R0150_CGS_SIGNAL_CONSTRAINTS     1      ///< JCTVC-R0150: CGS signaling improvement and constraints
    6160#define R0151_CGS_3D_ASYMLUT_IMPROVE     1      ///< JCTVC-R0151: Non-uniform chroma partitioning and improved LUT coefficient coding
    6261#define R0164_CGS_LUT_BUGFIX             1      ///< JCTVC-R0164: Bug fix with LUT syntax
Note: See TracChangeset for help on using the changeset viewer.