From f99eb936a4b5b392ecbe4c57ba391f182de60ab1 Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Fri, 31 Jan 2014 16:32:19 -0800
Subject: [PATCH] Set proper rtc interp_filter at block level
Based on frame level settings.
Change-Id: I922c09c195ab055585eaa4f544c51aceb1203a7a
---
vp9/encoder/vp9_pickmode.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index bd28ea51ef..1aaa4162be 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -219,7 +219,8 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
mbmi->ref_frame[0] = ref_frame;
mbmi->mv[0].as_int = frame_mv[this_mode][ref_frame].as_int;
xd->mi_8x8[0]->bmi[0].as_mv[0].as_int = mbmi->mv[0].as_int;
- mbmi->interp_filter = EIGHTTAP;
+ mbmi->interp_filter = cpi->common.interp_filter == SWITCHABLE ?
+ EIGHTTAP : cpi->common.interp_filter;
mbmi->ref_frame[1] = INTRA_FRAME;
mbmi->tx_size = max_txsize_lookup[bsize];
--
GitLab