1 files changed, 36 insertions, 29 deletions

diff --git a/vp8/common/mbpitch.c b/vp8/common/mbpitch.c
index 1a8431742..4c5c56c3b 100644
--- a/vp8/common/mbpitch.c
+++ b/vp8/common/mbpitch.c
@@ -41,77 +41,84 @@ static void setup_block
 }
 
 
-static void setup_macroblock(MACROBLOCKD *x, BLOCKSET bs) {
+static void setup_macroblock(MACROBLOCKD *xd, BLOCKSET bs) {
   int block;
 
   unsigned char **y, **u, **v;
   unsigned char **y2, **u2, **v2;
+  BLOCKD *blockd = xd->block;
+  int stride;
 
   if (bs == DEST) {
-    y = &x->dst.y_buffer;
-    u = &x->dst.u_buffer;
-    v = &x->dst.v_buffer;
+    y = &xd->dst.y_buffer;
+    u = &xd->dst.u_buffer;
+    v = &xd->dst.v_buffer;
   } else {
-    y = &x->pre.y_buffer;
-    u = &x->pre.u_buffer;
-    v = &x->pre.v_buffer;
+    y = &xd->pre.y_buffer;
+    u = &xd->pre.u_buffer;
+    v = &xd->pre.v_buffer;
 
-    y2 = &x->second_pre.y_buffer;
-    u2 = &x->second_pre.u_buffer;
-    v2 = &x->second_pre.v_buffer;
+    y2 = &xd->second_pre.y_buffer;
+    u2 = &xd->second_pre.u_buffer;
+    v2 = &xd->second_pre.v_buffer;
   }
 
+  stride = xd->dst.y_stride;
   for (block = 0; block < 16; block++) { /* y blocks */
-    setup_block(&x->block[block], x->dst.y_stride, y, y2, x->dst.y_stride,
-                (block >> 2) * 4 * x->dst.y_stride + (block & 3) * 4, bs);
+    setup_block(&blockd[block], stride, y, y2, stride,
+                (block >> 2) * 4 * stride + (block & 3) * 4, bs);
   }
 
+  stride = xd->dst.uv_stride;
   for (block = 16; block < 20; block++) { /* U and V blocks */
-    setup_block(&x->block[block], x->dst.uv_stride, u, u2, x->dst.uv_stride,
-                ((block - 16) >> 1) * 4 * x->dst.uv_stride + (block & 1) * 4, bs);
+    setup_block(&blockd[block], stride, u, u2, stride,
+      ((block - 16) >> 1) * 4 * stride + (block & 1) * 4, bs);
 
-    setup_block(&x->block[block + 4], x->dst.uv_stride, v, v2, x->dst.uv_stride,
-                ((block - 16) >> 1) * 4 * x->dst.uv_stride + (block & 1) * 4, bs);
+    setup_block(&blockd[block + 4], stride, v, v2, stride,
+      ((block - 16) >> 1) * 4 * stride + (block & 1) * 4, bs);
   }
 }
 
-void vp8_setup_block_dptrs(MACROBLOCKD *x) {
+void vp8_setup_block_dptrs(MACROBLOCKD *xd) {
   int r, c;
+  BLOCKD *blockd = xd->block;
 
   for (r = 0; r < 4; r++) {
     for (c = 0; c < 4; c++) {
-      x->block[r * 4 + c].diff      = &x->diff[r * 4 * 16 + c * 4];
-      x->block[r * 4 + c].predictor = x->predictor + r * 4 * 16 + c * 4;
+      blockd[r * 4 + c].diff = &xd->diff[r * 4 * 16 + c * 4];
+      blockd[r * 4 + c].predictor = xd->predictor + r * 4 * 16 + c * 4;
     }
   }
 
   for (r = 0; r < 2; r++) {
     for (c = 0; c < 2; c++) {
-      x->block[16 + r * 2 + c].diff      = &x->diff[256 + r * 4 * 8 + c * 4];
-      x->block[16 + r * 2 + c].predictor = x->predictor + 256 + r * 4 * 8 + c * 4;
+      blockd[16 + r * 2 + c].diff = &xd->diff[256 + r * 4 * 8 + c * 4];
+      blockd[16 + r * 2 + c].predictor =
+        xd->predictor + 256 + r * 4 * 8 + c * 4;
 
     }
   }
 
   for (r = 0; r < 2; r++) {
     for (c = 0; c < 2; c++) {
-      x->block[20 + r * 2 + c].diff      = &x->diff[320 + r * 4 * 8 + c * 4];
-      x->block[20 + r * 2 + c].predictor = x->predictor + 320 + r * 4 * 8 + c * 4;
+      blockd[20 + r * 2 + c].diff = &xd->diff[320 + r * 4 * 8 + c * 4];
+      blockd[20 + r * 2 + c].predictor =
+        xd->predictor + 320 + r * 4 * 8 + c * 4;
 
     }
   }
 
-  x->block[24].diff = &x->diff[384];
+  blockd[24].diff = &xd->diff[384];
 
   for (r = 0; r < 25; r++) {
-    x->block[r].qcoeff  = x->qcoeff  + r * 16;
-    x->block[r].dqcoeff = x->dqcoeff + r * 16;
+    blockd[r].qcoeff  = xd->qcoeff  + r * 16;
+    blockd[r].dqcoeff = xd->dqcoeff + r * 16;
   }
 }
 
-void vp8_build_block_doffsets(MACROBLOCKD *x) {
+void vp8_build_block_doffsets(MACROBLOCKD *xd) {
 
   /* handle the destination pitch features */
-  setup_macroblock(x, DEST);
-  setup_macroblock(x, PRED);
+  setup_macroblock(xd, DEST);
+  setup_macroblock(xd, PRED);
 }