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

Timestamp:

25 Apr 2014, 12:38:00 (10 years ago)

Author:

tech

Message:

Merged 10.2-dev0@949.

File:

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

trunk/source/Lib/TLibCommon/ContextTables.h

@@ -110 +110 @@
 #define NUM_DMM1_DATA_CTX             1       ///< number of context models for DMM1 data
 #endif
+#if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135
+#define NUM_ANGLE_FLAG_CTX            1
+#else
 #define NUM_ANGLE_FLAG_CTX            3
+#endif
 #endif
 
@@ -368 +372 @@
 };
 
+#if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135
+static const UChar 
+INIT_ANGLE_FLAG[3][NUM_ANGLE_FLAG_CTX] =
+{
+  { 154 },
+  { 141 },
+  { 155 },
+};
+#else
 static const UChar 
 INIT_ANGLE_FLAG[3][NUM_ANGLE_FLAG_CTX] =
@@ -375 +388 @@
   { 155, 170, 157 },
 };
+#endif
 
 static const UChar 
@@ -430 +444 @@
 
 #if H_3D_DBBP
+#if MTK_DBBP_SIGNALING_H0094
 static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
 {
-  { CNU },
-  { CNU },
-  { CNU },
-};
-#endif
-
-#endif
+  { 161 },
+  { 161 },
+  { 161 },
+};
+#else
+static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
+{
+  { CNU },
+  { CNU },
+  { CNU },
+};
+#endif
+#endif
+
+#endif