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

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/App/TAppEncoder

Files:

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

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

@@ -1647 +1647 @@
   ("AltOutputLayerFlag",               m_altOutputLayerFlag,                      false, "Specifies the value of alt_output_layer_flag in VPS extension")
   ("CrossLayerBLAFlag",                m_crossLayerBLAFlag,                       false, "Specifies the value of cross_layer_bla_flag in VPS")
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   ("CGS",     m_nCGSFlag , 0, "whether CGS is enabled")
   ("CGSMaxOctantDepth", m_nCGSMaxOctantDepth , 1, "max octant depth")
@@ -4203 +4203 @@
   }
 #endif 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   xConfirmPara( m_nCGSFlag < 0 || m_nCGSFlag > 1 , "0<=CGS<=1" );
 #endif
@@ -4508 +4508 @@
   printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );
 #endif
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   printf("CGS: %d CGSMaxOctantDepth: %d CGSMaxYPartNumLog2: %d CGSLUTBit:%d " , m_nCGSFlag , m_nCGSMaxOctantDepth , m_nCGSMaxYPartNumLog2 , m_nCGSLUTBit );
 #endif

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

@@ -506 +506 @@
   Bool      m_crossLayerBLAFlag;
   Bool      m_useInterLayerWeightedPred;
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Int       m_nCGSFlag;
   Int       m_nCGSMaxOctantDepth;

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

@@ -756 +756 @@
     m_acTEncTop[layer].setAltOuputLayerFlag                      ( m_altOutputLayerFlag );
     m_acTEncTop[layer].setCrossLayerBLAFlag                      ( m_crossLayerBLAFlag );
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
     m_acTEncTop[layer].setCGSFlag                                ( layer == 0 ? 0 : m_nCGSFlag );
     m_acTEncTop[layer].setCGSMaxOctantDepth                      ( m_nCGSMaxOctantDepth );