Restyle code

Approximate the Google style guide[1] so that that there's a written
document to follow and tools to check compliance[2].

[1]: http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
[2]: http://google-styleguide.googlecode.com/svn/trunk/cpplint/cpplint.py

Change-Id: Idf40e3d8dddcc72150f6af127b13e5dab838685f

1 files changed, 76 insertions, 96 deletions

diff --git a/vp8/common/mbpitch.c b/vp8/common/mbpitch.c
index b23cbbe2c..1a8431742 100644
--- a/vp8/common/mbpitch.c
+++ b/vp8/common/mbpitch.c
@@ -11,127 +11,107 @@
 
 #include "blockd.h"
 
-typedef enum
-{
-    PRED = 0,
-    DEST = 1
+typedef enum {
+  PRED = 0,
+  DEST = 1
 } BLOCKSET;
 
 static void setup_block
 (
-    BLOCKD *b,
-    int mv_stride,
-    unsigned char **base,
-    unsigned char **base2,
-    int Stride,
-    int offset,
-    BLOCKSET bs
-)
-{
-
-    if (bs == DEST)
-    {
-        b->dst_stride = Stride;
-        b->dst = offset;
-        b->base_dst = base;
-    }
-    else
-    {
-        b->pre_stride = Stride;
-        b->pre = offset;
-        b->base_pre = base;
-        b->base_second_pre = base2;
-    }
+  BLOCKD *b,
+  int mv_stride,
+  unsigned char **base,
+  unsigned char **base2,
+  int Stride,
+  int offset,
+  BLOCKSET bs
+) {
+
+  if (bs == DEST) {
+    b->dst_stride = Stride;
+    b->dst = offset;
+    b->base_dst = base;
+  } else {
+    b->pre_stride = Stride;
+    b->pre = offset;
+    b->base_pre = base;
+    b->base_second_pre = base2;
+  }
 
 }
 
 
-static void setup_macroblock(MACROBLOCKD *x, BLOCKSET bs)
-{
-    int block;
+static void setup_macroblock(MACROBLOCKD *x, BLOCKSET bs) {
+  int block;
 
-    unsigned char **y, **u, **v;
-    unsigned char **y2, **u2, **v2;
+  unsigned char **y, **u, **v;
+  unsigned char **y2, **u2, **v2;
 
-    if (bs == DEST)
-    {
-        y = &x->dst.y_buffer;
-        u = &x->dst.u_buffer;
-        v = &x->dst.v_buffer;
-    }
-    else
-    {
-        y = &x->pre.y_buffer;
-        u = &x->pre.u_buffer;
-        v = &x->pre.v_buffer;
-
-        y2 = &x->second_pre.y_buffer;
-        u2 = &x->second_pre.u_buffer;
-        v2 = &x->second_pre.v_buffer;
-    }
+  if (bs == DEST) {
+    y = &x->dst.y_buffer;
+    u = &x->dst.u_buffer;
+    v = &x->dst.v_buffer;
+  } else {
+    y = &x->pre.y_buffer;
+    u = &x->pre.u_buffer;
+    v = &x->pre.v_buffer;
 
-    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);
-    }
+    y2 = &x->second_pre.y_buffer;
+    u2 = &x->second_pre.u_buffer;
+    v2 = &x->second_pre.v_buffer;
+  }
 
-    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);
+  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(&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);
-    }
+  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(&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);
+  }
 }
 
-void vp8_setup_block_dptrs(MACROBLOCKD *x)
-{
-    int r, c;
-
-    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;
-        }
+void vp8_setup_block_dptrs(MACROBLOCKD *x) {
+  int r, c;
+
+  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;
     }
+  }
 
-    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;
+  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;
 
-        }
     }
+  }
 
-    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;
+  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;
 
-        }
     }
+  }
 
-    x->block[24].diff = &x->diff[384];
+  x->block[24].diff = &x->diff[384];
 
-    for (r = 0; r < 25; r++)
-    {
-        x->block[r].qcoeff  = x->qcoeff  + r * 16;
-        x->block[r].dqcoeff = x->dqcoeff + r * 16;
-    }
+  for (r = 0; r < 25; r++) {
+    x->block[r].qcoeff  = x->qcoeff  + r * 16;
+    x->block[r].dqcoeff = x->dqcoeff + r * 16;
+  }
 }
 
-void vp8_build_block_doffsets(MACROBLOCKD *x)
-{
+void vp8_build_block_doffsets(MACROBLOCKD *x) {
 
-    /* handle the destination pitch features */
-    setup_macroblock(x, DEST);
-    setup_macroblock(x, PRED);
+  /* handle the destination pitch features */
+  setup_macroblock(x, DEST);
+  setup_macroblock(x, PRED);
 }