From 08b1798ae74c89bce585c6c8bbf7ca81b74b2b93 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Mon, 24 Jun 2013 15:46:15 -0700 Subject: Move vp9_full_to_model_counts to encoder This function is not called from the decoder, so it doesn't need to be in common/. Change-Id: I6977dd462a25b4ff39c9c7e1b0b5b16aa58ee733 --- vp9/common/vp9_entropy.c | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'vp9/common/vp9_entropy.c') diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c index 7ab1114bd..ec61f990f 100644 --- a/vp9/common/vp9_entropy.c +++ b/vp9/common/vp9_entropy.c @@ -641,31 +641,6 @@ void vp9_coef_tree_initialize() { #define COEF_COUNT_SAT_AFTER_KEY 24 #define COEF_MAX_UPDATE_FACTOR_AFTER_KEY 128 -void vp9_full_to_model_count(unsigned int *model_count, - unsigned int *full_count) { - int n; - model_count[ZERO_TOKEN] = full_count[ZERO_TOKEN]; - model_count[ONE_TOKEN] = full_count[ONE_TOKEN]; - model_count[TWO_TOKEN] = full_count[TWO_TOKEN]; - for (n = THREE_TOKEN; n < DCT_EOB_TOKEN; ++n) - model_count[TWO_TOKEN] += full_count[n]; - model_count[DCT_EOB_MODEL_TOKEN] = full_count[DCT_EOB_TOKEN]; -} - -void vp9_full_to_model_counts( - vp9_coeff_count_model *model_count, vp9_coeff_count *full_count) { - int i, j, k, l; - for (i = 0; i < BLOCK_TYPES; ++i) - for (j = 0; j < REF_TYPES; ++j) - for (k = 0; k < COEF_BANDS; ++k) - for (l = 0; l < PREV_COEF_CONTEXTS; ++l) { - if (l >= 3 && k == 0) - continue; - vp9_full_to_model_count(model_count[i][j][k][l], - full_count[i][j][k][l]); - } -} - static void adapt_coef_probs(VP9_COMMON *cm, TX_SIZE txfm_size, int count_sat, int update_factor) { vp9_coeff_probs_model *dst_coef_probs = cm->fc.coef_probs[txfm_size]; -- cgit v1.2.3