Commit 17f4f73e authored by Jingning Han's avatar Jingning Han

Remove unused cdf entries for newmv cdf

Reduce the context model size for newmv flag from 6 to 5. No
codec behavior will be changed.

Change-Id: If54fc58cee01811f1f8c786fa2db0a67e9d11852
parent 683e84b6
......@@ -18,9 +18,10 @@
#include "av1/common/txb_common.h"
static const aom_cdf_prob default_newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(2)] =
{ { AOM_CDF2(128 * 155) }, { AOM_CDF2(128 * 116) }, { AOM_CDF2(128 * 94) },
{ AOM_CDF2(128 * 32) }, { AOM_CDF2(128 * 96) }, { AOM_CDF2(128 * 56) },
{ AOM_CDF2(128 * 30) } };
{
{ AOM_CDF2(128 * 155) }, { AOM_CDF2(128 * 116) }, { AOM_CDF2(128 * 94) },
{ AOM_CDF2(128 * 32) }, { AOM_CDF2(128 * 96) }, { AOM_CDF2(128 * 30) }
};
static const aom_cdf_prob default_zeromv_cdf[GLOBALMV_MODE_CONTEXTS][CDF_SIZE(
2)] = { { AOM_CDF2(128 * 45) }, { AOM_CDF2(128 * 13) } };
static const aom_cdf_prob default_refmv_cdf[REFMV_MODE_CONTEXTS][CDF_SIZE(2)] =
......
......@@ -508,7 +508,7 @@ typedef enum ATTRIBUTE_PACKED {
#define NMV_CONTEXTS 3
#define NEWMV_MODE_CONTEXTS 7
#define NEWMV_MODE_CONTEXTS 6
#define GLOBALMV_MODE_CONTEXTS 2
#define REFMV_MODE_CONTEXTS 9
#define DRL_MODE_CONTEXTS 3
......
......@@ -714,7 +714,7 @@ static void setup_ref_mv_list(
if (newmv_count[ref_frame] >= 1)
mode_context[ref_frame] |= 4;
else
mode_context[ref_frame] |= 6;
mode_context[ref_frame] |= 5;
mode_context[ref_frame] |= (5 << REFMV_OFFSET);
break;
......
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