commit 5b588b48942914066923254b0a90b074b10bfc4e
author Hui Su <huisu@google.com> Wed Jun 26 14:09:52 2019 -0700
committer Hui Su <huisu@google.com> Thu Jun 27 18:59:54 2019 +0000
tree 5d1c9fcce06afe8ebea544dc29776efb626fc8ef
parent 75ef4e3d0ba024b0f2a13d4b0e60eea04a480d0a

Replace DAALA_DIST with MSE in CDEF search

Use DAALA_DIST only when CONFIG_DIST_8X8 is true.

Tested on lowres and midres speed 1(30 frames), coding performance
changes(%):
          psnr    ssim
lowres   -0.07    0.14
midres   -0.11    0.12

STATS_CHANGED

Change-Id: I6f171eb18179dafd650d6408b522493589340461

av1/encoder/pickcdef.c

diff --git a/av1/encoder/pickcdef.c b/av1/encoder/pickcdef.c
index 8064bca..a61fd28 100644
--- a/av1/encoder/pickcdef.c
+++ b/av1/encoder/pickcdef.c
@@ -178,6 +178,7 @@
   }
 }
 
+#if CONFIG_DIST_8X8
 static INLINE uint64_t dist_8x8_16bit(uint16_t *dst, int dstride, uint16_t *src,
                                       int sstride, int coeff_shift) {
   uint64_t svar = 0;
@@ -205,6 +206,7 @@
                (svar + dvar + (400 << 2 * coeff_shift)) /
                (sqrt((20000 << 4 * coeff_shift) + svar * (double)dvar)));
 }
+#endif  // CONFIG_DIST_8X8
 
 static INLINE uint64_t mse_8x8_16bit(uint16_t *dst, int dstride, uint16_t *src,
                                      int sstride) {
@@ -243,8 +245,15 @@
       by = dlist[bi].by;
       bx = dlist[bi].bx;
       if (pli == 0) {
+#if CONFIG_DIST_8X8
         sum += dist_8x8_16bit(&dst[(by << 3) * dstride + (bx << 3)], dstride,
                               &src[bi << (3 + 3)], 8, coeff_shift);
+#else
+
+        sum += mse_8x8_16bit(&dst[(by << 3) * dstride + (bx << 3)], dstride,
+                             &src[bi << (3 + 3)], 8);
+#endif  // CONFIG_DIST_8X8
+
       } else {
         sum += mse_8x8_16bit(&dst[(by << 3) * dstride + (bx << 3)], dstride,
                              &src[bi << (3 + 3)], 8);