Commit 598d03ea authored by Vadim Seregin's avatar Vadim Seregin

move tools stats after STATS__TOOL_TOTAL_FRAME, otherwise it is not compiling...

move tools stats after STATS__TOOL_TOTAL_FRAME, otherwise it is not compiling with JEM_TOOLS = 0 due to 0 array size
parent b49a7ad5
......@@ -66,40 +66,21 @@ enum CodingStatisticsType
STATS__CABAC_BITS__REF_FRM_IDX,
STATS__CABAC_BITS__MVD,
STATS__CABAC_BITS__MVD_EP,
#if JEM_TOOLS || JVET_K_AFFINE
STATS__CABAC_BITS__AFFINE_FLAG,
#if JVET_K0337_AFFINE_6PARA
STATS__CABAC_BITS__AFFINE_TYPE,
#endif
#endif
STATS__CABAC_BITS__TRANSFORM_SUBDIV_FLAG,
STATS__CABAC_BITS__QT_ROOT_CBF,
STATS__CABAC_BITS__DELTA_QP_EP,
STATS__CABAC_BITS__CHROMA_QP_ADJUSTMENT,
#if JEM_TOOLS
STATS__CABAC_BITS__LIC_FLAG,
#endif
STATS__CABAC_BITS__QT_CBF,
STATS__CABAC_BITS__CROSS_COMPONENT_PREDICTION,
STATS__CABAC_BITS__TRANSFORM_SKIP_FLAGS,
STATS__CABAC_BITS__LAST_SIG_X_Y,
STATS__CABAC_BITS__SIG_COEFF_GROUP_FLAG,
STATS__CABAC_BITS__SIG_COEFF_MAP_FLAG,
#if JVET_K0072
STATS__CABAC_BITS__PAR_FLAG,
#endif
STATS__CABAC_BITS__GT1_FLAG,
STATS__CABAC_BITS__GT2_FLAG,
STATS__CABAC_BITS__SIGN_BIT,
STATS__CABAC_BITS__ESCAPE_BITS,
STATS__CABAC_BITS__SAO,
#if JVET_K0371_ALF
STATS__CABAC_BITS__ALF,
#endif
#if JEM_TOOLS
STATS__CABAC_BITS__NSST,
#endif
STATS__CABAC_TRM_BITS,
STATS__CABAC_FIXED_BITS,
STATS__CABAC_PCM_ALIGN_BITS,
......@@ -110,10 +91,22 @@ enum CodingStatisticsType
STATS__CABAC_EP_BIT_ALIGNMENT,
STATS__CABAC_BITS__ALIGNED_SIGN_BIT,
STATS__CABAC_BITS__ALIGNED_ESCAPE_BITS,
#if JEM_TOOLS
STATS__CABAC_BITS__OBMC_FLAG,
STATS__CABAC_BITS__OTHER,
STATS__CABAC_BITS__INVALID,
STATS__TOOL_TOTAL_FRAME,// This is a special case and is not included in the report.
#if JEM_TOOLS || JVET_K_AFFINE
STATS__CABAC_BITS__AFFINE_FLAG,
#if JVET_K0337_AFFINE_6PARA
STATS__CABAC_BITS__AFFINE_TYPE,
#endif
#if JVET_K0357_AMVR
#endif
#if JVET_K0072
STATS__CABAC_BITS__PAR_FLAG,
#endif
#if JVET_K0371_ALF
STATS__CABAC_BITS__ALF,
#endif
#if JEM_TOOLS || JVET_K0357_AMVR
STATS__CABAC_BITS__IMV_FLAG,
#endif
#if JEM_TOOLS || JVET_K1000_SIMPLIFIED_EMT
......@@ -123,10 +116,10 @@ enum CodingStatisticsType
#if JVET_K0248_GBI
STATS__CABAC_BITS__GBI_IDX,
#endif
STATS__CABAC_BITS__OTHER,
STATS__CABAC_BITS__INVALID,
STATS__TOOL_TOTAL_FRAME,// This is a special case and is not included in the report.
#if JEM_TOOLS
STATS__CABAC_BITS__NSST,
STATS__CABAC_BITS__LIC_FLAG,
STATS__CABAC_BITS__OBMC_FLAG,
STATS__TOOL_AFF,
STATS__TOOL_NSST,
STATS__TOOL_EMT,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment