ref: 787e8240d590972a1136947481b30bfdc5a0e6e5
parent: f68288c6a4e13a839a7deb90e94bda033e835601
parent: 4f2f86725b3e56b28762318f3f810edcd6d619ef
author: Jingning Han <jingning@google.com>
date: Wed Jul 23 11:06:52 EDT 2014
Merge "Use the chessboard pattern pred search in newmv mode"
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2045,11 +2045,15 @@
int pred_filter_search = cpi->sf.cb_pred_filter_search ?
(((mi_row + mi_col) >> bsl)) & 0x01 : 0;
- if (pred_filter_search && this_mode != NEWMV) {
+ if (pred_filter_search) {
+ INTERP_FILTER af = SWITCHABLE, lf = SWITCHABLE;
if (xd->up_available)
- best_filter = xd->mi[-xd->mi_stride]->mbmi.interp_filter;
- else if (xd->left_available)
- best_filter = xd->mi[-1]->mbmi.interp_filter;
+ af = xd->mi[-xd->mi_stride]->mbmi.interp_filter;
+ if (xd->left_available)
+ lf = xd->mi[-1]->mbmi.interp_filter;
+
+ if ((this_mode != NEWMV) || (af == lf))
+ best_filter = af;
}
if (is_comp_pred) {
--
⑨