commit cdfb981285fdff91d21229550629cc69937244ca
author Steinar Midtskogen <stemidts@cisco.com> Fri Sep 02 10:02:30 2016 +0200
committer Steinar Midtskogen <stemidts@cisco.com> Mon Sep 05 10:26:34 2016 +0000
tree c6650fad748054e87d169eb3fac5c7dc075a6ecb
parent df9bb76b1330de42fe13827df4c72010adb51429

Silence some harmless compiler warnings in CLPF.

Change-Id: I4a6d84007bc17b89cfd8d8f2440bf2968505bd6a

av1/common/clpf.c

diff --git a/av1/common/clpf.c b/av1/common/clpf.c
index 388a7c9..6739809 100644
--- a/av1/common/clpf.c
+++ b/av1/common/clpf.c
@@ -63,7 +63,6 @@
   int height = rec->y_crop_height;
   int xpos, ypos;
   int stride_y = rec->y_stride;
-  int stride_c = rec->uv_stride;
   const int bs = MAX_MIB_SIZE;
   int num_fb_hor = (width + (1 << fb_size_log2) - bs) >> fb_size_log2;
   int num_fb_ver = (height + (1 << fb_size_log2) - bs) >> fb_size_log2;

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index fd4d183..30e8067 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -17,6 +17,7 @@
 #include "./aom_scale_rtcd.h"
 #include "./av1_rtcd.h"
 
+#include "aom/aom_codec.h"
 #include "aom_dsp/aom_dsp_common.h"
 #include "aom_dsp/bitreader.h"
 #include "aom_dsp/bitreader_buffer.h"
@@ -845,10 +846,12 @@
   }
 }
 
-static int clpf_bit(int k, int l, const YV12_BUFFER_CONFIG *rec,
-                    const YV12_BUFFER_CONFIG *org, const AV1_COMMON *cm,
-                    int block_size, int w, int h, unsigned int strength,
-                    unsigned int fb_size_log2, uint8_t *bit) {
+static int clpf_bit(UNUSED int k, UNUSED int l,
+                    UNUSED const YV12_BUFFER_CONFIG *rec,
+                    UNUSED const YV12_BUFFER_CONFIG *org,
+                    UNUSED const AV1_COMMON *cm, UNUSED int block_size,
+                    UNUSED int w, UNUSED int h, UNUSED unsigned int strength,
+                    UNUSED unsigned int fb_size_log2, uint8_t *bit) {
   return *bit;
 }
 #endif

av1/encoder/clpf_rdo.c

diff --git a/av1/encoder/clpf_rdo.c b/av1/encoder/clpf_rdo.c
index 8639add..4221505 100644
--- a/av1/encoder/clpf_rdo.c
+++ b/av1/encoder/clpf_rdo.c
@@ -100,7 +100,7 @@
                     const YV12_BUFFER_CONFIG *org, const AV1_COMMON *cm,
                     unsigned int block_size, unsigned int fb_size_log2, int w,
                     int h, int64_t res[4][4]) {
-  int i, m, n, filtered = 0;
+  int c, m, n, filtered = 0;
   int sum[4];
   int bslog = get_msb(block_size);
   sum[0] = sum[1] = sum[2] = sum[3] = 0;
@@ -153,11 +153,11 @@
     }
   }
 
-  for (i = 0; i < 4; i++) {
-    res[i][0] += sum[0];
-    res[i][1] += sum[1];
-    res[i][2] += sum[2];
-    res[i][3] += sum[3];
+  for (c = 0; c < 4; c++) {
+    res[c][0] += sum[0];
+    res[c][1] += sum[1];
+    res[c][2] += sum[2];
+    res[c][3] += sum[3];
   }
   return filtered;
 }
@@ -165,7 +165,7 @@
 void av1_clpf_test_frame(const YV12_BUFFER_CONFIG *rec,
                          const YV12_BUFFER_CONFIG *org, const AV1_COMMON *cm,
                          int *best_strength, int *best_bs) {
-  int i, j, k, l;
+  int c, j, k, l;
   int64_t best, sums[4][4];
   int width = rec->y_crop_width, height = rec->y_crop_height;
   const int bs = MAX_MIB_SIZE;
@@ -213,9 +213,9 @@
   }
 
   best = (int64_t)1 << 62;
-  for (i = 0; i < 4; i++)
+  for (c = 0; c < 4; c++)
     for (j = 0; j < 4; j++)
-      if ((!i || j) && sums[i][j] < best) best = sums[i][j];
+      if ((!c || j) && sums[c][j] < best) best = sums[c][j];
   best &= 15;
   *best_bs = (best > 3) * (5 + (best < 12) + (best < 8));
   *best_strength = best ? 1 << ((best - 1) & 3) : 0;