shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_denoiser_sse2.c: eliminate gcc warnings"

--- a/vp9/encoder/x86/vp9_denoiser_sse2.c

+++ b/vp9/encoder/x86/vp9_denoiser_sse2.c

@@ -50,9 +50,9 @@

                                              const __m128i l21,

                                              __m128i acc_diff) {

   // Calculate differences

-  const __m128i v_sig = _mm_loadu_si128((__m128i *)(&sig[0]));

+  const __m128i v_sig = _mm_loadu_si128((const __m128i *)(&sig[0]));

   const __m128i v_mc_running_avg_y = _mm_loadu_si128(

-                                     (__m128i *)(&mc_running_avg_y[0]));

+                                     (const __m128i *)(&mc_running_avg_y[0]));

   __m128i v_running_avg_y;

   const __m128i pdiff = _mm_subs_epu8(v_mc_running_avg_y, v_sig);

   const __m128i ndiff = _mm_subs_epu8(v_sig, v_mc_running_avg_y);

@@ -103,9 +103,9 @@

                                               __m128i acc_diff) {

   __m128i v_running_avg_y = _mm_loadu_si128((__m128i *)(&running_avg_y[0]));

   // Calculate differences.

-  const __m128i v_sig = _mm_loadu_si128((__m128i *)(&sig[0]));

+  const __m128i v_sig = _mm_loadu_si128((const __m128i *)(&sig[0]));

   const __m128i v_mc_running_avg_y =

-                _mm_loadu_si128((__m128i *)(&mc_running_avg_y[0]));

+                _mm_loadu_si128((const __m128i *)(&mc_running_avg_y[0]));

   const __m128i pdiff = _mm_subs_epu8(v_mc_running_avg_y, v_sig);

   const __m128i ndiff = _mm_subs_epu8(v_sig, v_mc_running_avg_y);

   // Obtain the sign. FF if diff is negative.

@@ -357,9 +357,9 @@

   const __m128i l21 = _mm_set1_epi8(1);

   int sum_diff = 0;

-  for (int i = 0; i < 4; i++) {

-    for (int j = 0; j < 4; j++) {

-      acc_diff[i][j] = _mm_setzero_si128();

+  for (c = 0; c < 4; ++c) {

+    for (r = 0; r < 4; ++r) {

+      acc_diff[c][r] = _mm_setzero_si128();

     }

   }