libvpx: Pull from upstream

source/libvpx/vp9/encoder/x86/vp9_denoiser_sse2.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 132 matching lines @@
   // Modify each level's adjustment according to motion_magnitude.
   const __m128i l3 = _mm_set1_epi8(
       (motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD) ? 7 + shift_inc : 6);
   // Difference between level 3 and level 2 is 2.
   const __m128i l32 = _mm_set1_epi8(2);
   // Difference between level 2 and level 1 is 1.
   const __m128i l21 = _mm_set1_epi8(1);
   const uint8_t shift = (width == 4) ? 2 : 1;
 
   for (r = 0; r < ((4 << b_height_log2_lookup[bs]) >> shift); ++r) {
-    vpx_memcpy(sig_buffer[r], sig, width);
-    vpx_memcpy(sig_buffer[r] + width, sig + sig_stride, width);
-    vpx_memcpy(mc_running_buffer[r], mc_running_avg_y, width);
-    vpx_memcpy(mc_running_buffer[r] + width,
-               mc_running_avg_y + mc_avg_y_stride, width);
-    vpx_memcpy(running_buffer[r], running_avg_y, width);
-    vpx_memcpy(running_buffer[r] + width,
-               running_avg_y + avg_y_stride, width);
+    memcpy(sig_buffer[r], sig, width);
+    memcpy(sig_buffer[r] + width, sig + sig_stride, width);
+    memcpy(mc_running_buffer[r], mc_running_avg_y, width);
+    memcpy(mc_running_buffer[r] + width,
+           mc_running_avg_y + mc_avg_y_stride, width);
+    memcpy(running_buffer[r], running_avg_y, width);
+    memcpy(running_buffer[r] + width, running_avg_y + avg_y_stride, width);
     if (width == 4) {
-      vpx_memcpy(sig_buffer[r] + width * 2, sig + sig_stride * 2, width);
-      vpx_memcpy(sig_buffer[r] + width * 3, sig + sig_stride * 3, width);
-      vpx_memcpy(mc_running_buffer[r] + width * 2,
-                 mc_running_avg_y + mc_avg_y_stride * 2, width);
-      vpx_memcpy(mc_running_buffer[r] + width * 3,
-                 mc_running_avg_y + mc_avg_y_stride * 3, width);
-      vpx_memcpy(running_buffer[r] + width * 2,
-                 running_avg_y + avg_y_stride * 2, width);
-      vpx_memcpy(running_buffer[r] + width * 3,
-                 running_avg_y + avg_y_stride * 3, width);
+      memcpy(sig_buffer[r] + width * 2, sig + sig_stride * 2, width);
+      memcpy(sig_buffer[r] + width * 3, sig + sig_stride * 3, width);
+      memcpy(mc_running_buffer[r] + width * 2,
+             mc_running_avg_y + mc_avg_y_stride * 2, width);
+      memcpy(mc_running_buffer[r] + width * 3,
+             mc_running_avg_y + mc_avg_y_stride * 3, width);
+      memcpy(running_buffer[r] + width * 2,
+             running_avg_y + avg_y_stride * 2, width);
+      memcpy(running_buffer[r] + width * 3,
+             running_avg_y + avg_y_stride * 3, width);
     }
     acc_diff = vp9_denoiser_16x1_sse2(sig_buffer[r],
                                       mc_running_buffer[r],
                                       running_buffer[r],
                                       &k_0, &k_4, &k_8, &k_16,
                                       &l3, &l32, &l21, acc_diff);
-    vpx_memcpy(running_avg_y, running_buffer[r], width);
-    vpx_memcpy(running_avg_y + avg_y_stride, running_buffer[r] + width, width);
+    memcpy(running_avg_y, running_buffer[r], width);
+    memcpy(running_avg_y + avg_y_stride, running_buffer[r] + width, width);
     if (width == 4) {
-      vpx_memcpy(running_avg_y + avg_y_stride * 2,
-                 running_buffer[r] + width * 2, width);
-      vpx_memcpy(running_avg_y + avg_y_stride * 3,
-                 running_buffer[r] + width * 3, width);
+      memcpy(running_avg_y + avg_y_stride * 2,
+             running_buffer[r] + width * 2, width);
+      memcpy(running_avg_y + avg_y_stride * 3,
+             running_buffer[r] + width * 3, width);
     }
     // Update pointers for next iteration.
     sig += (sig_stride << shift);
     mc_running_avg_y += (mc_avg_y_stride << shift);
     running_avg_y += (avg_y_stride << shift);
   }
 
   {
     sum_diff = sum_diff_16x1(acc_diff);
     sum_diff_thresh = total_adj_strong_thresh(bs, increase_denoising);
@@ skipping 11 matching lines @@
       const int delta = ((abs(sum_diff) - sum_diff_thresh) >>
                          num_pels_log2_lookup[bs]) + 1;
       // Only apply the adjustment for max delta up to 3.
       if (delta < 4) {
         const __m128i k_delta = _mm_set1_epi8(delta);
         running_avg_y -= avg_y_stride * (4 << b_height_log2_lookup[bs]);
         for (r = 0; r < ((4 << b_height_log2_lookup[bs]) >> shift); ++r) {
           acc_diff = vp9_denoiser_adj_16x1_sse2(
               sig_buffer[r], mc_running_buffer[r], running_buffer[r],
               k_0, k_delta, acc_diff);
-          vpx_memcpy(running_avg_y, running_buffer[r], width);
-          vpx_memcpy(running_avg_y + avg_y_stride,
-                     running_buffer[r] + width, width);
+          memcpy(running_avg_y, running_buffer[r], width);
+          memcpy(running_avg_y + avg_y_stride,
+                 running_buffer[r] + width, width);
           if (width == 4) {
-            vpx_memcpy(running_avg_y + avg_y_stride * 2,
-                       running_buffer[r] + width * 2, width);
-            vpx_memcpy(running_avg_y + avg_y_stride * 3,
-                       running_buffer[r] + width * 3, width);
+            memcpy(running_avg_y + avg_y_stride * 2,
+                   running_buffer[r] + width * 2, width);
+            memcpy(running_avg_y + avg_y_stride * 3,
+                   running_buffer[r] + width * 3, width);
           }
           // Update pointers for next iteration.
           running_avg_y += (avg_y_stride << shift);
         }
         sum_diff = sum_diff_16x1(acc_diff);
         if (abs(sum_diff) > sum_diff_thresh) {
           return COPY_BLOCK;
         }
       } else {
         return COPY_BLOCK;
@@ skipping 133 matching lines @@
              bs == BLOCK_64X32 || bs == BLOCK_64X64) {
     return vp9_denoiser_NxM_sse2_big(sig, sig_stride,
                                      mc_avg, mc_avg_stride,
                                      avg, avg_stride,
                                      increase_denoising,
                                      bs, motion_magnitude);
   } else {
     return COPY_BLOCK;
   }
 }