Code clean up.

Further cases of inconsistent naming convention.

Change-Id: Id3411ecec6f01a4c889268a00f0c9fd5a92ea143

2 files changed, 29 insertions, 26 deletions

diff --git a/vp8/common/arm/neon/recon_neon.c b/vp8/common/arm/neon/recon_neon.c
index a4f601642..510c87dbe 100644
--- a/vp8/common/arm/neon/recon_neon.c
+++ b/vp8/common/arm/neon/recon_neon.c
@@ -15,14 +15,15 @@
 
 extern void vp8_recon16x16mb_neon(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int ystride, unsigned char *udst_ptr, unsigned char *vdst_ptr);
 
-void vp8_recon_mb_neon(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x) {
-  unsigned char *pred_ptr = &x->predictor[0];
-  short *diff_ptr = &x->diff[0];
-  unsigned char *dst_ptr = x->dst.y_buffer;
-  unsigned char *udst_ptr = x->dst.u_buffer;
-  unsigned char *vdst_ptr = x->dst.v_buffer;
-  int ystride = x->dst.y_stride;
-  /*int uv_stride = x->dst.uv_stride;*/
+void vp8_recon_mb_neon(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *xd) {
+  unsigned char *pred_ptr = &xd->predictor[0];
+  short *diff_ptr = &xd->diff[0];
+  unsigned char *dst_ptr = xd->dst.y_buffer;
+  unsigned char *udst_ptr = xd->dst.u_buffer;
+  unsigned char *vdst_ptr = xd->dst.v_buffer;
+  int ystride = xd->dst.y_stride;
+  /*int uv_stride = xd->dst.uv_stride;*/
 
-  vp8_recon16x16mb_neon(pred_ptr, diff_ptr, dst_ptr, ystride, udst_ptr, vdst_ptr);
+  vp8_recon16x16mb_neon(pred_ptr, diff_ptr, dst_ptr, ystride,
+                        udst_ptr, vdst_ptr);
 }
diff --git a/vp8/common/arm/reconintra_arm.c b/vp8/common/arm/reconintra_arm.c
index 814cabd20..2a49fda89 100644
--- a/vp8/common/arm/reconintra_arm.c
+++ b/vp8/common/arm/reconintra_arm.c
@@ -24,15 +24,16 @@ extern void vp8_build_intra_predictors_mby_neon_func(
   int Up,
   int Left);
 
-void vp8_build_intra_predictors_mby_neon(MACROBLOCKD *x) {
-  unsigned char *y_buffer = x->dst.y_buffer;
-  unsigned char *ypred_ptr = x->predictor;
-  int y_stride = x->dst.y_stride;
-  int mode = x->mode_info_context->mbmi.mode;
-  int Up = x->up_available;
-  int Left = x->left_available;
-
-  vp8_build_intra_predictors_mby_neon_func(y_buffer, ypred_ptr, y_stride, mode, Up, Left);
+void vp8_build_intra_predictors_mby_neon(MACROBLOCKD *xd) {
+  unsigned char *y_buffer = xd->dst.y_buffer;
+  unsigned char *ypred_ptr = xd->predictor;
+  int y_stride = xd->dst.y_stride;
+  int mode = xd->mode_info_context->mbmi.mode;
+  int Up = xd->up_available;
+  int Left = xd->left_available;
+
+  vp8_build_intra_predictors_mby_neon_func(y_buffer, ypred_ptr,
+                                           y_stride, mode, Up, Left);
 }
 #endif
 
@@ -46,15 +47,16 @@ extern void vp8_build_intra_predictors_mby_s_neon_func(
   int Up,
   int Left);
 
-void vp8_build_intra_predictors_mby_s_neon(MACROBLOCKD *x) {
-  unsigned char *y_buffer = x->dst.y_buffer;
-  unsigned char *ypred_ptr = x->predictor;
-  int y_stride = x->dst.y_stride;
-  int mode = x->mode_info_context->mbmi.mode;
-  int Up = x->up_available;
-  int Left = x->left_available;
+void vp8_build_intra_predictors_mby_s_neon(MACROBLOCKD *xd) {
+  unsigned char *y_buffer = xd->dst.y_buffer;
+  unsigned char *ypred_ptr = xd->predictor;
+  int y_stride = xd->dst.y_stride;
+  int mode = xd->mode_info_context->mbmi.mode;
+  int Up = xd->up_available;
+  int Left = xd->left_available;
 
-  vp8_build_intra_predictors_mby_s_neon_func(y_buffer, ypred_ptr, y_stride, mode, Up, Left);
+  vp8_build_intra_predictors_mby_s_neon_func(y_buffer, ypred_ptr,
+                                             y_stride, mode, Up, Left);
 }
 
 #endif