From 1a30f701451639fea2200d8dd58d65e4f89860a9 Mon Sep 17 00:00:00 2001
From: Scott LaVarnway <slavarnway@google.com>
Date: Fri, 27 Jun 2014 05:00:26 -0700
Subject: [PATCH] denoising_sse2.c visual studio warnings/errors fix
Fixed reported vs warnings/errors.
Change-Id: Ia4c44d64a69dbd9e1738c6ebb48be29582b7e1d3
---
vp8/encoder/x86/denoising_sse2.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/vp8/encoder/x86/denoising_sse2.c b/vp8/encoder/x86/denoising_sse2.c
index 4d1452cc16..b84795ceb4 100644
--- a/vp8/encoder/x86/denoising_sse2.c
+++ b/vp8/encoder/x86/denoising_sse2.c
@@ -18,7 +18,7 @@
#include "vpx_ports/emmintrin_compat.h"
/* Compute the sum of all pixel differences of this MB. */
-static inline unsigned int abs_sum_diff_16x1(__m128i acc_diff) {
+static INLINE unsigned int abs_sum_diff_16x1(__m128i acc_diff) {
const __m128i k_1 = _mm_set1_epi16(1);
const __m128i acc_diff_lo = _mm_srai_epi16(
_mm_unpacklo_epi8(acc_diff, acc_diff), 8);
@@ -44,7 +44,7 @@ int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y,
{
unsigned char *running_avg_y_start = running_avg_y;
unsigned char *sig_start = sig;
- int sum_diff_thresh;
+ unsigned int sum_diff_thresh;
int r;
int shift_inc = (increase_denoising &&
motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD) ? 1 : 0;
@@ -191,7 +191,7 @@ int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg,
int increase_denoising) {
unsigned char *running_avg_start = running_avg;
unsigned char *sig_start = sig;
- int sum_diff_thresh;
+ unsigned int sum_diff_thresh;
int r;
int shift_inc = (increase_denoising &&
motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD_UV) ? 1 : 0;
--
GitLab