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

Timestamp:

4 May 2015, 17:47:40 (9 years ago)

Author:

tech

Message:

Merged 14.0-dev0@1187.

File:

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

trunk/source/Lib/TLibCommon/ContextTables.h

@@ -51 +51 @@
 #define NUM_SPLIT_FLAG_CTX            3       ///< number of context models for split flag
 #define NUM_SKIP_FLAG_CTX             3       ///< number of context models for skip flag
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 #define NUM_DIS_FLAG_CTX              1
 #define NUM_DIS_TYPE_CTX              1       
-#else
-#if H_3D_SINGLE_DEPTH
-#define NUM_SINGLEDEPTH_FLAG_CTX                     1
-#define NUM_SINGLE_DEPTH_VALUE_DATA_CTX              1       
-#endif
 #endif
 #define NUM_MERGE_FLAG_EXT_CTX        1       ///< number of context models for merge flag of merge extended
@@ -158 +153 @@
   { CNU,  CNU,  CNU, }, 
 };
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 static const UChar 
 INIT_DIS_FLAG[3][NUM_DIS_FLAG_CTX] =  
@@ -173 +168 @@
     { 137 }, 
 };
-#else
-#if H_3D_SINGLE_DEPTH
-static const UChar 
-INIT_SINGLEDEPTH_FLAG[3][NUM_SINGLEDEPTH_FLAG_CTX] =  
-{
-  { 185 }, 
-  { 185 }, 
-  { 185 }, 
-};
-static const UChar
-INIT_SINGLE_DEPTH_VALUE_DATA[3][NUM_SINGLE_DEPTH_VALUE_DATA_CTX] = 
-{
-  { 137 }, 
-  { 137 }, 
-  { 137 }, 
-};
-#endif
 #endif
 static const UChar