Fix constrain() broken in 19f76635

Change-Id: Icd0313d12025b9dcf84f203dbfb1e0756d220dbc

Fix constrain() broken in 19f76635
Change-Id: Icd0313d12025b9dcf84f203dbfb1e0756d220dbc
8362114e · Jean-Marc Valin · Steinar Midtskogen · 8a4de218 · 8362114e
Commit 8362114e authored Apr 01, 2017 by Jean-Marc Valin Committed by Steinar Midtskogen Apr 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

av1/common/clpf.c av1/common/clpf.c +2 -1

No files found.
--- a/av1/common/clpf.c
+++ b/av1/common/clpf.c
@@ -17,7 +17,8 @@
 static int sign(int i) { return i < 0 ? -1 : 1; }

 static int constrain(int x, int s, unsigned int damping) {
-  return sign(x) * AOMMIN(abs(x), s - (abs(x) >> (damping - get_msb(s))));
+  return sign(x) *
+         AOMMIN(abs(x), AOMMAX(0, s - (abs(x) >> (damping - get_msb(s)))));
 }

 int av1_clpf_sample(int X, int A, int B, int C, int D, int E, int F, int G,