Remove dead members Change-Id: I5bd080f1fd5c14ea72ea7eb795eb1b8996a8fa76
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c index 268638a..c33da77 100644 --- a/av1/common/entropymode.c +++ b/av1/common/entropymode.c
@@ -704,21 +704,6 @@ #endif // CONFIG_CTX1D #endif // CONFIG_LV_MAP -static const aom_prob default_newmv_prob[NEWMV_MODE_CONTEXTS] = { - 155, 116, 94, 32, 96, 56, 30, -}; - -static const aom_prob default_zeromv_prob[GLOBALMV_MODE_CONTEXTS] = { - 45, 13, -}; - -static const aom_prob default_refmv_prob[REFMV_MODE_CONTEXTS] = { - 178, 212, 135, 244, 203, 122, 128, 128, 128, -}; - -static const aom_prob default_drl_prob[DRL_MODE_CONTEXTS] = { - 119, 128, 189, 134, 128, -}; 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) }, @@ -3049,10 +3034,6 @@ av1_copy(fc->compound_index_cdf, default_compound_idx_cdfs); av1_copy(fc->compound_index_probs, default_compound_idx_probs); #endif // CONFIG_JNT_COMP - av1_copy(fc->newmv_prob, default_newmv_prob); - av1_copy(fc->zeromv_prob, default_zeromv_prob); - av1_copy(fc->refmv_prob, default_refmv_prob); - av1_copy(fc->drl_prob, default_drl_prob); av1_copy(fc->newmv_cdf, default_newmv_cdf); av1_copy(fc->zeromv_cdf, default_zeromv_cdf); av1_copy(fc->refmv_cdf, default_refmv_cdf); @@ -3163,20 +3144,6 @@ fc->single_ref_prob[i][j] = av1_mode_mv_merge_probs( pre_fc->single_ref_prob[i][j], counts->single_ref[i][j]); - for (i = 0; i < NEWMV_MODE_CONTEXTS; ++i) - fc->newmv_prob[i] = - av1_mode_mv_merge_probs(pre_fc->newmv_prob[i], counts->newmv_mode[i]); - for (i = 0; i < GLOBALMV_MODE_CONTEXTS; ++i) - fc->zeromv_prob[i] = - av1_mode_mv_merge_probs(pre_fc->zeromv_prob[i], counts->zeromv_mode[i]); - for (i = 0; i < REFMV_MODE_CONTEXTS; ++i) - fc->refmv_prob[i] = - av1_mode_mv_merge_probs(pre_fc->refmv_prob[i], counts->refmv_mode[i]); - - for (i = 0; i < DRL_MODE_CONTEXTS; ++i) - fc->drl_prob[i] = - av1_mode_mv_merge_probs(pre_fc->drl_prob[i], counts->drl_mode[i]); - for (i = BLOCK_8X8; i < BLOCK_SIZES_ALL; ++i) aom_tree_merge_probs(av1_motion_mode_tree, pre_fc->motion_mode_prob[i], counts->motion_mode[i], fc->motion_mode_prob[i]);
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h index bfe2008..1b63db2 100644 --- a/av1/common/entropymode.h +++ b/av1/common/entropymode.h
@@ -179,10 +179,6 @@ #endif // CONFIG_CTX1D #endif - aom_prob newmv_prob[NEWMV_MODE_CONTEXTS]; - aom_prob zeromv_prob[GLOBALMV_MODE_CONTEXTS]; - aom_prob refmv_prob[REFMV_MODE_CONTEXTS]; - aom_prob drl_prob[DRL_MODE_CONTEXTS]; aom_cdf_prob newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(2)]; aom_cdf_prob zeromv_cdf[GLOBALMV_MODE_CONTEXTS][CDF_SIZE(2)]; aom_cdf_prob refmv_cdf[REFMV_MODE_CONTEXTS][CDF_SIZE(2)];