Remove unused refmv context model entries Reduce the the refmv context model size from 9 to 6 (the effective number in use after opt-ref-mv is merged). No coding stats are changed. Change-Id: Idf1bb6e8d87d87ac4bb66d899090bf1d8d24ad08
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c index 438ea18..7131d60 100644 --- a/av1/common/entropymode.c +++ b/av1/common/entropymode.c
@@ -22,14 +22,16 @@ { 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)] = { { AOM_CDF2(128 * 178) }, { AOM_CDF2(128 * 212) }, { AOM_CDF2(128 * 135) }, - { AOM_CDF2(128 * 244) }, { AOM_CDF2(128 * 203) }, { AOM_CDF2(128 * 122) }, - { AOM_CDF2(128 * 128) }, { AOM_CDF2(128 * 128) }, { AOM_CDF2(128 * 128) } + { AOM_CDF2(128 * 244) }, { AOM_CDF2(128 * 203) }, { AOM_CDF2(128 * 122) } }; + static const aom_cdf_prob default_drl_cdf[DRL_MODE_CONTEXTS][CDF_SIZE(2)] = { { AOM_CDF2(128 * 119) }, { AOM_CDF2(128 * 189) },
diff --git a/av1/common/enums.h b/av1/common/enums.h index 7b440de..cab3ad1 100644 --- a/av1/common/enums.h +++ b/av1/common/enums.h
@@ -510,7 +510,7 @@ #define NEWMV_MODE_CONTEXTS 6 #define GLOBALMV_MODE_CONTEXTS 2 -#define REFMV_MODE_CONTEXTS 9 +#define REFMV_MODE_CONTEXTS 6 #define DRL_MODE_CONTEXTS 3 #define GLOBALMV_OFFSET 3