Changeset 1214 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

8 Jul 2015, 23:35:39 (9 years ago)

Author:

seregin

Message:

macro cleanup: R0151_CGS_3D_ASYMLUT_IMPROVE

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1652 +1652 @@
   ("CGSMaxYPartNumLog",  m_nCGSMaxYPartNumLog2 , 2, "max Y part number ")
   ("CGSLUTBit",     m_nCGSLUTBit , 12, "bit depth of CGS LUT")
-#if R0151_CGS_3D_ASYMLUT_IMPROVE
   ("CGSAdaptC",     m_nCGSAdaptiveChroma , 1, "adaptive chroma partition (only for the case of two chroma partitions)")
-#endif
 #if R0179_ENC_OPT_3DLUT_SIZE
   ("CGSSizeRDO",     m_nCGSLutSizeRDO , 0, "RDOpt selection of best table size (effective when large maximum table size such as 8x8x8 is used)")
@@ -4511 +4509 @@
   printf("CGS: %d CGSMaxOctantDepth: %d CGSMaxYPartNumLog2: %d CGSLUTBit:%d " , m_nCGSFlag , m_nCGSMaxOctantDepth , m_nCGSMaxYPartNumLog2 , m_nCGSLUTBit );
 #endif
-#if R0151_CGS_3D_ASYMLUT_IMPROVE
   printf("CGSAdaptC:%d " , m_nCGSAdaptiveChroma );
-#endif
 #if R0179_ENC_OPT_3DLUT_SIZE
   printf("CGSSizeRDO:%d " , m_nCGSLutSizeRDO );

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -511 +511 @@
   Int       m_nCGSMaxYPartNumLog2;
   Int       m_nCGSLUTBit;
-#if R0151_CGS_3D_ASYMLUT_IMPROVE
   Int       m_nCGSAdaptiveChroma;
-#endif
 #if R0179_ENC_OPT_3DLUT_SIZE
   Int       m_nCGSLutSizeRDO;

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -761 +761 @@
     m_acTEncTop[layer].setCGSMaxYPartNumLog2                     ( m_nCGSMaxYPartNumLog2 );
     m_acTEncTop[layer].setCGSLUTBit                              ( m_nCGSLUTBit );
-#if R0151_CGS_3D_ASYMLUT_IMPROVE
     m_acTEncTop[layer].setCGSAdaptChroma                         ( m_nCGSAdaptiveChroma );
-#endif
 #if R0179_ENC_OPT_3DLUT_SIZE
     m_acTEncTop[layer].setCGSLutSizeRDO                          ( m_nCGSLutSizeRDO );