Revert "libvpx: Pull from upstream"

source/libvpx/vp9/common/vp9_mfqe.c

 /*
  *  Copyright (c) 2014 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.
  */
 
@@ skipping 17 matching lines @@
   for (r = 0; r < block_size; r++) {
     for (c = 0; c < block_size; c++) {
       dst[c] = (src[c] * src_weight + dst[c] * dst_weight + rounding_bit)
                >> MFQE_PRECISION;
     }
     src += src_stride;
     dst += dst_stride;
   }
 }
 
-void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride,
-                               uint8_t *dst, int dst_stride, int src_weight) {
-  filter_by_weight(src, src_stride, dst, dst_stride, 8, src_weight);
-}
-
-void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride,
-                                 uint8_t *dst, int dst_stride,
-                                 int src_weight) {
-  filter_by_weight(src, src_stride, dst, dst_stride, 16, src_weight);
-}
-
 static void filter_by_weight32x32(const uint8_t *src, int src_stride,
                                   uint8_t *dst, int dst_stride, int weight) {
-  vp9_filter_by_weight16x16(src, src_stride, dst, dst_stride, weight);
-  vp9_filter_by_weight16x16(src + 16, src_stride, dst + 16, dst_stride,
-                            weight);
-  vp9_filter_by_weight16x16(src + src_stride * 16, src_stride,
-                            dst + dst_stride * 16, dst_stride, weight);
-  vp9_filter_by_weight16x16(src + src_stride * 16 + 16, src_stride,
-                            dst + dst_stride * 16 + 16, dst_stride, weight);
+  filter_by_weight(src, src_stride, dst, dst_stride, 16, weight);
+  filter_by_weight(src + 16, src_stride, dst + 16, dst_stride, 16, weight);
+  filter_by_weight(src + src_stride * 16, src_stride, dst + dst_stride * 16,
+                   dst_stride, 16, weight);
+  filter_by_weight(src + src_stride * 16 + 16, src_stride,
+                   dst + dst_stride * 16 + 16, dst_stride, 16, weight);
 }
 
 static void filter_by_weight64x64(const uint8_t *src, int src_stride,
                                   uint8_t *dst, int dst_stride, int weight) {
   filter_by_weight32x32(src, src_stride, dst, dst_stride, weight);
   filter_by_weight32x32(src + 32, src_stride, dst + 32,
                         dst_stride, weight);
   filter_by_weight32x32(src + src_stride * 32, src_stride,
                         dst + dst_stride * 32, dst_stride, weight);
   filter_by_weight32x32(src + src_stride * 32 + 32, src_stride,
                         dst + dst_stride * 32 + 32, dst_stride, weight);
 }
 
 static void apply_ifactor(const uint8_t *y, int y_stride, uint8_t *yd,
                           int yd_stride, const uint8_t *u, const uint8_t *v,
                           int uv_stride, uint8_t *ud, uint8_t *vd,
                           int uvd_stride, BLOCK_SIZE block_size,
                           int weight) {
   if (block_size == BLOCK_16X16) {
-    vp9_filter_by_weight16x16(y, y_stride, yd, yd_stride, weight);
-    vp9_filter_by_weight8x8(u, uv_stride, ud, uvd_stride, weight);
-    vp9_filter_by_weight8x8(v, uv_stride, vd, uvd_stride, weight);
+    filter_by_weight(y, y_stride, yd, yd_stride, 16, weight);
+    filter_by_weight(u, uv_stride, ud, uvd_stride, 8, weight);
+    filter_by_weight(v, uv_stride, vd, uvd_stride, 8, weight);
   } else if (block_size == BLOCK_32X32) {
     filter_by_weight32x32(y, y_stride, yd, yd_stride, weight);
-    vp9_filter_by_weight16x16(u, uv_stride, ud, uvd_stride, weight);
-    vp9_filter_by_weight16x16(v, uv_stride, vd, uvd_stride, weight);
+    filter_by_weight(u, uv_stride, ud, uvd_stride, 16, weight);
+    filter_by_weight(v, uv_stride, vd, uvd_stride, 16, weight);
   } else if (block_size == BLOCK_64X64) {
     filter_by_weight64x64(y, y_stride, yd, yd_stride, weight);
     filter_by_weight32x32(u, uv_stride, ud, uvd_stride, weight);
     filter_by_weight32x32(v, uv_stride, vd, uvd_stride, weight);
   }
 }
 
 // TODO(jackychen): Determine whether replace it with assembly code.
 static void copy_mem8x8(const uint8_t *src, int src_stride,
                         uint8_t *dst, int dst_stride) {
@@ skipping 290 matching lines @@
       if (frame_is_intra_only(cm)) {
         mi = mi_prev;
       } else {
         mi = mi_local;
       }
       mfqe_partition(cm, mi, BLOCK_64X64, y, u, v, y_stride, uv_stride, yd, ud,
                      vd, yd_stride, uvd_stride);
     }
   }
 }