From c6b9039fd94aede59ac1086a379955137fc8e1b8 Mon Sep 17 00:00:00 2001
From: John Koleszar <jkoleszar@google.com>
Date: Fri, 13 Jul 2012 15:21:29 -0700
Subject: 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
---
 vp8/decoder/onyxd_int.h | 113 +++++++++++++++++++++++-------------------------
 1 file changed, 54 insertions(+), 59 deletions(-)

(limited to 'vp8/decoder/onyxd_int.h')

diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h
index c7ee834b4..5ad0ac83f 100644
--- a/vp8/decoder/onyxd_int.h
+++ b/vp8/decoder/onyxd_int.h
@@ -17,81 +17,76 @@
 #include "vp8/common/onyxc_int.h"
 #include "dequantize.h"
 
-//#define DEC_DEBUG
+// #define DEC_DEBUG
 
-typedef struct
-{
-    int ithread;
-    void *ptr1;
-    void *ptr2;
+typedef struct {
+  int ithread;
+  void *ptr1;
+  void *ptr2;
 } DECODETHREAD_DATA;
 
-typedef struct
-{
-    MACROBLOCKD  mbd;
-    int mb_row;
-    int current_mb_col;
-    short *coef_ptr;
+typedef struct {
+  MACROBLOCKD  mbd;
+  int mb_row;
+  int current_mb_col;
+  short *coef_ptr;
 } MB_ROW_DEC;
 
-typedef struct
-{
-    int64_t time_stamp;
-    int size;
+typedef struct {
+  int64_t time_stamp;
+  int size;
 } DATARATE;
 
-typedef struct
-{
-    int const *scan;
-    int const *scan_8x8;
-    UINT8 const *ptr_block2leftabove;
-    vp8_tree_index const *vp8_coef_tree_ptr;
-    unsigned char *norm_ptr;
-    UINT8 *ptr_coef_bands_x;
-    UINT8 *ptr_coef_bands_x_8x8;
+typedef struct {
+  int const *scan;
+  int const *scan_8x8;
+  UINT8 const *ptr_block2leftabove;
+  vp8_tree_index const *vp8_coef_tree_ptr;
+  unsigned char *norm_ptr;
+  UINT8 *ptr_coef_bands_x;
+  UINT8 *ptr_coef_bands_x_8x8;
 
-    ENTROPY_CONTEXT_PLANES *A;
-    ENTROPY_CONTEXT_PLANES *L;
+  ENTROPY_CONTEXT_PLANES *A;
+  ENTROPY_CONTEXT_PLANES *L;
 
-    INT16 *qcoeff_start_ptr;
-    BOOL_DECODER *current_bc;
+  INT16 *qcoeff_start_ptr;
+  BOOL_DECODER *current_bc;
 
-    vp8_prob const *coef_probs[BLOCK_TYPES];
-    vp8_prob const *coef_probs_8x8[BLOCK_TYPES_8X8];
+  vp8_prob const *coef_probs[BLOCK_TYPES];
+  vp8_prob const *coef_probs_8x8[BLOCK_TYPES_8X8];
 
-    UINT8 eob[25];
+  UINT8 eob[25];
 
 } DETOK;
 
-typedef struct VP8Decompressor
-{
-    DECLARE_ALIGNED(16, MACROBLOCKD, mb);
+typedef struct VP8Decompressor {
+  DECLARE_ALIGNED(16, MACROBLOCKD, mb);
 
-    DECLARE_ALIGNED(16, VP8_COMMON, common);
+  DECLARE_ALIGNED(16, VP8_COMMON, common);
 
-    vp8_reader bc, bc2;
+  vp8_reader bc, bc2;
 
-    VP8D_CONFIG oxcf;
+  VP8D_CONFIG oxcf;
 
 
-    const unsigned char *Source;
-    unsigned int   source_sz;
+  const unsigned char *Source;
+  unsigned int   source_sz;
 
-    vp8_reader *mbc;
-    int64_t last_time_stamp;
-    int   ready_for_new_data;
+  vp8_reader *mbc;
+  int64_t last_time_stamp;
+  int   ready_for_new_data;
 
-    DATARATE dr[16];
+  DATARATE dr[16];
 
-    DETOK detoken;
+  DETOK detoken;
 
 #if CONFIG_RUNTIME_CPU_DETECT
-    vp8_dequant_rtcd_vtable_t        dequant;
+  vp8_dequant_rtcd_vtable_t        dequant;
 #endif
 
-    vp8_prob prob_skip_false;
+  vp8_prob prob_skip_false;
 
-    int decoded_key_frame;
+  int decoded_key_frame;
 
 } VP8D_COMP;
 
@@ -101,19 +96,19 @@ void vp8_dmachine_specific_config(VP8D_COMP *pbi);
 
 #if CONFIG_DEBUG
 #define CHECK_MEM_ERROR(lval,expr) do {\
-        lval = (expr); \
-        if(!lval) \
-            vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
-                               "Failed to allocate "#lval" at %s:%d", \
-                               __FILE__,__LINE__);\
-    } while(0)
+    lval = (expr); \
+    if(!lval) \
+      vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
+                         "Failed to allocate "#lval" at %s:%d", \
+                         __FILE__,__LINE__);\
+  } while(0)
 #else
 #define CHECK_MEM_ERROR(lval,expr) do {\
-        lval = (expr); \
-        if(!lval) \
-            vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
-                               "Failed to allocate "#lval);\
-    } while(0)
+    lval = (expr); \
+    if(!lval) \
+      vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
+                         "Failed to allocate "#lval);\
+  } while(0)
 #endif
 
 #endif
-- 
cgit v1.2.3