commit d9ad054e96679607cc412e28045a2e8891456879
author Jean-Marc Valin <jmvalin@mozilla.com> Wed Feb 15 18:45:05 2017 -0500
committer Jean-Marc Valin <jvalin@mozilla.com> Fri Feb 17 18:09:02 2017 +0000
tree 95f4d04aab6ee322d3703c856a031675d5ccb8c5
parent 4d4cbc9bed0c77210e4178a40ada0b17e4a155b2

Disabling second dering filter when CLPF is enabled.

Low-latency:
masterfix-ll-dering+clpf@2017-02-14T02:31:30.023Z -> masterfix-ll-dering-nosecond@2017-02-16T21:30:38.937Z
   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.1151 | -0.2440 | -0.1287 |  -0.0454 | -0.1130 | -0.0632 |    -0.1206

High-latency:
masterfix-dering-clpf@2017-02-16T21:28:58.511Z -> dering-nosecond+clpf@2017-02-15T23:46:08.501Z
   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.0340 | -0.0883 | -0.0130 |  -0.0104 | -0.0026 |  0.0245 |     0.0215

Change-Id: I3e8f34b1971d3ec280c5695a6fcfb7d7b270b2d9

av1/common/od_dering.c

diff --git a/av1/common/od_dering.c b/av1/common/od_dering.c
index a6b2868..68742b9 100644
--- a/av1/common/od_dering.c
+++ b/av1/common/od_dering.c
@@ -340,6 +340,7 @@
   }
   copy_dering_16bit_to_16bit(in, OD_FILT_BSTRIDE, y, dlist, dering_count,
                              bsize);
+#ifndef CONFIG_CLPF
   for (bi = 0; bi < dering_count; bi++) {
     by = dlist[bi].by;
     bx = dlist[bi].bx;
@@ -349,4 +350,5 @@
         &in[(by * OD_FILT_BSTRIDE << bsize) + (bx << bsize)],
         filter2_thresh[by][bx], dir[by][bx]);
   }
+#endif
 }