Changeset 1216 in SHVCSoftware for branches/SHM-dev

Timestamp:

8 Jul 2015, 23:44:27 (9 years ago)

Author:

seregin

Message:

macro cleanup: R0179_CGS_SIZE_8x1x1

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TCom3DAsymLUT.cpp (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

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

@@ -71 +71 @@
 {
   assert( nCurOctantDepth <= m_nMaxOctantDepth );
-#if R0179_CGS_SIZE_8x1x1
   assert( nCurYPartNumLog2 + nCurOctantDepth <= m_nMaxYPartNumLog2 + m_nMaxOctantDepth );
-#else
-  assert( nCurYPartNumLog2 <= m_nMaxYPartNumLog2 );
-#endif 
 
   m_nCurOctantDepth = nCurOctantDepth;

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

@@ -60 +60 @@
 #define R0164_CGS_LUT_BUGFIX             1      ///< JCTVC-R0164: Bug fix with LUT syntax
 #define R0164_CGS_LUT_BUGFIX_CHECK       0      ///< JCTVC-R0164: Add traces explicitly/non-explicitly encoded vertices and check if 3DLUT is correctly filled
-#define R0179_CGS_SIZE_8x1x1             1      ///< JCTVC-R0179: allow CGS LUT size to be 8x1x1 as well 
 #define R0179_ENC_OPT_3DLUT_SIZE         0      ///< JCTVC-R0179: RD decision based LUT size selection 
 #endif