Changeset 782 in 3DVCSoftware for branches/HTM-9.3-dev3-Qualcomm/source/Lib/TLibCommon/ContextTables.h

Timestamp:

20 Jan 2014, 05:01:03 (10 years ago)

Author:

qualcomm

Message:

integration of JCT3V-G0130 (unify signaling and delta DC coding in intra SDC and inter SDC) by Qualcomm

File:

• branches/HTM-9.3-dev3-Qualcomm/source/Lib/TLibCommon/ContextTables.h (modified) (6 diffs)

branches/HTM-9.3-dev3-Qualcomm/source/Lib/TLibCommon/ContextTables.h

@@ -119 +119 @@
 #if QC_GENERIC_SDC_G0122
 #define NUM_ANGLE_FLAG_CTX            3
+#if !QC_SDC_UNIFY_G0130
 #define NUM_INTRASDC_FLAG_CTX         3
+#endif
 #endif
 #endif
@@ -128 +130 @@
 #endif
 
-#if H_3D_INTER_SDC
+#if H_3D_INTER_SDC && !QC_SDC_UNIFY_G0130
 #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
 #define NUM_INTER_SDC_RESIDUAL_CTX    1      ///< number of context models for abs of inter SDC residual
+#endif
+#if QC_SDC_UNIFY_G0130
+#define NUM_SDC_FLAG_CTX              1      ///< number of context models for inter SDC flag
 #endif
 // ====================================================================================================================
@@ -417 +422 @@
   { 155, 170, 157 },
 };
+#if !QC_SDC_UNIFY_G0130
 static const UChar 
 INIT_INTRASDC_FLAG[3][NUM_INTRASDC_FLAG_CTX] =
@@ -425 +431 @@
 };
 #endif
+#endif
 
 static const UChar 
@@ -467 +474 @@
 #endif
 
-#if H_3D_INTER_SDC
+#if H_3D_INTER_SDC && !QC_SDC_UNIFY_G0130
 static const UChar 
 INIT_INTER_SDC_FLAG[3][NUM_INTER_SDC_FLAG_CTX] =
@@ -493 +500 @@
 #endif
 //! \}
-
-
-#endif
+#if QC_SDC_UNIFY_G0130
+static const UChar 
+INIT_SDC_FLAG[3][NUM_SDC_FLAG_CTX] =
+{
+  { 154 },  
+  { 154 },
+  { 154 },
+};
+#endif
+
+#endif