libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_loopfilter_filters.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <stdlib.h>
 #include "vpx_config.h"
 #include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/vp9_onyxc_int.h"
 
-typedef unsigned char uc;
-
-static __inline signed char signed_char_clamp(int t) {
+static __inline int8_t signed_char_clamp(int t) {
   t = (t < -128 ? -128 : t);
   t = (t > 127 ? 127 : t);
-  return (signed char) t;
+  return (int8_t) t;
 }
 
 
 /* should we apply any filter at all ( 11111111 yes, 00000000 no) */
-static __inline signed char filter_mask(uc limit, uc blimit,
-                                        uc p3, uc p2, uc p1, uc p0,
-                                        uc q0, uc q1, uc q2, uc q3) {
-  signed char mask = 0;
+static __inline int8_t filter_mask(uint8_t limit, uint8_t blimit,
+                                   uint8_t p3, uint8_t p2,
+                                   uint8_t p1, uint8_t p0,
+                                   uint8_t q0, uint8_t q1,
+                                   uint8_t q2, uint8_t q3) {
+  int8_t mask = 0;
   mask |= (abs(p3 - p2) > limit) * -1;
   mask |= (abs(p2 - p1) > limit) * -1;
   mask |= (abs(p1 - p0) > limit) * -1;
   mask |= (abs(q1 - q0) > limit) * -1;
   mask |= (abs(q2 - q1) > limit) * -1;
   mask |= (abs(q3 - q2) > limit) * -1;
   mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2  > blimit) * -1;
   mask = ~mask;
   return mask;
 }
 
 /* is there high variance internal edge ( 11111111 yes, 00000000 no) */
-static __inline signed char hevmask(uc thresh, uc p1, uc p0, uc q0, uc q1) {
-  signed char hev = 0;
+static __inline int8_t hevmask(uint8_t thresh, uint8_t p1, uint8_t p0,
+                               uint8_t q0, uint8_t q1) {
+  int8_t hev = 0;
   hev  |= (abs(p1 - p0) > thresh) * -1;
   hev  |= (abs(q1 - q0) > thresh) * -1;
   return hev;
 }
 
-static __inline void filter(signed char mask, uc hev, uc *op1,
-                            uc *op0, uc *oq0, uc *oq1)
+static __inline void filter(int8_t mask, uint8_t hev, uint8_t *op1,
+                            uint8_t *op0, uint8_t *oq0, uint8_t *oq1) {
+  int8_t ps0, qs0;
+  int8_t ps1, qs1;
+  int8_t filter, Filter1, Filter2;
+  int8_t u;
 
-{
-  signed char ps0, qs0;
-  signed char ps1, qs1;
-  signed char filter, Filter1, Filter2;
-  signed char u;
-
-  ps1 = (signed char) * op1 ^ 0x80;
-  ps0 = (signed char) * op0 ^ 0x80;
-  qs0 = (signed char) * oq0 ^ 0x80;
-  qs1 = (signed char) * oq1 ^ 0x80;
+  ps1 = (int8_t) *op1 ^ 0x80;
+  ps0 = (int8_t) *op0 ^ 0x80;
+  qs0 = (int8_t) *oq0 ^ 0x80;
+  qs1 = (int8_t) *oq1 ^ 0x80;
 
   /* add outer taps if we have high edge variance */
   filter = signed_char_clamp(ps1 - qs1);
   filter &= hev;
 
   /* inner taps */
   filter = signed_char_clamp(filter + 3 * (qs0 - ps0));
   filter &= mask;
 
   /* save bottom 3 bits so that we round one side +4 and the other +3
@@ skipping 12 matching lines @@
 
   /* outer tap adjustments */
   filter += 1;
   filter >>= 1;
   filter &= ~hev;
 
   u = signed_char_clamp(qs1 - filter);
   *oq1 = u ^ 0x80;
   u = signed_char_clamp(ps1 + filter);
   *op1 = u ^ 0x80;
-
 }
 
-void vp9_loop_filter_horizontal_edge_c
-(
-  unsigned char *s,
-  int p, /* pitch */
-  const unsigned char *blimit,
-  const unsigned char *limit,
-  const unsigned char *thresh,
-  int count
-) {
-  int  hev = 0; /* high edge variance */
-  signed char mask = 0;
+void vp9_loop_filter_horizontal_edge_c(uint8_t *s,
+                                       int p, /* pitch */
+                                       const unsigned char *blimit,
+                                       const unsigned char *limit,
+                                       const unsigned char *thresh,
+                                       int count) {
+  int hev = 0; /* high edge variance */
+  int8_t mask = 0;
   int i = 0;
 
   /* loop filter designed to work using chars so that we can make maximum use
    * of 8 bit simd instructions.
    */
   do {
     mask = filter_mask(limit[0], blimit[0],
                        s[-4 * p], s[-3 * p], s[-2 * p], s[-1 * p],
                        s[0 * p], s[1 * p], s[2 * p], s[3 * p]);
 
     hev = hevmask(thresh[0], s[-2 * p], s[-1 * p], s[0 * p], s[1 * p]);
 
     filter(mask, hev, s - 2 * p, s - 1 * p, s, s + 1 * p);
 
     ++s;
   } while (++i < count * 8);
 }
 
-void vp9_loop_filter_vertical_edge_c(unsigned char *s,
+void vp9_loop_filter_vertical_edge_c(uint8_t *s,
                                      int p,
                                      const unsigned char *blimit,
                                      const unsigned char *limit,
                                      const unsigned char *thresh,
                                      int count) {
   int  hev = 0; /* high edge variance */
-  signed char mask = 0;
+  int8_t mask = 0;
   int i = 0;
 
   /* loop filter designed to work using chars so that we can make maximum use
    * of 8 bit simd instructions.
    */
   do {
     mask = filter_mask(limit[0], blimit[0],
                        s[-4], s[-3], s[-2], s[-1],
                        s[0], s[1], s[2], s[3]);
 
     hev = hevmask(thresh[0], s[-2], s[-1], s[0], s[1]);
 
     filter(mask, hev, s - 2, s - 1, s, s + 1);
 
     s += p;
   } while (++i < count * 8);
 }
-static __inline signed char flatmask(uc thresh,
-                                     uc p4, uc p3, uc p2, uc p1, uc p0,
-                                     uc q0, uc q1, uc q2, uc q3, uc q4) {
-  signed char flat = 0;
-  flat |= (abs(p1 - p0) > 1) * -1;
-  flat |= (abs(q1 - q0) > 1) * -1;
-  flat |= (abs(p0 - p2) > 1) * -1;
-  flat |= (abs(q0 - q2) > 1) * -1;
-  flat |= (abs(p3 - p0) > 1) * -1;
-  flat |= (abs(q3 - q0) > 1) * -1;
-  flat |= (abs(p4 - p0) > 1) * -1;
-  flat |= (abs(q4 - q0) > 1) * -1;
+static __inline signed char flatmask(uint8_t thresh,
+                                     uint8_t p4, uint8_t p3, uint8_t p2,
+                                     uint8_t p1, uint8_t p0,
+                                     uint8_t q0, uint8_t q1, uint8_t q2,
+                                     uint8_t q3, uint8_t q4) {
+  int8_t flat = 0;
+  flat |= (abs(p1 - p0) > thresh) * -1;
+  flat |= (abs(q1 - q0) > thresh) * -1;
+  flat |= (abs(p0 - p2) > thresh) * -1;
+  flat |= (abs(q0 - q2) > thresh) * -1;
+  flat |= (abs(p3 - p0) > thresh) * -1;
+  flat |= (abs(q3 - q0) > thresh) * -1;
+  flat |= (abs(p4 - p0) > thresh) * -1;
+  flat |= (abs(q4 - q0) > thresh) * -1;
   flat = ~flat;
   return flat;
 }
 
-static __inline void mbfilter(signed char mask, uc hev, uc flat,
-                              uc *op4, uc *op3, uc *op2, uc *op1, uc *op0,
-                              uc *oq0, uc *oq1, uc *oq2, uc *oq3, uc *oq4) {
+static __inline void mbfilter(int8_t mask, uint8_t hev, uint8_t flat,
+                              uint8_t *op4, uint8_t *op3, uint8_t *op2,
+                              uint8_t *op1, uint8_t *op0,
+                              uint8_t *oq0, uint8_t *oq1, uint8_t *oq2,
+                              uint8_t *oq3, uint8_t *oq4) {
   /* use a 7 tap filter [1, 1, 1, 2, 1, 1, 1] for flat line */
   if (flat && mask) {
-    unsigned char p0, q0;
-    unsigned char p1, q1;
-    unsigned char p2, q2;
-    unsigned char p3, q3;
-    unsigned char p4, q4;
+    uint8_t p0, q0;
+    uint8_t p1, q1;
+    uint8_t p2, q2;
+    uint8_t p3, q3;
+    uint8_t p4, q4;
 
     p4 = *op4;
     p3 = *op3;
     p2 = *op2;
     p1 = *op1;
     p0 = *op0;
     q0 = *oq0;
     q1 = *oq1;
     q2 = *oq2;
     q3 = *oq3;
     q4 = *oq4;
 
     *op2 = (p4 + p4 + p3 + p2 + p2 + p1 + p0 + q0 + 4) >> 3;
     *op1 = (p4 + p3 + p2 + p1 + p1 + p0 + q0 + q1 + 4) >> 3;
     *op0 = (p3 + p2 + p1 + p0 + p0 + q0 + q1 + q2 + 4) >> 3;
     *oq0 = (p2 + p1 + p0 + q0 + q0 + q1 + q2 + q3 + 4) >> 3;
     *oq1 = (p1 + p0 + q0 + q1 + q1 + q2 + q3 + q4 + 4) >> 3;
     *oq2 = (p0 + q0 + q1 + q2 + q2 + q3 + q4 + q4 + 4) >> 3;
   } else {
-    signed char ps0, qs0;
-    signed char ps1, qs1;
-    signed char filter, Filter1, Filter2;
-    signed char u;
+    int8_t ps0, qs0;
+    int8_t ps1, qs1;
+    int8_t filter, Filter1, Filter2;
+    int8_t u;
 
-    ps1 = (signed char) * op1 ^ 0x80;
-    ps0 = (signed char) * op0 ^ 0x80;
-    qs0 = (signed char) * oq0 ^ 0x80;
-    qs1 = (signed char) * oq1 ^ 0x80;
+    ps1 = (int8_t) *op1 ^ 0x80;
+    ps0 = (int8_t) *op0 ^ 0x80;
+    qs0 = (int8_t) *oq0 ^ 0x80;
+    qs1 = (int8_t) *oq1 ^ 0x80;
 
     /* add outer taps if we have high edge variance */
     filter = signed_char_clamp(ps1 - qs1);
     filter &= hev;
 
     /* inner taps */
     filter = signed_char_clamp(filter + 3 * (qs0 - ps0));
     filter &= mask;
 
     Filter1 = signed_char_clamp(filter + 4);
@@ skipping 11 matching lines @@
     filter += 1;
     filter >>= 1;
     filter &= ~hev;
 
     u = signed_char_clamp(qs1 - filter);
     *oq1 = u ^ 0x80;
     u = signed_char_clamp(ps1 + filter);
     *op1 = u ^ 0x80;
   }
 }
-void vp9_mbloop_filter_horizontal_edge_c
-(
-  unsigned char *s,
-  int p,
-  const unsigned char *blimit,
-  const unsigned char *limit,
-  const unsigned char *thresh,
-  int count
-) {
-  signed char hev = 0; /* high edge variance */
-  signed char mask = 0;
-  signed char flat = 0;
+
+void vp9_mbloop_filter_horizontal_edge_c(uint8_t *s,
+                                         int p,
+                                         const unsigned char *blimit,
+                                         const unsigned char *limit,
+                                         const unsigned char *thresh,
+                                         int count) {
+  int8_t hev = 0; /* high edge variance */
+  int8_t mask = 0;
+  int8_t flat = 0;
   int i = 0;
 
   /* loop filter designed to work using chars so that we can make maximum use
    * of 8 bit simd instructions.
    */
   do {
-
     mask = filter_mask(limit[0], blimit[0],
                        s[-4 * p], s[-3 * p], s[-2 * p], s[-1 * p],
                        s[ 0 * p], s[ 1 * p], s[ 2 * p], s[ 3 * p]);
 
     hev = hevmask(thresh[0], s[-2 * p], s[-1 * p], s[0 * p], s[1 * p]);
 
-    flat = flatmask(thresh[0],
+    flat = flatmask(1,
                     s[-5 * p], s[-4 * p], s[-3 * p], s[-2 * p], s[-1 * p],
                     s[ 0 * p], s[ 1 * p], s[ 2 * p], s[ 3 * p], s[ 4 * p]);
     mbfilter(mask, hev, flat,
              s - 5 * p, s - 4 * p, s - 3 * p, s - 2 * p, s - 1 * p,
              s,       s + 1 * p, s + 2 * p, s + 3 * p, s + 4 * p);
 
     ++s;
   } while (++i < count * 8);
 
 }
-void vp9_mbloop_filter_vertical_edge_c
-(
-  unsigned char *s,
-  int p,
-  const unsigned char *blimit,
-  const unsigned char *limit,
-  const unsigned char *thresh,
-  int count
-) {
-  signed char hev = 0; /* high edge variance */
-  signed char mask = 0;
-  signed char flat = 0;
+
+void vp9_mbloop_filter_vertical_edge_c(uint8_t *s,
+                                       int p,
+                                       const unsigned char *blimit,
+                                       const unsigned char *limit,
+                                       const unsigned char *thresh,
+                                       int count) {
+  int8_t hev = 0; /* high edge variance */
+  int8_t mask = 0;
+  int8_t flat = 0;
   int i = 0;
 
   do {
-
     mask = filter_mask(limit[0], blimit[0],
                        s[-4], s[-3], s[-2], s[-1],
                        s[0], s[1], s[2], s[3]);
 
     hev = hevmask(thresh[0], s[-2], s[-1], s[0], s[1]);
-    flat = flatmask(thresh[0],
+    flat = flatmask(1,
                     s[-5], s[-4], s[-3], s[-2], s[-1],
                     s[ 0], s[ 1], s[ 2], s[ 3], s[ 4]);
     mbfilter(mask, hev, flat,
              s - 5, s - 4, s - 3, s - 2, s - 1,
              s,     s + 1, s + 2, s + 3, s + 4);
     s += p;
   } while (++i < count * 8);
 
 }
 
 /* should we apply any filter at all ( 11111111 yes, 00000000 no) */
-static __inline signed char simple_filter_mask(uc blimit,
-                                               uc p1, uc p0,
-                                               uc q0, uc q1) {
+static __inline int8_t simple_filter_mask(uint8_t blimit,
+                                          uint8_t p1, uint8_t p0,
+                                          uint8_t q0, uint8_t q1) {
   /* Why does this cause problems for win32?
    * error C2143: syntax error : missing ';' before 'type'
    *  (void) limit;
    */
-  signed char mask = (abs(p0 - q0) * 2 + abs(p1 - q1) / 2  <= blimit) * -1;
+  int8_t mask = (abs(p0 - q0) * 2 + abs(p1 - q1) / 2  <= blimit) * -1;
   return mask;
 }
 
-static __inline void simple_filter(signed char mask,
-                                   uc *op1, uc *op0,
-                                   uc *oq0, uc *oq1) {
-  signed char filter, Filter1, Filter2;
-  signed char p1 = (signed char) * op1 ^ 0x80;
-  signed char p0 = (signed char) * op0 ^ 0x80;
-  signed char q0 = (signed char) * oq0 ^ 0x80;
-  signed char q1 = (signed char) * oq1 ^ 0x80;
-  signed char u;
+static __inline void simple_filter(int8_t mask,
+                                   uint8_t *op1, uint8_t *op0,
+                                   uint8_t *oq0, uint8_t *oq1) {
+  int8_t filter, Filter1, Filter2;
+  int8_t p1 = (int8_t) *op1 ^ 0x80;
+  int8_t p0 = (int8_t) *op0 ^ 0x80;
+  int8_t q0 = (int8_t) *oq0 ^ 0x80;
+  int8_t q1 = (int8_t) *oq1 ^ 0x80;
+  int8_t u;
 
   filter = signed_char_clamp(p1 - q1);
   filter = signed_char_clamp(filter + 3 * (q0 - p0));
   filter &= mask;
 
   /* save bottom 3 bits so that we round one side +4 and the other +3 */
   Filter1 = signed_char_clamp(filter + 4);
   Filter1 >>= 3;
   u = signed_char_clamp(q0 - Filter1);
   *oq0  = u ^ 0x80;
 
   Filter2 = signed_char_clamp(filter + 3);
   Filter2 >>= 3;
   u = signed_char_clamp(p0 + Filter2);
   *op0 = u ^ 0x80;
 }
 
-void vp9_loop_filter_simple_horizontal_edge_c
-(
-  unsigned char *s,
-  int p,
-  const unsigned char *blimit
-) {
-  signed char mask = 0;
+void vp9_loop_filter_simple_horizontal_edge_c(uint8_t *s,
+                                              int p,
+                                              const unsigned char *blimit) {
+  int8_t mask = 0;
   int i = 0;
 
   do {
     mask = simple_filter_mask(blimit[0],
                               s[-2 * p], s[-1 * p],
                               s[0 * p], s[1 * p]);
     simple_filter(mask,
                   s - 2 * p, s - 1 * p,
                   s, s + 1 * p);
     ++s;
   } while (++i < 16);
 }
 
-void vp9_loop_filter_simple_vertical_edge_c
-(
-  unsigned char *s,
-  int p,
-  const unsigned char *blimit
-) {
-  signed char mask = 0;
+void vp9_loop_filter_simple_vertical_edge_c(uint8_t *s,
+                                            int p,
+                                            const unsigned char *blimit) {
+  int8_t mask = 0;
   int i = 0;
 
   do {
     mask = simple_filter_mask(blimit[0], s[-2], s[-1], s[0], s[1]);
     simple_filter(mask, s - 2, s - 1, s, s + 1);
     s += p;
   } while (++i < 16);
-
 }
 
 /* Vertical MB Filtering */
-void vp9_loop_filter_mbv_c(unsigned char *y_ptr, unsigned char *u_ptr,
-                           unsigned char *v_ptr, int y_stride, int uv_stride,
+void vp9_loop_filter_mbv_c(uint8_t *y_ptr, uint8_t *u_ptr,
+                           uint8_t *v_ptr, int y_stride, int uv_stride,
                            struct loop_filter_info *lfi) {
   vp9_mbloop_filter_vertical_edge_c(y_ptr, y_stride,
                                     lfi->mblim, lfi->lim, lfi->hev_thr, 2);
 
   if (u_ptr)
     vp9_mbloop_filter_vertical_edge_c(u_ptr, uv_stride,
                                       lfi->mblim, lfi->lim, lfi->hev_thr, 1);
 
   if (v_ptr)
     vp9_mbloop_filter_vertical_edge_c(v_ptr, uv_stride,
                                       lfi->mblim, lfi->lim, lfi->hev_thr, 1);
 }
 
 /* Vertical B Filtering */
-void vp9_loop_filter_bv_c(unsigned char *y_ptr, unsigned char *u_ptr,
-                          unsigned char *v_ptr, int y_stride, int uv_stride,
+void vp9_loop_filter_bv_c(uint8_t*y_ptr, uint8_t *u_ptr,
+                          uint8_t *v_ptr, int y_stride, int uv_stride,
                           struct loop_filter_info *lfi) {
   vp9_loop_filter_vertical_edge_c(y_ptr + 4, y_stride,
                                   lfi->blim, lfi->lim, lfi->hev_thr, 2);
   vp9_loop_filter_vertical_edge_c(y_ptr + 8, y_stride,
                                   lfi->blim, lfi->lim, lfi->hev_thr, 2);
   vp9_loop_filter_vertical_edge_c(y_ptr + 12, y_stride,
                                   lfi->blim, lfi->lim, lfi->hev_thr, 2);
 
   if (u_ptr)
     vp9_loop_filter_vertical_edge_c(u_ptr + 4, uv_stride,
                                     lfi->blim, lfi->lim, lfi->hev_thr, 1);
 
   if (v_ptr)
     vp9_loop_filter_vertical_edge_c(v_ptr + 4, uv_stride,
                                     lfi->blim, lfi->lim, lfi->hev_thr, 1);
 }
 
 /* Horizontal MB filtering */
-void vp9_loop_filter_mbh_c(unsigned char *y_ptr, unsigned char *u_ptr,
-                           unsigned char *v_ptr, int y_stride, int uv_stride,
+void vp9_loop_filter_mbh_c(uint8_t *y_ptr, uint8_t *u_ptr,
+                           uint8_t *v_ptr, int y_stride, int uv_stride,
                            struct loop_filter_info *lfi) {
   vp9_mbloop_filter_horizontal_edge_c(y_ptr, y_stride,
                                       lfi->mblim, lfi->lim, lfi->hev_thr, 2);
 
   if (u_ptr)
     vp9_mbloop_filter_horizontal_edge_c(u_ptr, uv_stride,
                                         lfi->mblim, lfi->lim, lfi->hev_thr, 1);
 
   if (v_ptr)
     vp9_mbloop_filter_horizontal_edge_c(v_ptr, uv_stride,
                                         lfi->mblim, lfi->lim, lfi->hev_thr, 1);
 }
 
 /* Horizontal B Filtering */
-void vp9_loop_filter_bh_c(unsigned char *y_ptr, unsigned char *u_ptr,
-                          unsigned char *v_ptr, int y_stride, int uv_stride,
+void vp9_loop_filter_bh_c(uint8_t *y_ptr, uint8_t *u_ptr,
+                          uint8_t *v_ptr, int y_stride, int uv_stride,
                           struct loop_filter_info *lfi) {
   vp9_loop_filter_horizontal_edge_c(y_ptr + 4 * y_stride, y_stride,
                                     lfi->blim, lfi->lim, lfi->hev_thr, 2);
   vp9_loop_filter_horizontal_edge_c(y_ptr + 8 * y_stride, y_stride,
                                     lfi->blim, lfi->lim, lfi->hev_thr, 2);
   vp9_loop_filter_horizontal_edge_c(y_ptr + 12 * y_stride, y_stride,
                                     lfi->blim, lfi->lim, lfi->hev_thr, 2);
 
   if (u_ptr)
     vp9_loop_filter_horizontal_edge_c(u_ptr + 4 * uv_stride, uv_stride,
                                       lfi->blim, lfi->lim, lfi->hev_thr, 1);
 
   if (v_ptr)
     vp9_loop_filter_horizontal_edge_c(v_ptr + 4 * uv_stride, uv_stride,
                                       lfi->blim, lfi->lim, lfi->hev_thr, 1);
 }
 
-void vp9_loop_filter_bh8x8_c(unsigned char *y_ptr, unsigned char *u_ptr,
-                             unsigned char *v_ptr, int y_stride, int uv_stride,
+void vp9_loop_filter_bh8x8_c(uint8_t *y_ptr, uint8_t *u_ptr,
+                             uint8_t *v_ptr, int y_stride, int uv_stride,
                              struct loop_filter_info *lfi) {
   vp9_mbloop_filter_horizontal_edge_c(
     y_ptr + 8 * y_stride, y_stride, lfi->blim, lfi->lim, lfi->hev_thr, 2);
+
+  if (u_ptr)
+    vp9_loop_filter_horizontal_edge_c(u_ptr + 4 * uv_stride, uv_stride,
+                                      lfi->blim, lfi->lim, lfi->hev_thr, 1);
+
+  if (v_ptr)
+    vp9_loop_filter_horizontal_edge_c(v_ptr + 4 * uv_stride, uv_stride,
+                                      lfi->blim, lfi->lim, lfi->hev_thr, 1);
 }
 
-void vp9_loop_filter_bhs_c(unsigned char *y_ptr, int y_stride,
+void vp9_loop_filter_bhs_c(uint8_t *y_ptr, int y_stride,
                            const unsigned char *blimit) {
   vp9_loop_filter_simple_horizontal_edge_c(y_ptr + 4 * y_stride,
                                            y_stride, blimit);
   vp9_loop_filter_simple_horizontal_edge_c(y_ptr + 8 * y_stride,
                                            y_stride, blimit);
   vp9_loop_filter_simple_horizontal_edge_c(y_ptr + 12 * y_stride,
                                            y_stride, blimit);
 }
 
-void vp9_loop_filter_bv8x8_c(unsigned char *y_ptr, unsigned char *u_ptr,
-                             unsigned char *v_ptr, int y_stride, int uv_stride,
+void vp9_loop_filter_bv8x8_c(uint8_t *y_ptr, uint8_t *u_ptr,
+                             uint8_t *v_ptr, int y_stride, int uv_stride,
                              struct loop_filter_info *lfi) {
   vp9_mbloop_filter_vertical_edge_c(
     y_ptr + 8, y_stride, lfi->blim, lfi->lim, lfi->hev_thr, 2);
-}
-
-void vp9_loop_filter_bvs_c(unsigned char *y_ptr, int y_stride,
+
+  if (u_ptr)
+    vp9_loop_filter_vertical_edge_c(u_ptr + 4, uv_stride,
+                                    lfi->blim, lfi->lim, lfi->hev_thr, 1);
+
+  if (v_ptr)
+    vp9_loop_filter_vertical_edge_c(v_ptr + 4, uv_stride,
+                                    lfi->blim, lfi->lim, lfi->hev_thr, 1);
+}
+
+void vp9_loop_filter_bvs_c(uint8_t *y_ptr, int y_stride,
                            const unsigned char *blimit) {
   vp9_loop_filter_simple_vertical_edge_c(y_ptr + 4, y_stride, blimit);
   vp9_loop_filter_simple_vertical_edge_c(y_ptr + 8, y_stride, blimit);
   vp9_loop_filter_simple_vertical_edge_c(y_ptr + 12, y_stride, blimit);
 }
+
+static __inline void wide_mbfilter(int8_t mask, uint8_t hev,
+                                   uint8_t flat, uint8_t flat2,
+                                   uint8_t *op7, uint8_t *op6, uint8_t *op5,
+                                   uint8_t *op4, uint8_t *op3, uint8_t *op2,
+                                   uint8_t *op1, uint8_t *op0, uint8_t *oq0,
+                                   uint8_t *oq1, uint8_t *oq2, uint8_t *oq3,
+                                   uint8_t *oq4, uint8_t *oq5, uint8_t *oq6,
+                                   uint8_t *oq7) {
+  /* use a 15 tap filter [1,1,1,1,1,1,1,2,1,1,1,1,1,1,1] for flat line */
+  if (flat2 && flat && mask) {
+    uint8_t p0, q0;
+    uint8_t p1, q1;
+    uint8_t p2, q2;
+    uint8_t p3, q3;
+    uint8_t p4, q4;
+    uint8_t p5, q5;
+    uint8_t p6, q6;
+    uint8_t p7, q7;
+
+    p7 = *op7;
+    p6 = *op6;
+    p5 = *op5;
+    p4 = *op4;
+    p3 = *op3;
+    p2 = *op2;
+    p1 = *op1;
+    p0 = *op0;
+    q0 = *oq0;
+    q1 = *oq1;
+    q2 = *oq2;
+    q3 = *oq3;
+    q4 = *oq4;
+    q5 = *oq5;
+    q6 = *oq6;
+    q7 = *oq7;
+
+    *op6 = (p7 * 7 + p6 * 2 +
+            p5 + p4 + p3 + p2 + p1 + p0 + q0 + 8) >> 4;
+    *op5 = (p7 * 6 + p6 + p5 * 2 +
+            p4 + p3 + p2 + p1 + p0 + q0 + q1 + 8) >> 4;
+    *op4 = (p7 * 5 + p6 + p5 + p4 * 2 +
+            p3 + p2 + p1 + p0 + q0 + q1 + q2 + 8) >> 4;
+    *op3 = (p7 * 4 + p6 + p5 + p4 + p3 * 2 +
+            p2 + p1 + p0 + q0 + q1 + q2 + q3 + 8) >> 4;
+    *op2 = (p7 * 3 + p6 + p5 + p4 + p3 + p2 * 2 +
+            p1 + p0 + q0 + q1 + q2 + q3 + q4 + 8) >> 4;
+    *op1 = (p7 * 2 + p6 + p5 + p4 + p3 + p2 + p1 * 2 +
+            p0 + q0 + q1 + q2 + q3 + q4 + q5 + 8) >> 4;
+    *op0 = (p7 + p6 + p5 + p4 + p3 + p2 + p1 + p0 * 2 +
+            q0 + q1 + q2 + q3 + q4 + q5 + q6 + 8) >> 4;
+    *oq0 = (p6 + p5 + p4 + p3 + p2 + p1 + p0 + q0 * 2 +
+            q1 + q2 + q3 + q4 + q5 + q6 + q7 + 8) >> 4;
+    *oq1 = (p5 + p4 + p3 + p2 + p1 + p0 + q0 + q1 * 2 +
+            q2 + q3 + q4 + q5 + q6 + q7 * 2 + 8) >> 4;
+    *oq2 = (p4 + p3 + p2 + p1 + p0 + q0 + q1 + q2 * 2 +
+            q3 + q4 + q5 + q6 + q7 * 3 + 8) >> 4;
+    *oq3 = (p3 + p2 + p1 + p0 + q0 + q1 + q2 + q3 * 2 +
+            q4 + q5 + q6 + q7 * 4 + 8) >> 4;
+    *oq4 = (p2 + p1 + p0 + q0 + q1 + q2 + q3 + q4 * 2 +
+            q5 + q6 + q7 * 5 + 8) >> 4;
+    *oq5 = (p1 + p0 + q0 + q1 + q2 + q3 + q4 + q5 * 2 +
+            q6 + q7 * 6 + 8) >> 4;
+    *oq6 = (p0 + q0 + q1 + q2 + q3 + q4 + q5 + q6 * 2 +
+            q7 * 7 + 8) >> 4;
+  } else if (flat && mask) {
+    unsigned char p0, q0;
+    unsigned char p1, q1;
+    unsigned char p2, q2;
+    unsigned char p3, q3;
+    unsigned char p4, q4;
+
+    p4 = *op4;
+    p3 = *op3;
+    p2 = *op2;
+    p1 = *op1;
+    p0 = *op0;
+    q0 = *oq0;
+    q1 = *oq1;
+    q2 = *oq2;
+    q3 = *oq3;
+    q4 = *oq4;
+
+    *op2 = (p4 + p4 + p3 + p2 + p2 + p1 + p0 + q0 + 4) >> 3;
+    *op1 = (p4 + p3 + p2 + p1 + p1 + p0 + q0 + q1 + 4) >> 3;
+    *op0 = (p3 + p2 + p1 + p0 + p0 + q0 + q1 + q2 + 4) >> 3;
+    *oq0 = (p2 + p1 + p0 + q0 + q0 + q1 + q2 + q3 + 4) >> 3;
+    *oq1 = (p1 + p0 + q0 + q1 + q1 + q2 + q3 + q4 + 4) >> 3;
+    *oq2 = (p0 + q0 + q1 + q2 + q2 + q3 + q4 + q4 + 4) >> 3;
+  } else {
+    signed char ps0, qs0;
+    signed char ps1, qs1;
+    signed char filter, Filter1, Filter2;
+    signed char u;
+
+    ps1 = (signed char) * op1 ^ 0x80;
+    ps0 = (signed char) * op0 ^ 0x80;
+    qs0 = (signed char) * oq0 ^ 0x80;
+    qs1 = (signed char) * oq1 ^ 0x80;
+
+    /* add outer taps if we have high edge variance */
+    filter = signed_char_clamp(ps1 - qs1);
+    filter &= hev;
+
+    /* inner taps */
+    filter = signed_char_clamp(filter + 3 * (qs0 - ps0));
+    filter &= mask;
+
+    Filter1 = signed_char_clamp(filter + 4);
+    Filter2 = signed_char_clamp(filter + 3);
+    Filter1 >>= 3;
+    Filter2 >>= 3;
+
+    u = signed_char_clamp(qs0 - Filter1);
+    *oq0 = u ^ 0x80;
+    u = signed_char_clamp(ps0 + Filter2);
+    *op0 = u ^ 0x80;
+    filter = Filter1;
+
+    /* outer tap adjustments */
+    filter += 1;
+    filter >>= 1;
+    filter &= ~hev;
+
+    u = signed_char_clamp(qs1 - filter);
+    *oq1 = u ^ 0x80;
+    u = signed_char_clamp(ps1 + filter);
+    *op1 = u ^ 0x80;
+  }
+}
+
+void vp9_mb_lpf_horizontal_edge_w
+(
+  unsigned char *s,
+  int p,
+  const unsigned char *blimit,
+  const unsigned char *limit,
+  const unsigned char *thresh,
+  int count
+) {
+  signed char hev = 0; /* high edge variance */
+  signed char mask = 0;
+  signed char flat = 0;
+  signed char flat2 = 0;
+  int i = 0;
+
+  /* loop filter designed to work using chars so that we can make maximum use
+   * of 8 bit simd instructions.
+   */
+  do {
+    mask = filter_mask(limit[0], blimit[0],
+                       s[-4 * p], s[-3 * p], s[-2 * p], s[-1 * p],
+                       s[ 0 * p], s[ 1 * p], s[ 2 * p], s[ 3 * p]);
+
+    hev = hevmask(thresh[0], s[-2 * p], s[-1 * p], s[0 * p], s[1 * p]);
+
+    flat = flatmask(1,
+                    s[-5 * p], s[-4 * p], s[-3 * p], s[-2 * p], s[-1 * p],
+                    s[ 0 * p], s[ 1 * p], s[ 2 * p], s[ 3 * p], s[ 4 * p]);
+
+    flat2 = flatmask(1,
+                    s[-8 * p], s[-7 * p], s[-6 * p], s[-5 * p], s[-1 * p],
+                    s[ 0 * p], s[ 4 * p], s[ 5 * p], s[ 6 * p], s[ 7 * p]);
+
+    wide_mbfilter(mask, hev, flat, flat2,
+             s - 8 * p, s - 7 * p, s - 6 * p, s - 5 * p,
+             s - 4 * p, s - 3 * p, s - 2 * p, s - 1 * p,
+             s,         s + 1 * p, s + 2 * p, s + 3 * p,
+             s + 4 * p, s + 5 * p, s + 6 * p, s + 7 * p);
+
+    ++s;
+  } while (++i < count * 8);
+}
+void vp9_mb_lpf_vertical_edge_w
+(
+  unsigned char *s,
+  int p,
+  const unsigned char *blimit,
+  const unsigned char *limit,
+  const unsigned char *thresh,
+  int count
+) {
+  signed char hev = 0; /* high edge variance */
+  signed char mask = 0;
+  signed char flat = 0;
+  signed char flat2 = 0;
+  int i = 0;
+
+  do {
+    mask = filter_mask(limit[0], blimit[0],
+                       s[-4], s[-3], s[-2], s[-1],
+                       s[0], s[1], s[2], s[3]);
+
+    hev = hevmask(thresh[0], s[-2], s[-1], s[0], s[1]);
+    flat = flatmask(1,
+                    s[-5], s[-4], s[-3], s[-2], s[-1],
+                    s[ 0], s[ 1], s[ 2], s[ 3], s[ 4]);
+    flat2 = flatmask(1,
+                    s[-8], s[-7], s[-6], s[-5], s[-1],
+                    s[ 0], s[ 4], s[ 5], s[ 6], s[ 7]);
+
+    wide_mbfilter(mask, hev, flat, flat2,
+             s - 8, s - 7, s - 6, s - 5,
+             s - 4, s - 3, s - 2, s - 1,
+             s,     s + 1, s + 2, s + 3,
+             s + 4, s + 5, s + 6, s + 7);
+    s += p;
+  } while (++i < count * 8);
+}
+
+void vp9_lpf_mbv_w_c(unsigned char *y_ptr, unsigned char *u_ptr,
+                   unsigned char *v_ptr, int y_stride, int uv_stride,
+                   struct loop_filter_info *lfi) {
+  vp9_mb_lpf_vertical_edge_w(y_ptr, y_stride,
+                                    lfi->mblim, lfi->lim, lfi->hev_thr, 2);
+
+  if (u_ptr)
+    vp9_mbloop_filter_vertical_edge_c(u_ptr, uv_stride,
+                                      lfi->mblim, lfi->lim, lfi->hev_thr, 1);
+
+  if (v_ptr)
+    vp9_mbloop_filter_vertical_edge_c(v_ptr, uv_stride,
+                                      lfi->mblim, lfi->lim, lfi->hev_thr, 1);
+}
+void vp9_lpf_mbh_w_c(unsigned char *y_ptr, unsigned char *u_ptr,
+                           unsigned char *v_ptr, int y_stride, int uv_stride,
+                           struct loop_filter_info *lfi) {
+  vp9_mb_lpf_horizontal_edge_w(y_ptr, y_stride,
+                                      lfi->mblim, lfi->lim, lfi->hev_thr, 2);
+
+  if (u_ptr)
+    vp9_mbloop_filter_horizontal_edge_c(u_ptr, uv_stride,
+                                        lfi->mblim, lfi->lim, lfi->hev_thr, 1);
+
+  if (v_ptr)
+    vp9_mbloop_filter_horizontal_edge_c(v_ptr, uv_stride,
+                                        lfi->mblim, lfi->lim, lfi->hev_thr, 1);
+}
+