Changeset 414 in 3DVCSoftware for branches/HTM-6.2-dev3-RWTH-Fix

Timestamp:

17 May 2013, 14:17:35 (12 years ago)

Author:

rwth

Message:

• renamed LGE_CONCATENATE to LGE_CONCATENATE_D0141

Location:

branches/HTM-6.2-dev3-RWTH-Fix/source/Lib

Files:

• TLibCommon/ContextTables.h (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecSbac.cpp (modified) (2 diffs)
• TLibEncoder/TEncSbac.cpp (modified) (3 diffs)

branches/HTM-6.2-dev3-RWTH-Fix/source/Lib/TLibCommon/ContextTables.h

@@ -138 +138 @@
 #define SDC_NUM_SIGN_FLAG_CTX            1
 #endif
-#if LGE_CONCATENATE
+#if LGE_CONCATENATE_D0141
 #define SDC_NUM_RESIDUAL_CTX             1
 #else
@@ -581 +581 @@
 };
     
-#if LGE_CONCATENATE
+#if LGE_CONCATENATE_D0141
 static const UChar INIT_SDC_RESIDUAL[3][SDC_NUM_RESIDUAL_CTX] =
 {

branches/HTM-6.2-dev3-RWTH-Fix/source/Lib/TLibCommon/TypeDef.h

@@ -74 +74 @@
 #define INTEL_SDC64_D0193                 1   // JCT3V-D0193: SDC binary clean up (use a 1 bit binary code to signal sdc_pred_mode when CU size is 64x64)
 #define RWTH_SDC_CTX_SIMPL_D0032          1   // JCT3V-D0032: CABAC Context Reduction for Simplified Depth Coding
-#define LGE_CONCATENATE                 1 // JCT3V-D0141: concatenate binarization for residual index coding
+#define LGE_CONCATENATE_D0141                 1 // JCT3V-D0141: concatenate binarization for residual index coding
 #endif
 #define FIX_SDC_ENC_RD_WVSO_D0163         1   // JCT3V-D0163: fix for SDC encoder rd-cost (VSO -> WVSO)

branches/HTM-6.2-dev3-RWTH-Fix/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -41 +41 @@
 #define GetNumDepthValues()     (pcCU->getSlice()->getSPS()->getNumDepthValues())
 #define GetBitsPerDepthValue()  (pcCU->getSlice()->getSPS()->getBitsPerDepthValue())
-#if LGE_CONCATENATE
+#if LGE_CONCATENATE_D0141
 #define PrefixThreshold ( ((GetNumDepthValues() * 3) >> 2) )
 #define BitsPerSuffix ( (UInt)ceil( Log2(GetNumDepthValues() - PrefixThreshold) ) )
@@ -2677 +2677 @@
     
     // decode residual magnitude
-#if LGE_CONCATENATE
+#if LGE_CONCATENATE_D0141
     //prefix part
     UInt uiCount = 0;

branches/HTM-6.2-dev3-RWTH-Fix/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -45 +45 @@
 #define GetNumDepthValues()     (pcCU->getSlice()->getSPS()->getNumDepthValues())
 #define GetBitsPerDepthValue()  (pcCU->getSlice()->getSPS()->getBitsPerDepthValue())
-#if LGE_CONCATENATE
+#if LGE_CONCATENATE_D0141
 #define PrefixThreshold ( ((GetNumDepthValues() * 3) >> 2) )
 #define BitsPerSuffix ( (UInt)ceil( Log2(GetNumDepthValues() - PrefixThreshold) ) )
@@ -2653 +2653 @@
   UInt uiSign     = segmentDCOffset < 0 ? 1 : 0;
   UInt uiAbsIdx   = abs(segmentDCOffset);
-#if !LGE_CONCATENATE
+#if !LGE_CONCATENATE_D0141
   UInt uiBit = 0;
 #endif
@@ -2680 +2680 @@
     // encode residual magnitude
     uiAbsIdx -= 1;
-#if LGE_CONCATENATE
+#if LGE_CONCATENATE_D0141
     //prefix part
     if ( uiAbsIdx == 0 )