commit d280a84554269ea06a9950050b92d14bfe34c191
author Steinar Midtskogen <stemidts@cisco.com> Tue Mar 21 09:59:14 2017 +0100
committer Steinar Midtskogen <stemidts@cisco.com> Tue Mar 21 21:27:09 2017 +0000
tree 670c266ff7d7dd4b36955e8d1b8980539e73258d
parent 6eca835fff6dba1e1a4f8b672a04a17d1b386bd9

Remove boundary checks in CLPF

Change-Id: Icc93783f47fe7fe3aac395aadcc8bbc307dae1fb

test/clpf_test.cc

diff --git a/test/clpf_test.cc b/test/clpf_test.cc
index dfcde50..2847b0a 100644
--- a/test/clpf_test.cc
+++ b/test/clpf_test.cc
@@ -28,8 +28,7 @@
 
 typedef void (*clpf_block_t)(const uint8_t *src, uint8_t *dst, int sstride,
                              int dstride, int x0, int y0, int sizex, int sizey,
-                             unsigned int strength, BOUNDARY_TYPE bt,
-                             unsigned int bitdepth);
+                             unsigned int strength, unsigned int bitdepth);
 
 typedef std::tr1::tuple<clpf_block_t, clpf_block_t, int, int>
     clpf_block_param_t;
@@ -59,7 +58,7 @@
 typedef void (*clpf_block_hbd_t)(const uint16_t *src, uint16_t *dst,
                                  int sstride, int dstride, int x0, int y0,
                                  int sizex, int sizey, unsigned int strength,
-                                 BOUNDARY_TYPE bt, unsigned int bitdepth);
+                                 unsigned int bitdepth);
 
 typedef std::tr1::tuple<clpf_block_hbd_t, clpf_block_hbd_t, int, int>
     clpf_block_hbd_param_t;
@@ -91,12 +90,11 @@
 void test_clpf(int w, int h, int depth, int iterations,
                void (*clpf)(const pixel *src, pixel *dst, int sstride,
                             int dstride, int x0, int y0, int sizex, int sizey,
-                            unsigned int strength, BOUNDARY_TYPE bt,
-                            unsigned int bitdepth),
+                            unsigned int strength, unsigned int bitdepth),
                void (*ref_clpf)(const pixel *src, pixel *dst, int sstride,
                                 int dstride, int x0, int y0, int sizex,
                                 int sizey, unsigned int strength,
-                                BOUNDARY_TYPE bt, unsigned int bitdepth)) {
+                                unsigned int bitdepth)) {
   const int size = 24;
   ACMRandom rnd(ACMRandom::DeterministicSeed());
   DECLARE_ALIGNED(16, pixel, s[size * size]);
@@ -125,16 +123,11 @@
           for (xpos = 0; xpos < size && !error; xpos += w * !error) {
             for (strength = depth - 8; strength < depth - 5 && !error;
                  strength += !error) {
-              BOUNDARY_TYPE bt =
-                  BOUNDARY_TYPE((TILE_LEFT_BOUNDARY & -(!xpos)) |
-                                (TILE_ABOVE_BOUNDARY & -(!ypos)) |
-                                (TILE_RIGHT_BOUNDARY & -(xpos + w == size)) |
-                                (TILE_BOTTOM_BOUNDARY & -(ypos + h == size)));
               ref_clpf(s, ref_d, size, size, xpos, ypos, w, h, 1 << strength,
-                       bt, depth);
+                       depth);
               if (clpf != ref_clpf)
                 ASM_REGISTER_STATE_CHECK(clpf(s, d, size, size, xpos, ypos, w,
-                                              h, 1 << strength, bt, depth));
+                                              h, 1 << strength, depth));
               if (ref_clpf != clpf)
                 for (pos = 0; pos < size * size && !error; pos++) {
                   error = ref_d[pos] != d[pos];
@@ -175,11 +168,10 @@
                      void (*clpf)(const pixel *src, pixel *dst, int sstride,
                                   int dstride, int x0, int y0, int sizex,
                                   int sizey, unsigned int strength,
-                                  BOUNDARY_TYPE bt, unsigned int bitdepth),
+                                  unsigned int bitdepth),
                      void (*ref_clpf)(const pixel *src, pixel *dst, int sstride,
                                       int dstride, int x0, int y0, int sizex,
                                       int sizey, unsigned int strength,
-                                      BOUNDARY_TYPE bt,
                                       unsigned int bitdepth)) {
   aom_usec_timer ref_timer;
   aom_usec_timer timer;