Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibCommon/ContextTables.h

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibCommon/ContextTables.h (modified) (10 diffs)

branches/HTM-16.2-dev/source/Lib/TLibCommon/ContextTables.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -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 NH_3D_DIS
+#if NH_3D
 #define NUM_DIS_FLAG_CTX              1
 #define NUM_DIS_TYPE_CTX              1       
@@ -162 +162 @@
 #define NUM_CU_TRANSQUANT_BYPASS_FLAG_CTX  1
 
-#if NH_3D_ARP
+#if NH_3D
 #define NUM_ARPW_CTX                  3       ///< number of context models for weighting factor index used by advanced residual prediction
-#endif
-
-#if NH_3D_IC
 #define NUM_IC_FLAG_CTX               1       ///< number of context models for illumination compensation flag
 #endif
+
 #define NUM_CROSS_COMPONENT_PREDICTION_CTX 10
 
 #define CNU                          154      ///< dummy initialization value for unused context models 'Context model Not Used'
 
-#if NH_3D_DMM
+#if NH_3D
 #define NUM_NOTDMM_FLAG_CTX           1       ///< number of context models for not-DMM flag
 #define NUM_DMM_MODE_CTX              1       ///< number of context models for DMM modes
-#endif
-#if NH_3D_DMM || NH_3D_SDC_INTRA
 #define NUM_DDC_DATA_CTX              1       ///< number of context models for deltaDC data (DMM or SDC)
-#endif
-#if NH_3D_SDC_INTRA
 #define SDC_NUM_RESIDUAL_FLAG_CTX     1
 #define SDC_NUM_RESIDUAL_CTX          1
 #define NUM_SDC_FLAG_CTX              1      ///< number of context 
 #define NUM_DDC_FLAG_CTX              2       ///< number of context models for deltaDC flag (SDC only)
-#endif
-#if NH_3D_DBBP
-#define DBBP_NUM_FLAG_CTX                 1
+#define DBBP_NUM_FLAG_CTX             1
 #endif
 // ====================================================================================================================
@@ -218 +210 @@
   { CNU,  CNU,  CNU, },
 };
-#if NH_3D_DIS
+#if NH_3D
 static const UChar 
 INIT_DIS_FLAG[3][NUM_DIS_FLAG_CTX] =  
@@ -540 +532 @@
 //! \}
 
-#if NH_3D_ARP
+#if NH_3D
 static const UChar 
 INIT_ARPW[3][NUM_ARPW_CTX] = 
@@ -549 +541 @@
 };
 
-#endif
-#if NH_3D_IC
 static const UChar 
 INIT_IC_FLAG[3][NUM_IC_FLAG_CTX] =  
@@ -559 +549 @@
 };
 
-#endif
-
-#if NH_3D_DMM
 static const UChar 
 INIT_NOTDMM_FLAG[3][NUM_NOTDMM_FLAG_CTX] =
@@ -576 +563 @@
   { CNU }
 };
-#endif
-#if NH_3D_DMM || NH_3D_SDC_INTRA
+
 static const UChar
 INIT_DDC_DATA[3][NUM_DDC_DATA_CTX] = 
@@ -585 +571 @@
   { CNU }, 
 };
-#endif
-#if NH_3D_SDC_INTRA
+
 static const UChar
 INIT_SDC_RESIDUAL_FLAG[3][SDC_NUM_RESIDUAL_FLAG_CTX] =
@@ -615 +600 @@
   {64, CNU}
 };
+static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
+{
+  { CNU },
+  { CNU },
+  { CNU },
+};
 #endif
-#if NH_3D_DBBP
-static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
-{
-  { CNU },
-  { CNU },
-  { CNU },
-};
+
 #endif
-
-#endif