commit 71ad78c862aa874d2f0b6d1d5e1aa3dff72cbeb3
author Luc Trudeau <luc@trud.ca> Thu Sep 28 16:08:14 2017 -0400
committer Luc Trudeau <luc@trud.ca> Fri Sep 29 20:00:30 2017 +0000
tree 002b2c5cbb99cdce39d83e312a37836f55b9f4f3
parent 63e8db53cde8f259ec63bc6ef4fffe1276b860f0

[CFL] Replace DC_PRED magic numbers with base +/- 1

This change does not impact the bitstream. It is intended to simplify
High bit depth support in subsequent commits.

Change-Id: If22822dbb3329fc0b4a5e343772d63761d46d3f1

av1/common/cfl.c

diff --git a/av1/common/cfl.c b/av1/common/cfl.c
index 2aeb566..077eedd 100644
--- a/av1/common/cfl.c
+++ b/av1/common/cfl.c
@@ -88,14 +88,14 @@
   int sum_u = 0;
   int sum_v = 0;
 
-// Match behavior of build_intra_predictors (reconintra.c) at superblock
-// boundaries:
-//
-// 127 127 127 .. 127 127 127 127 127 127
-// 129  A   B  ..  Y   Z
-// 129  C   D  ..  W   X
-// 129  E   F  ..  U   V
-// 129  G   H  ..  S   T   T   T   T   T
+  // Match behavior of build_intra_predictors_high (reconintra.c) at superblock
+  // boundaries:
+  const int base = 128 << (xd->bd - 8);
+// base-1 base-1 base-1 .. base-1 base-1 base-1 base-1 base-1 base-1
+// base+1   A      B  ..     Y      Z
+// base+1   C      D  ..     W      X
+// base+1   E      F  ..     U      V
+// base+1   G      H  ..     S      T      T      T      T      T
 // ..
 
 #if CONFIG_CHROMA_SUB8X8
@@ -109,8 +109,8 @@
       sum_v += dst_v[-dst_v_stride + i];
     }
   } else {
-    sum_u = width * 127;
-    sum_v = width * 127;
+    sum_u = width * (base - 1);
+    sum_v = width * (base - 1);
   }
 
 #if CONFIG_CHROMA_SUB8X8
@@ -123,8 +123,8 @@
       sum_v += dst_v[i * dst_v_stride - 1];
     }
   } else {
-    sum_u += height * 129;
-    sum_v += height * 129;
+    sum_u += height * (base + 1);
+    sum_v += height * (base + 1);
   }
 
   // TODO(ltrudeau) Because of max_block_wide and max_block_high, num_pel will