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

Timestamp:

8 Jul 2015, 23:43:06 (10 years ago)

Author:

seregin

Message:

macro cleanup: R0300_CGS_RES_COEFF_CODING

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TCom3DAsymLUT.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -30 +30 @@
   virtual Void destroy();
 
-  Int   getMaxOctantDepth() { return m_nMaxOctantDepth; }
-  Int   getCurOctantDepth() { return m_nCurOctantDepth; }
-  Int   getInputBitDepthY()  { return m_nInputBitDepthY;  }
-  Int   getOutputBitDepthY()  { return m_nOutputBitDepthY;  }
-  Int   getInputBitDepthC()  { return m_nInputBitDepthC;  }
-  Int   getOutputBitDepthC()  { return m_nOutputBitDepthC;  }
-  Int   getResQuantBit()     { return m_nResQuanBit; }
-  Void  setResQuantBit(Int n){ m_nResQuanBit = n; }
-#if R0300_CGS_RES_COEFF_CODING 
-  Int   getMappingShift()     { return m_nMappingShift; }
-  Int   getDeltaBits()        { return m_nDeltaBits; }
-  Void  setDeltaBits(Int n)   { m_nDeltaBits = n; }
-#endif 
-  Int   getMaxYPartNumLog2() { return m_nMaxYPartNumLog2; }
-  Int   getCurYPartNumLog2() { return m_nCurYPartNumLog2; }
+  Int   getMaxOctantDepth()   { return m_nMaxOctantDepth;  }
+  Int   getCurOctantDepth()   { return m_nCurOctantDepth;  }
+  Int   getInputBitDepthY()   { return m_nInputBitDepthY;  }
+  Int   getOutputBitDepthY()  { return m_nOutputBitDepthY; }
+  Int   getInputBitDepthC()   { return m_nInputBitDepthC;  }
+  Int   getOutputBitDepthC()  { return m_nOutputBitDepthC; }
+  Int   getResQuantBit()      { return m_nResQuanBit;      }
+  Void  setResQuantBit(Int n) { m_nResQuanBit = n;         }
+
+  Int   getMappingShift()     { return m_nMappingShift;    }
+  Int   getDeltaBits()        { return m_nDeltaBits;       }
+  Void  setDeltaBits(Int n)   { m_nDeltaBits = n;          }
+
+  Int   getMaxYPartNumLog2()  { return m_nMaxYPartNumLog2; }
+  Int   getCurYPartNumLog2()  { return m_nCurYPartNumLog2; }
 
   Void  addRefLayerId( UInt uiRefLayerId )  
@@ -101 +101 @@
   Int   m_nMappingOffset;
   Int   m_nResQuanBit;
-#if R0300_CGS_RES_COEFF_CODING
   Int   m_nDeltaBits;
-#endif
+
   SCuboid *** m_pCuboid;
   const static Int m_nVertexIdxOffset[4][3];

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

@@ -57 +57 @@
 #define CGS_3D_ASYMLUT                   1      ///< Colour gamut scalability with look-up table
 #if CGS_3D_ASYMLUT
-#define CGS_GCC_NO_VECTORIZATION         1
+#define CGS_GCC_NO_VECTORIZATION         1      ///< disable victorization to avoid issues with some compilers
 #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 R0300_CGS_RES_COEFF_CODING       1      ///< JCTVC-R0300: improved residual coefficient coding for R0151
 #define R0179_ENC_OPT_3DLUT_SIZE         0      ///< JCTVC-R0179: RD decision based LUT size selection 
 #endif