generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "A bug fix related to switchable filters" into experimental

Browse Source
This commit is contained in:
Deb Mukherjee 2012-12-10 12:28:06 -08:00 committed by Gerrit Code Review
commit f09c4cde85
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/encoder/vp9_encodeframe.c
View File

@ -582,6 +582,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) {
@ -589,7 +590,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;