Changeset 764 in 3DVCSoftware for branches/HTM-9.2-dev0/source/Lib/TLibCommon/ContextTables.h

Timestamp:

12 Jan 2014, 00:23:20 (11 years ago)

Author:

tech

Message:

Cleanup part 1

File:

• branches/HTM-9.2-dev0/source/Lib/TLibCommon/ContextTables.h (modified) (4 diffs)

branches/HTM-9.2-dev0/source/Lib/TLibCommon/ContextTables.h

@@ -109 +109 @@
 #define NUM_DEPTH_INTRA_MODE_CTX      8       ///< number of context models for depth intra modes
 #define NUM_DDC_FLAG_CTX              2       ///< number of context models for deltaDC flag (DMM or RBC)
-#if QC_DIM_DELTADC_UNIFY_F0132
 #define NUM_DDC_DATA_CTX              1       ///< number of context models for deltaDC data (DMM or RBC)
-#else
-#define NUM_DDC_DATA_CTX              2       ///< number of context models for deltaDC data (DMM or RBC)
-#endif
 #if H_3D_DIM_DMM
 #define NUM_DMM1_DATA_CTX             1       ///< number of context models for DMM1 data
-#if !SEC_DMM3_RBC_F0147
-#define NUM_DMM3_DATA_CTX             1       ///< number of context models for DMM3 data
-#endif
-#endif
-#if H_3D_DIM_RBC
-#define NUM_RBC_DATA_CTX              1       ///< number of context models for RBC data
 #endif
 #endif
@@ -393 +383 @@
 INIT_IC_FLAG[3][NUM_IC_FLAG_CTX] =  
 {
-#if LGE_IC_CTX_F0160
     { 154,  154,  154, },
     { 154,  154,  154, },
     { 154,  154,  154, },
-#else
-  { CNU,  CNU,  CNU, }, 
-  { 197,  185,  201, }, 
-  { 197,  185,  201, }, 
-#endif
 };
 #endif
@@ -423 +407 @@
 INIT_DDC_DATA[3][NUM_DDC_DATA_CTX] = 
 {
-#if QC_DIM_DELTADC_UNIFY_F0132
-  { 154 }, 
-  { 154 }, 
-  { 154 }, 
-#else
-  { CNU, CNU }, 
-  { CNU, CNU }, 
-  { CNU, CNU }, 
-#endif
+  { 154 }, 
+  { 154 }, 
+  { 154 }, 
 };
 #if H_3D_DIM_DMM
@@ -441 +419 @@
   { CNU }, 
 };
-#if !SEC_DMM3_RBC_F0147
-static const UChar
-INIT_DMM3_DATA[3][NUM_DMM3_DATA_CTX] = 
-{
-  { CNU }, 
-  { CNU }, 
-  { CNU }, 
-};
-#endif
-#endif
-#if H_3D_DIM_RBC
-static const UChar
-INIT_RBC_DATA[3][NUM_RBC_DATA_CTX] = 
-{
-  { CNU }, 
-  { CNU }, 
-  { CNU }, 
-};
 #endif
 #if H_3D_DIM_SDC