commit 8ff52fccfa27e1df12ad55310a5c5d1d36ced9a0
author Steinar Midtskogen <stemidts@cisco.com> Tue Apr 04 12:29:19 2017 +0200
committer Steinar Midtskogen <stemidts@cisco.com> Wed Apr 05 14:53:02 2017 +0000
tree 3e14f72621d5ce6e4661f3e9e46b9b8b1756c4f1
parent 1d18460fabd4160b0e97fb8946f7f8497682d5d1

CDEF: Add damping to dering

high-latency, cpu-used=0:
   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.1650 |  0.2545 |  0.2977 |  -0.0423 | -0.0947 | -0.0725 |    -0.0365

low-latency, cpu-used=0:
   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.4006 |  0.0501 | -0.0108 |  -0.1790 | -0.1660 | -0.1992 |    -0.2135

low latency, cpu-used=4:
   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.5508 | -0.2445 | -0.2762 |  -0.1981 | -0.2878 | -0.2228 |    -0.3733

Change-Id: Ia20df28c8bbb6182215b02016053af33bd498145

av1/common/cdef.h

diff --git a/av1/common/cdef.h b/av1/common/cdef.h
index 5f48ca0..c0e7dfc 100644
--- a/av1/common/cdef.h
+++ b/av1/common/cdef.h
@@ -23,6 +23,18 @@
 #include "av1/common/onyxc_int.h"
 #include "./od_dering.h"
 
+static INLINE int sign(int i) { return i < 0 ? -1 : 1; }
+
+static INLINE int constrain(int diff, int threshold, unsigned int damping) {
+  return threshold
+             ? sign(diff) *
+                   AOMMIN(
+                       abs(diff),
+                       AOMMAX(0, threshold - (abs(diff) >>
+                                              (damping - get_msb(threshold)))))
+             : 0;
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif