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

Timestamp:

27 Mar 2014, 18:52:26 (10 years ago)

Author:

tech

Message:

Cleanups part 1.

File:

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

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

@@ -94 +94 @@
 
 #if H_3D_ARP
-#if MTK_ARP_FLAG_CABAC_SIMP_G0061
 #define NUM_ARPW_CTX                  3       ///< number of context models for weighting factor index used by advanced residual prediction
-#else
-#define NUM_ARPW_CTX                  4       ///< number of context models for weighting factor index used by advanced residual prediction
-#endif
 #endif
 
 #if H_3D_IC
-#if MTK_IC_FLAG_CABAC_SIMP_G0061
 #define NUM_IC_FLAG_CTX               1       ///< number of context models for illumination compensation flag
-#else
-#define NUM_IC_FLAG_CTX               3       ///< number of context models for illumination compensation flag
-#endif
 #endif
 
@@ -366 +358 @@
 
 #if H_3D_ARP
-#if MTK_ARP_FLAG_CABAC_SIMP_G0061
 static const UChar 
 INIT_ARPW[3][NUM_ARPW_CTX] = 
@@ -374 +365 @@
     { 162, 153, 162 },
 };
-#else
-static const UChar 
-INIT_ARPW[3][NUM_ARPW_CTX] = 
-{
-    { 162, 153, 154, 162 },
-    { 162, 153, 154, 162 },
-    { 162, 153, 154, 162 },
-};
-#endif
+
 #endif
 #if H_3D_IC
-#if MTK_IC_FLAG_CABAC_SIMP_G0061
 static const UChar 
 INIT_IC_FLAG[3][NUM_IC_FLAG_CTX] =  
@@ -393 +375 @@
     { 154 },
 };
-#else
-static const UChar 
-INIT_IC_FLAG[3][NUM_IC_FLAG_CTX] =  
-{
-    { 154,  154,  154, },
-    { 154,  154,  154, },
-    { 154,  154,  154, },
-};
-#endif
+
 #endif
 #if H_3D_DIM