commit 60669136f38aaad6c63da25d2074a1417499f773
author Luc Trudeau <luc@trud.ca> Thu Sep 28 16:49:49 2017 -0400
committer Luc Trudeau <luc@trud.ca> Fri Sep 29 20:00:30 2017 +0000
tree e8f59004ef5afeb6ce732b71e52727b0d0db7827
parent 261969b26a8ff4dc75dab2433a70d23e8a377f0d

[CFL] Replace clamp_pixel with clip_pixel

CfL now consistently uses clip_pixel. This change does not alter the
bitsteam.

Change-Id: Ifb6631e786eb1a9cf704c039ed9e6bfa45894143

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index f433b67..5951a19 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5845,6 +5845,7 @@
 #endif  // CONFIG_EXT_INTRA
 
 #if CONFIG_CFL
+// TODO(ltrudeau) add support for HBD.
 static int64_t cfl_alpha_dist(const int16_t *pred_buf_q3, const uint8_t *src,
                               int src_stride, int width, int height,
                               int dc_pred, int alpha_q3,
@@ -5872,12 +5873,10 @@
       const int uv = src[i];
       const int scaled_luma = get_scaled_luma_q0(alpha_q3, pred_buf_q3[i]);
 
-      // TODO(ltrudeau) add support for HBD.
-      diff = uv - clamp(scaled_luma + dc_pred, 0, 255);
+      diff = uv - clip_pixel(scaled_luma + dc_pred);
       dist += diff * diff;
 
-      // TODO(ltrudeau) add support for HBD.
-      diff = uv - clamp(-scaled_luma + dc_pred, 0, 255);
+      diff = uv - clip_pixel(-scaled_luma + dc_pred);
       dist_neg += diff * diff;
     }
     pred_buf_q3 += MAX_SB_SIZE;