Changeset 601 in 3DVCSoftware for branches/HTM-DEV-2.0-dev0/source/Lib/TLibCommon/ContextTables.h

Timestamp:

29 Aug 2013, 15:10:30 (12 years ago)

Author:

tech

Message:

Merged dev3: DEV-2.0-DEV3-KWU@589

File:

• branches/HTM-DEV-2.0-dev0/source/Lib/TLibCommon/ContextTables.h (modified) (5 diffs)

branches/HTM-DEV-2.0-dev0/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
 #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
@@ -388 +390 @@
 #endif
 #if H_3D_DIM
+#if ZJU_DEPTH_INTRA_MODE_E0204
+static const UChar
+INIT_DEPTH_INTRA_MODE[3][NUM_DEPTH_INTRA_MODE_CTX] =
+{
+    {0,  0,  64, 168, 168, 124, CNU, 0},
+    {0, 64,   0, 183, CNU, 108,   0, 0},
+    {64, 0, CNU, CNU, 168, 109,   0, 0}
+};
+#else
 static const UChar 
 INIT_DEPTH_INTRA_MODE[3][NUM_DEPTH_INTRA_MODE_CTX] =
@@ -395 +406 @@
   {64, 0, CNU,   0, CNU,   0,   0, 0}
 };
+#endif
 static const UChar 
 INIT_DDC_FLAG[3][NUM_DDC_FLAG_CTX] =
@@ -417 +429 @@
   { CNU }, 
 };
+#if !SEC_DMM2_E0146
 static const UChar
 INIT_DMM2_DATA[3][NUM_DMM2_DATA_CTX] = 
@@ -424 +437 @@
   { CNU }, 
 };
+#endif
 static const UChar
 INIT_DMM3_DATA[3][NUM_DMM3_DATA_CTX] =