shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Set proper rtc interp_filter at block level"

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -219,7 +219,8 @@

         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];