commit 23a3b21e463fe842fc284cd74e61d9c22716422f
author Luc Trudeau <ltrudeau@mozilla.com> Fri Apr 28 11:36:59 2017 -0400
committer David Michael Barr <b@rr-dav.id.au> Sat Apr 29 21:44:43 2017 +0000
tree 757855968aefc7901efb139bc619dfc262d013d7
parent a575d236195265dccd4caef21fe381f20d815020

[CFL] Rename variables from cr/cb to u/v

To maintain consistency with the rest of the CfL codebase all cr and cb
nammed variables are renammed to u and v.

Change-Id: Iba153def677188f8951b3beb847fb7cfa6c0ff02

av1/common/cfl.c

diff --git a/av1/common/cfl.c b/av1/common/cfl.c
index b49890e..d66a989 100644
--- a/av1/common/cfl.c
+++ b/av1/common/cfl.c
@@ -30,14 +30,14 @@
 // CfL computes its own block-level DC_PRED. This is required to compute both
 // alpha_cb and alpha_cr before the prediction are computed.
 void cfl_dc_pred(MACROBLOCKD *xd, BLOCK_SIZE plane_bsize, TX_SIZE tx_size) {
-  const struct macroblockd_plane *const pd_cb = &xd->plane[AOM_PLANE_U];
-  const struct macroblockd_plane *const pd_cr = &xd->plane[AOM_PLANE_V];
+  const struct macroblockd_plane *const pd_u = &xd->plane[AOM_PLANE_U];
+  const struct macroblockd_plane *const pd_v = &xd->plane[AOM_PLANE_V];
 
-  const uint8_t *const dst_cb = pd_cb->dst.buf;
-  const uint8_t *const dst_cr = pd_cr->dst.buf;
+  const uint8_t *const dst_u = pd_u->dst.buf;
+  const uint8_t *const dst_v = pd_v->dst.buf;
 
-  const int dst_cb_stride = pd_cb->dst.stride;
-  const int dst_cr_stride = pd_cr->dst.stride;
+  const int dst_u_stride = pd_u->dst.stride;
+  const int dst_v_stride = pd_v->dst.stride;
 
   const int block_width = (plane_bsize != BLOCK_INVALID)
                               ? block_size_wide[plane_bsize]
@@ -45,10 +45,12 @@
   const int block_height = (plane_bsize != BLOCK_INVALID)
                                ? block_size_high[plane_bsize]
                                : tx_size_high[tx_size];
+
+  // Number of pixel on the top and left borders.
   const int num_pel = block_width + block_height;
 
-  int sum_cb = 0;
-  int sum_cr = 0;
+  int sum_u = 0;
+  int sum_v = 0;
 
   // Match behavior of build_intra_predictors (reconintra.c) at superblock
   // boundaries:
@@ -63,26 +65,26 @@
   // TODO(ltrudeau) replace this with DC_PRED assembly
   if (xd->up_available && xd->mb_to_right_edge >= 0) {
     for (int i = 0; i < block_width; i++) {
-      sum_cb += dst_cb[-dst_cb_stride + i];
-      sum_cr += dst_cr[-dst_cr_stride + i];
+      sum_u += dst_u[-dst_u_stride + i];
+      sum_v += dst_v[-dst_v_stride + i];
     }
   } else {
-    sum_cb = block_width * 127;
-    sum_cr = block_width * 127;
+    sum_u = block_width * 127;
+    sum_v = block_width * 127;
   }
 
   if (xd->left_available && xd->mb_to_bottom_edge >= 0) {
     for (int i = 0; i < block_height; i++) {
-      sum_cb += dst_cb[i * dst_cb_stride - 1];
-      sum_cr += dst_cr[i * dst_cr_stride - 1];
+      sum_u += dst_u[i * dst_u_stride - 1];
+      sum_v += dst_v[i * dst_v_stride - 1];
     }
   } else {
-    sum_cb += block_height * 129;
-    sum_cr += block_height * 129;
+    sum_u += block_height * 129;
+    sum_v += block_height * 129;
   }
 
-  xd->cfl->dc_pred[CFL_PRED_U] = (sum_cb + (num_pel >> 1)) / num_pel;
-  xd->cfl->dc_pred[CFL_PRED_V] = (sum_cr + (num_pel >> 1)) / num_pel;
+  xd->cfl->dc_pred[CFL_PRED_U] = (sum_u + (num_pel >> 1)) / num_pel;
+  xd->cfl->dc_pred[CFL_PRED_V] = (sum_v + (num_pel >> 1)) / num_pel;
 }
 
 // Predict the current transform block using CfL.