Changeset 1214 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

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

Author:

seregin

Message:

macro cleanup: R0151_CGS_3D_ASYMLUT_IMPROVE

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (6 diffs)
• TDecCAVLC.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -3535 +3535 @@
 #endif
 
-#if R0151_CGS_3D_ASYMLUT_IMPROVE
   Int nAdaptCThresholdU = 1 << ( uiChromaInputBitDepthM8 + 8 - 1 );
   Int nAdaptCThresholdV = 1 << ( uiChromaInputBitDepthM8 + 8 - 1 );
@@ -3547 +3546 @@
     nAdaptCThresholdV += delta;
   }
-#endif
+
   pc3DAsymLUT->destroy();
-  pc3DAsymLUT->create( uiCurOctantDepth , uiInputBitDepthM8 + 8 ,  
-    uiChromaInputBitDepthM8 + 8 ,
-    uiOutputBitDepthM8 + 8 , 
-    uiChromaOutputBitDepthM8 + 8 ,
-    uiCurPartNumLog2 
-#if R0151_CGS_3D_ASYMLUT_IMPROVE
-    , nAdaptCThresholdU , nAdaptCThresholdV 
-#endif    
-    );
+  pc3DAsymLUT->create( uiCurOctantDepth, uiInputBitDepthM8 + 8, uiChromaInputBitDepthM8 + 8, uiOutputBitDepthM8 + 8, uiChromaOutputBitDepthM8 + 8, uiCurPartNumLog2, nAdaptCThresholdU, nAdaptCThresholdV );
   pc3DAsymLUT->setResQuantBit( uiResQaunBit );
 
@@ -3613 +3604 @@
         if( uiCodeVertex )
         {
-#if R0151_CGS_3D_ASYMLUT_IMPROVE
 #if R0300_CGS_RES_COEFF_CODING
           xReadParam( deltaY, nFLCbits );
@@ -3622 +3612 @@
           xReadParam( deltaU );
           xReadParam( deltaV );
-#endif
-#else
-          READ_SVLC( deltaY , "resY" );
-          READ_SVLC( deltaU , "resU" );
-          READ_SVLC( deltaV , "resV" );
 #endif
         }
@@ -3665 +3650 @@
 }
 
-#if R0151_CGS_3D_ASYMLUT_IMPROVE
 #if R0300_CGS_RES_COEFF_CODING
 Void TDecCavlc::xReadParam( Int& param, Int rParam )
@@ -3691 +3675 @@
   else param = 0;
 }
-#endif
 #endif
 

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.h

@@ -148 +148 @@
   Void xParse3DAsymLUT( TCom3DAsymLUT * pc3DAsymLUT );
   Void xParse3DAsymLUTOctant( TCom3DAsymLUT * pc3DAsymLUT , Int nDepth , Int yIdx , Int uIdx , Int vIdx , Int nLength );
-#if R0151_CGS_3D_ASYMLUT_IMPROVE
 #if R0300_CGS_RES_COEFF_CODING
   Void xReadParam( Int& param, Int flc_bits );
 #else
   Void xReadParam( Int& param );
-#endif
 #endif
 #endif