From 14a38a87356875bb57206d333c4ec59409c4451e Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Mon, 10 Dec 2012 12:10:36 -0800 Subject: [PATCH] A bug fix related to switchable filters The switchable count update was mistakenly inside a macro. Change-Id: Iec04c52ad57034b88312dbaf05eee1f47ce265b3 --- vp9/encoder/vp9_encodeframe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 8b4e5bc9c..f5e9d7721 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -581,6 +581,7 @@ static void update_state(VP9_COMP *cpi, MACROBLOCK *x, ++cpi->interintra_count[0]; } } +#endif if (cpi->common.mcomp_filter_type == SWITCHABLE && mbmi->mode >= NEARESTMV && mbmi->mode <= SPLITMV) { @@ -588,7 +589,6 @@ static void update_state(VP9_COMP *cpi, MACROBLOCK *x, [vp9_get_pred_context(&cpi->common, xd, PRED_SWITCHABLE_INTERP)] [vp9_switchable_interp_map[mbmi->interp_filter]]; } -#endif cpi->prediction_error += ctx->distortion; cpi->intra_error += ctx->intra_error;