Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibCommon/ContextTables.h

Timestamp:

23 Oct 2013, 23:01:30 (12 years ago)

Author:

tech

Message:

Merged 8.1-Cleanup@654

File:

• trunk/source/Lib/TLibCommon/ContextTables.h (modified) (6 diffs)

trunk/source/Lib/TLibCommon/ContextTables.h

@@ -112 +112 @@
 #if H_3D_DIM_DMM
 #define NUM_DMM1_DATA_CTX             1       ///< number of context models for DMM1 data
-#if !SEC_DMM2_E0146_HHIFIX
-#define NUM_DMM2_DATA_CTX             1       ///< number of context models for DMM2 data
-#endif
 #define NUM_DMM3_DATA_CTX             1       ///< number of context models for DMM3 data
 #endif
@@ -127 +124 @@
 #endif
 
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
 #define NUM_INTER_SDC_FLAG_CTX        1      ///< number of context models for inter SDC flag
 #define NUM_INTER_SDC_SIGN_FLAG_CTX   1      ///< number of context models for sign of inter SDC residual
@@ -390 +387 @@
 #endif
 #if H_3D_DIM
-#if ZJU_DEPTH_INTRA_MODE_E0204
 static const UChar
 INIT_DEPTH_INTRA_MODE[3][NUM_DEPTH_INTRA_MODE_CTX] =
@@ -398 +394 @@
     {64, 0, CNU, CNU, 168, 109,   0, 0}
 };
-#else
-static const UChar 
-INIT_DEPTH_INTRA_MODE[3][NUM_DEPTH_INTRA_MODE_CTX] =
-{
-  {0,  0,  64,   0, CNU,   0, CNU, 0},
-  {0, 64,   0, CNU,   0, CNU,   0, 0},
-  {64, 0, CNU,   0, CNU,   0,   0, 0}
-};
-#endif
+
 static const UChar 
 INIT_DDC_FLAG[3][NUM_DDC_FLAG_CTX] =
@@ -429 +417 @@
   { CNU }, 
 };
-#if !SEC_DMM2_E0146_HHIFIX
-static const UChar
-INIT_DMM2_DATA[3][NUM_DMM2_DATA_CTX] = 
-{
-  { CNU }, 
-  { CNU }, 
-  { CNU }, 
-};
-#endif
 static const UChar
 INIT_DMM3_DATA[3][NUM_DMM3_DATA_CTX] = 
@@ -473 +452 @@
 #endif
 
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
 static const UChar 
 INIT_INTER_SDC_FLAG[3][NUM_INTER_SDC_FLAG_CTX] =