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

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/TLibDecoder

Files:

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

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

@@ -3516 +3516 @@
   }
 
-  UInt uiCurOctantDepth , uiCurPartNumLog2 , uiInputBitDepthM8 , uiOutputBitDepthM8 , uiResQaunBit;
-#if R0300_CGS_RES_COEFF_CODING
-  UInt uiDeltaBits; 
-#endif 
+  UInt uiCurOctantDepth, uiCurPartNumLog2, uiInputBitDepthM8, uiOutputBitDepthM8, uiResQaunBit, uiDeltaBits;;
+  
   READ_CODE( 2 , uiCurOctantDepth , "cm_octant_depth" ); 
   READ_CODE( 2 , uiCurPartNumLog2 , "cm_y_part_num_log2" );     
@@ -3530 +3528 @@
   READ_UVLC( uiChromaOutputBitDepthM8 , "cm_output_chroma_bit_depth_minus8" );
   READ_CODE( 2 , uiResQaunBit , "cm_res_quant_bit" );
-#if R0300_CGS_RES_COEFF_CODING
+
   READ_CODE( 2 , uiDeltaBits , "cm_flc_bits" );
   pc3DAsymLUT->setDeltaBits(uiDeltaBits + 1);
-#endif
 
   Int nAdaptCThresholdU = 1 << ( uiChromaInputBitDepthM8 + 8 - 1 );
@@ -3588 +3585 @@
   else
   {
-#if R0300_CGS_RES_COEFF_CODING
     Int nFLCbits = pc3DAsymLUT->getMappingShift()-pc3DAsymLUT->getResQuantBit()-pc3DAsymLUT->getDeltaBits() ; 
     nFLCbits = nFLCbits >= 0 ? nFLCbits:0;
-#endif
+
     for( Int l = 0 ; l < nYPartNum ; l++ )
     {
@@ -3604 +3600 @@
         if( uiCodeVertex )
         {
-#if R0300_CGS_RES_COEFF_CODING
           xReadParam( deltaY, nFLCbits );
           xReadParam( deltaU, nFLCbits );
           xReadParam( deltaV, nFLCbits );
-#else
-          xReadParam( deltaY );
-          xReadParam( deltaU );
-          xReadParam( deltaV );
-#endif
         }
 #if R0164_CGS_LUT_BUGFIX
@@ -3650 +3640 @@
 }
 
-#if R0300_CGS_RES_COEFF_CODING
 Void TDecCavlc::xReadParam( Int& param, Int rParam )
-#else
-Void TDecCavlc::xReadParam( Int& param )
-#endif
-{
-#if !R0300_CGS_RES_COEFF_CODING
-  const UInt rParam = 7;
-#endif
+{
   UInt prefix;
   UInt codeWord ;

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 R0300_CGS_RES_COEFF_CODING
   Void xReadParam( Int& param, Int flc_bits );
-#else
-  Void xReadParam( Int& param );
-#endif
 #endif
 #endif //SVC_EXTENSION