From 31714bcd6c3a03ca14bd9b08c1742ed7c6101344 Mon Sep 17 00:00:00 2001
From: Karl Sharman <karl.sharman@sony.com>
Date: Thu, 11 Apr 2019 17:19:40 +0100
Subject: [PATCH] Fix decoder analyser.
---
source/Lib/CommonLib/CodingStatistics.h | 6 ++++++
source/Lib/DecoderLib/CABACReader.cpp | 1 +
2 files changed, 7 insertions(+)
diff --git a/source/Lib/CommonLib/CodingStatistics.h b/source/Lib/CommonLib/CodingStatistics.h
index 1a47050e3..196124911 100644
--- a/source/Lib/CommonLib/CodingStatistics.h
+++ b/source/Lib/CommonLib/CodingStatistics.h
@@ -76,6 +76,9 @@ enum CodingStatisticsType
STATS__CABAC_BITS__CHROMA_QP_ADJUSTMENT,
STATS__CABAC_BITS__QT_CBF,
STATS__CABAC_BITS__CROSS_COMPONENT_PREDICTION,
+#if JVET_N0054_JOINT_CHROMA
+ STATS__CABAC_BITS__JOINT_CB_CR,
+#endif
STATS__CABAC_BITS__MTS_FLAGS,
STATS__CABAC_BITS__LAST_SIG_X_Y,
STATS__CABAC_BITS__SIG_COEFF_GROUP_FLAG,
@@ -157,6 +160,9 @@ static inline const char* getName(CodingStatisticsType name)
"CABAC_BITS__CHROMA_QP_ADJUSTMENT",
"CABAC_BITS__QT_CBF",
"CABAC_BITS__CROSS_COMPONENT_PREDICTION",
+#if JVET_N0054_JOINT_CHROMA
+ "CABAC_BITS__JOINT_CB_CR",
+#endif
"CABAC_BITS__MTS_FLAGS",
"CABAC_BITS__LAST_SIG_X_Y",
"CABAC_BITS__SIG_COEFF_GROUP_FLAG",
diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp
index 27d76ecc7..890d34e24 100644
--- a/source/Lib/DecoderLib/CABACReader.cpp
+++ b/source/Lib/DecoderLib/CABACReader.cpp
@@ -2456,6 +2456,7 @@ void CABACReader::cu_chroma_qp_offset( CodingUnit& cu )
#if JVET_N0054_JOINT_CHROMA
void CABACReader::joint_cb_cr( TransformUnit& tu )
{
+ RExt__DECODER_DEBUG_BIT_STATISTICS_CREATE_SET_SIZE2( STATS__CABAC_BITS__JOINT_CB_CR, tu.blocks[COMPONENT_Cr].lumaSize(), CHANNEL_TYPE_CHROMA );
tu.jointCbCr = m_BinDecoder.decodeBin( Ctx::JointCbCrFlag( 0 ) );
}
#endif
--
GitLab