libvpx: Pull from upstream

source/libvpx/vpx_dsp/x86/sad4d_avx2.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.
  */
 #include <immintrin.h>  // AVX2
 #include "vpx/vpx_integer.h"
 
-void vp9_sad32x32x4d_avx2(uint8_t *src,
+void vpx_sad32x32x4d_avx2(uint8_t *src,
                           int src_stride,
                           uint8_t *ref[4],
                           int ref_stride,
-                          unsigned int res[4]) {
+                          uint32_t res[4]) {
   __m256i src_reg, ref0_reg, ref1_reg, ref2_reg, ref3_reg;
   __m256i sum_ref0, sum_ref1, sum_ref2, sum_ref3;
   __m256i sum_mlow, sum_mhigh;
   int i;
   uint8_t *ref0, *ref1, *ref2, *ref3;
 
   ref0 = ref[0];
   ref1 = ref[1];
   ref2 = ref[2];
   ref3 = ref[3];
@@ skipping 45 matching lines @@
     sum_mlow = _mm256_add_epi32(sum_mlow, sum_mhigh);
 
     // add the low 128 bit to the high 128 bit
     sum = _mm_add_epi32(_mm256_castsi256_si128(sum_mlow),
                         _mm256_extractf128_si256(sum_mlow, 1));
 
     _mm_storeu_si128((__m128i *)(res), sum);
   }
 }
 
-void vp9_sad64x64x4d_avx2(uint8_t *src,
+void vpx_sad64x64x4d_avx2(uint8_t *src,
                           int src_stride,
                           uint8_t *ref[4],
                           int ref_stride,
-                          unsigned int res[4]) {
+                          uint32_t res[4]) {
   __m256i src_reg, srcnext_reg, ref0_reg, ref0next_reg;
   __m256i ref1_reg, ref1next_reg, ref2_reg, ref2next_reg;
   __m256i ref3_reg, ref3next_reg;
   __m256i sum_ref0, sum_ref1, sum_ref2, sum_ref3;
   __m256i sum_mlow, sum_mhigh;
   int i;
   uint8_t *ref0, *ref1, *ref2, *ref3;
 
   ref0 = ref[0];
   ref1 = ref[1];
@@ skipping 60 matching lines @@
     // add the low 64 bit to the high 64 bit
     sum_mlow = _mm256_add_epi32(sum_mlow, sum_mhigh);
 
     // add the low 128 bit to the high 128 bit
     sum = _mm_add_epi32(_mm256_castsi256_si128(sum_mlow),
                         _mm256_extractf128_si256(sum_mlow, 1));
 
     _mm_storeu_si128((__m128i *)(res), sum);
   }
 }