From 9c8a1ae2f6520545ba10b748f291ec03b9a816ed Mon Sep 17 00:00:00 2001
From: Johann <johannkoenig@google.com>
Date: Wed, 16 Jan 2019 10:31:45 -0800
Subject: libvpx: Pull from upstream

Current HEAD: 858fe955ae5a42a0006c974b0837df18b246986f

git log from upstream:
858fe955a vp9: fix definition for VP9E_SET_POSTENCODE_DROP
fa5083e8e Fix segmentation fault in hbd path
759d1de9d vp8 dec: Add flag to bring up threads.
38d98d870 vp8 idct dequant: resolve missing declarations
2e39962d7 vp8 blend: resolve missing declarations
0aeaf29b1 vp8 overlaps: resolve missing declaration
f485c67d0 vp9_get_blockiness: resolve missing declaration
5aeaf43c4 vp8 multi dimensional search: resolve missing declarations
8466728f8 vp8_copy32xn: resolve missing declaration
f479beeeb vpx_filter: resolve missing declarations
948e51696 vpx_clear_system_state: resolve missing declaration
9cf2e851d vp9 intra pred test: resolve -Wuninitialized warning
57d476bd8 arm neon: resolve missing declarations
46e17f0cb Fix OOB memory access on fuzzed data
6efdd9ad4 fix vp9 fdct_quant
ad57c72b9 VP9 firstpass: Bugfix when mi_col_start/end is odd
3271a7ed6 Increase memory size in non-greedy-mv
23f8b8317 Build pyramid motion field
c4c5c1d7e vp9: psnr diff thres for single vs multi threading.
95ac0cc9f Adaptively choose block sizes in temporal filtering
<...>

Test: none
BUG=b/122675483

Change-Id: I392f4fab4355476fcbe944986b9c7399c1888d07
---
 libvpx/vp9/common/vp9_filter.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'libvpx/vp9/common/vp9_filter.c')

diff --git a/libvpx/vp9/common/vp9_filter.c b/libvpx/vp9/common/vp9_filter.c
index 6c43af8ce..adbda6c82 100644
--- a/libvpx/vp9/common/vp9_filter.c
+++ b/libvpx/vp9/common/vp9_filter.c
@@ -63,6 +63,20 @@ DECLARE_ALIGNED(256, static const InterpKernel,
   { 0, -3, 2, 41, 63, 29, -2, -2 },   { 0, -3, 1, 38, 64, 32, -1, -3 }
 };
 
-const InterpKernel *vp9_filter_kernels[4] = {
-  sub_pel_filters_8, sub_pel_filters_8lp, sub_pel_filters_8s, bilinear_filters
+// 4-tap filter
+DECLARE_ALIGNED(256, static const InterpKernel,
+                sub_pel_filters_4[SUBPEL_SHIFTS]) = {
+  { 0, 0, 0, 128, 0, 0, 0, 0 },     { 0, 0, -4, 126, 8, -2, 0, 0 },
+  { 0, 0, -6, 120, 18, -4, 0, 0 },  { 0, 0, -8, 114, 28, -6, 0, 0 },
+  { 0, 0, -10, 108, 36, -6, 0, 0 }, { 0, 0, -12, 102, 46, -8, 0, 0 },
+  { 0, 0, -12, 94, 56, -10, 0, 0 }, { 0, 0, -12, 84, 66, -10, 0, 0 },
+  { 0, 0, -12, 76, 76, -12, 0, 0 }, { 0, 0, -10, 66, 84, -12, 0, 0 },
+  { 0, 0, -10, 56, 94, -12, 0, 0 }, { 0, 0, -8, 46, 102, -12, 0, 0 },
+  { 0, 0, -6, 36, 108, -10, 0, 0 }, { 0, 0, -6, 28, 114, -8, 0, 0 },
+  { 0, 0, -4, 18, 120, -6, 0, 0 },  { 0, 0, -2, 8, 126, -4, 0, 0 }
+};
+
+const InterpKernel *vp9_filter_kernels[5] = {
+  sub_pel_filters_8, sub_pel_filters_8lp, sub_pel_filters_8s, bilinear_filters,
+  sub_pel_filters_4
 };
-- 
cgit v1.2.3