Merge branch 'fix_decoder_analyser' into 'master'

Fix decoder analyser

See merge request jvet/VVCSoftware_VTM!242

source/Lib/CommonLib/CodingStatistics.h

@@ -78,7 +78,11 @@ enum CodingStatisticsType
   STATS__CABAC_BITS__CHROMA_QP_ADJUSTMENT,
   STATS__CABAC_BITS__QT_CBF,
   STATS__CABAC_BITS__CROSS_COMPONENT_PREDICTION,
+#if JVET_M0464_UNI_MTS
+  STATS__CABAC_BITS__MTS_FLAGS,
+#else
   STATS__CABAC_BITS__TRANSFORM_SKIP_FLAGS,
+#endif
   STATS__CABAC_BITS__LAST_SIG_X_Y,
   STATS__CABAC_BITS__SIG_COEFF_GROUP_FLAG,
   STATS__CABAC_BITS__SIG_COEFF_MAP_FLAG,
@@ -103,8 +107,10 @@ enum CodingStatisticsType
   STATS__CABAC_BITS__INVALID,
   STATS__CABAC_BITS__IMV_FLAG,
   STATS__CABAC_BITS__GBI_IDX,
+#if !JVET_M0464_UNI_MTS
   STATS__CABAC_BITS__EMT_CU_FLAG,
   STATS__CABAC_BITS__EMT_TU_INDEX,
+#endif
 #if JVET_M0140_SBT
   STATS__CABAC_BITS__SBT_MODE,
 #endif
@@ -112,12 +118,12 @@ enum CodingStatisticsType
   STATS__CABAC_BITS__TRIANGLE_FLAG,
   STATS__CABAC_BITS__TRIANGLE_INDEX,
   STATS__CABAC_BITS__MULTI_REF_LINE,
-  STATS__TOOL_TOTAL_FRAME,// This is a special case and is not included in the report.
-  STATS__TOOL_AFF,
-  STATS__TOOL_EMT,
 #if JVET_M0444_SMVD
   STATS__CABAC_BITS__SYMMVD_FLAG,
 #endif
+  STATS__TOOL_TOTAL_FRAME,// This is a special case and is not included in the report.
+  STATS__TOOL_AFF,
+  STATS__TOOL_EMT,
   STATS__TOOL_TOTAL,
   STATS__NUM_STATS
 };
@@ -167,7 +173,11 @@ static inline const char* getName(CodingStatisticsType name)
     "CABAC_BITS__CHROMA_QP_ADJUSTMENT",
     "CABAC_BITS__QT_CBF",
     "CABAC_BITS__CROSS_COMPONENT_PREDICTION",
+#if JVET_M0464_UNI_MTS
+    "CABAC_BITS__MTS_FLAGS",
+#else
     "CABAC_BITS__TRANSFORM_SKIP_FLAGS",
+#endif
     "CABAC_BITS__LAST_SIG_X_Y",
     "CABAC_BITS__SIG_COEFF_GROUP_FLAG",
     "CABAC_BITS__SIG_COEFF_MAP_FLAG",
@@ -192,8 +202,10 @@ static inline const char* getName(CodingStatisticsType name)
     "CABAC_BITS__INVALID",
     "CABAC_BITS__IMV_FLAG",
     "CABAC_BITS__GBI_IDX",
+#if !JVET_M0464_UNI_MTS
     "CABAC_BITS__EMT_CU_FLAG",
     "CABAC_BITS__EMT_TU_INDX",
+#endif
 #if JVET_M0140_SBT
     "CABAC_BITS__SBT_MODE",
 #endif

source/Lib/DecoderLib/CABACReader.cpp

@@ -2876,6 +2876,8 @@ void CABACReader::mts_coding( TransformUnit& tu, ComponentID compID )
 
   if( !mtsAllowed && !tsAllowed ) return;
 
+  RExt__DECODER_DEBUG_BIT_STATISTICS_CREATE_SET_SIZE2( STATS__CABAC_BITS__MTS_FLAGS, tu.blocks[compID], compID );
+
   int symbol = 0;
   int ctxIdx = 0;