Changeset 826 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

12 Jul 2014, 08:45:16 (10 years ago)

Author:

interdigital

Message:

Added R0300_CGS_RES_COEFF_CODING for improved residual coefficient coding
Added R0179_CGS_SIZE_8x1x1 to allow 8x1x1 LUT size

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (5 diffs)

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

@@ -3935 +3935 @@
 #endif
   UInt uiCurOctantDepth , uiCurPartNumLog2 , uiInputBitDepthM8 , uiOutputBitDepthM8 , uiResQaunBit;
+#if R0300_CGS_RES_COEFF_CODING
+  UInt uiDeltaBits; 
+#endif 
   READ_CODE( 2 , uiCurOctantDepth , "cm_octant_depth" ); 
   READ_CODE( 2 , uiCurPartNumLog2 , "cm_y_part_num_log2" );     
@@ -3952 +3955 @@
 #endif
   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
+
 #if R0151_CGS_3D_ASYMLUT_IMPROVE
 #if R0150_CGS_SIGNAL_CONSTRAINTS
@@ -4020 +4028 @@
   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++ )
     {
@@ -4033 +4045 @@
         {
 #if R0151_CGS_3D_ASYMLUT_IMPROVE
+#if R0300_CGS_RES_COEFF_CODING
+          xReadParam( deltaY, nFLCbits );
+          xReadParam( deltaU, nFLCbits );
+          xReadParam( deltaV, nFLCbits );
+#else
           xReadParam( deltaY );
           xReadParam( deltaU );
           xReadParam( deltaV );
+#endif
 #else
           READ_SVLC( deltaY , "resY" );
@@ -4056 +4074 @@
 
 #if R0151_CGS_3D_ASYMLUT_IMPROVE
+#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 ;