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, 83 insertions, 87 deletions

diff --git a/vp8/common/x86/x86_systemdependent.c b/vp8/common/x86/x86_systemdependent.c
index fae8632a8..7bce3ca34 100644
--- a/vp8/common/x86/x86_systemdependent.c
+++ b/vp8/common/x86/x86_systemdependent.c
@@ -19,127 +19,123 @@
 #include "vp8/common/pragmas.h"
 #include "vp8/common/onyxc_int.h"
 
-void vp8_arch_x86_common_init(VP8_COMMON *ctx)
-{
+void vp8_arch_x86_common_init(VP8_COMMON *ctx) {
 #if CONFIG_RUNTIME_CPU_DETECT
-    VP8_COMMON_RTCD *rtcd = &ctx->rtcd;
-    int flags = x86_simd_caps();
+  VP8_COMMON_RTCD *rtcd = &ctx->rtcd;
+  int flags = x86_simd_caps();
 
-    /* Note:
-     *
-     * This platform can be built without runtime CPU detection as well. If
-     * you modify any of the function mappings present in this file, be sure
-     * to also update them in static mapings (<arch>/filename_<arch>.h)
-     */
+  /* Note:
+   *
+   * This platform can be built without runtime CPU detection as well. If
+   * you modify any of the function mappings present in this file, be sure
+   * to also update them in static mapings (<arch>/filename_<arch>.h)
+   */
 
-    /* Override default functions with fastest ones for this CPU. */
+  /* Override default functions with fastest ones for this CPU. */
 #if HAVE_MMX
 // The commented functions need to be re-written for vpx.
-    if (flags & HAS_MMX)
-    {
-        rtcd->idct.idct1        = vpx_short_idct4x4llm_1_mmx;
-        rtcd->idct.idct16       = vpx_short_idct4x4llm_mmx;
-        rtcd->idct.idct1_scalar_add = vpx_dc_only_idct_add_mmx;
-        //rtcd->idct.iwalsh16     = vp8_short_inv_walsh4x4_mmx;
-        //rtcd->idct.iwalsh1     = vp8_short_inv_walsh4x4_1_mmx;
-
-        rtcd->recon.recon       = vp8_recon_b_mmx;
-        rtcd->recon.copy8x8     = vp8_copy_mem8x8_mmx;
-        rtcd->recon.copy8x4     = vp8_copy_mem8x4_mmx;
-        rtcd->recon.copy16x16   = vp8_copy_mem16x16_mmx;
+  if (flags & HAS_MMX) {
+    rtcd->idct.idct1        = vpx_short_idct4x4llm_1_mmx;
+    rtcd->idct.idct16       = vpx_short_idct4x4llm_mmx;
+    rtcd->idct.idct1_scalar_add = vpx_dc_only_idct_add_mmx;
+    // rtcd->idct.iwalsh16     = vp8_short_inv_walsh4x4_mmx;
+    // rtcd->idct.iwalsh1     = vp8_short_inv_walsh4x4_1_mmx;
+
+    rtcd->recon.recon       = vp8_recon_b_mmx;
+    rtcd->recon.copy8x8     = vp8_copy_mem8x8_mmx;
+    rtcd->recon.copy8x4     = vp8_copy_mem8x4_mmx;
+    rtcd->recon.copy16x16   = vp8_copy_mem16x16_mmx;
 
 #if CONFIG_ENHANCED_INTERP == 0 && CONFIG_HIGH_PRECISION_MV == 0 && CONFIG_SIXTEENTH_SUBPEL_UV == 0
-        rtcd->subpix.sixtap16x16   = vp8_sixtap_predict16x16_mmx;
-        rtcd->subpix.sixtap8x8     = vp8_sixtap_predict8x8_mmx;
-        rtcd->subpix.sixtap8x4     = vp8_sixtap_predict8x4_mmx;
-        rtcd->subpix.sixtap4x4     = vp8_sixtap_predict4x4_mmx;
+    rtcd->subpix.sixtap16x16   = vp8_sixtap_predict16x16_mmx;
+    rtcd->subpix.sixtap8x8     = vp8_sixtap_predict8x8_mmx;
+    rtcd->subpix.sixtap8x4     = vp8_sixtap_predict8x4_mmx;
+    rtcd->subpix.sixtap4x4     = vp8_sixtap_predict4x4_mmx;
 #endif
-        rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_mmx;
-        rtcd->subpix.bilinear8x8   = vp8_bilinear_predict8x8_mmx;
-        rtcd->subpix.bilinear8x4   = vp8_bilinear_predict8x4_mmx;
-        rtcd->subpix.bilinear4x4   = vp8_bilinear_predict4x4_mmx;
-
-        rtcd->loopfilter.normal_mb_v = vp8_loop_filter_mbv_mmx;
-        rtcd->loopfilter.normal_b_v  = vp8_loop_filter_bv_mmx;
-        rtcd->loopfilter.normal_mb_h = vp8_loop_filter_mbh_mmx;
-        rtcd->loopfilter.normal_b_h  = vp8_loop_filter_bh_mmx;
-        rtcd->loopfilter.simple_mb_v = vp8_loop_filter_simple_vertical_edge_mmx;
-        rtcd->loopfilter.simple_b_v  = vp8_loop_filter_bvs_mmx;
-        rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_mmx;
-        rtcd->loopfilter.simple_b_h  = vp8_loop_filter_bhs_mmx;
+    rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_mmx;
+    rtcd->subpix.bilinear8x8   = vp8_bilinear_predict8x8_mmx;
+    rtcd->subpix.bilinear8x4   = vp8_bilinear_predict8x4_mmx;
+    rtcd->subpix.bilinear4x4   = vp8_bilinear_predict4x4_mmx;
+
+    rtcd->loopfilter.normal_mb_v = vp8_loop_filter_mbv_mmx;
+    rtcd->loopfilter.normal_b_v  = vp8_loop_filter_bv_mmx;
+    rtcd->loopfilter.normal_mb_h = vp8_loop_filter_mbh_mmx;
+    rtcd->loopfilter.normal_b_h  = vp8_loop_filter_bh_mmx;
+    rtcd->loopfilter.simple_mb_v = vp8_loop_filter_simple_vertical_edge_mmx;
+    rtcd->loopfilter.simple_b_v  = vp8_loop_filter_bvs_mmx;
+    rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_mmx;
+    rtcd->loopfilter.simple_b_h  = vp8_loop_filter_bhs_mmx;
 
 #if CONFIG_POSTPROC
-        rtcd->postproc.down        = vp8_mbpost_proc_down_mmx;
-        /*rtcd->postproc.across      = vp8_mbpost_proc_across_ip_c;*/
-        rtcd->postproc.downacross  = vp8_post_proc_down_and_across_mmx;
-        rtcd->postproc.addnoise    = vp8_plane_add_noise_mmx;
+    rtcd->postproc.down        = vp8_mbpost_proc_down_mmx;
+    /*rtcd->postproc.across      = vp8_mbpost_proc_across_ip_c;*/
+    rtcd->postproc.downacross  = vp8_post_proc_down_and_across_mmx;
+    rtcd->postproc.addnoise    = vp8_plane_add_noise_mmx;
 #endif
-    }
+  }
 
 #endif
 #if HAVE_SSE2
 
-    if (flags & HAS_SSE2)
-    {
-        rtcd->recon.recon2      = vp8_recon2b_sse2;
-        rtcd->recon.recon4      = vp8_recon4b_sse2;
-        rtcd->recon.copy16x16   = vp8_copy_mem16x16_sse2;
+  if (flags & HAS_SSE2) {
+    rtcd->recon.recon2      = vp8_recon2b_sse2;
+    rtcd->recon.recon4      = vp8_recon4b_sse2;
+    rtcd->recon.copy16x16   = vp8_copy_mem16x16_sse2;
 #if CONFIG_NEWINTRAMODES == 0
-        rtcd->recon.build_intra_predictors_mbuv =
-            vp8_build_intra_predictors_mbuv_sse2;
-        rtcd->recon.build_intra_predictors_mbuv_s =
-            vp8_build_intra_predictors_mbuv_s_sse2;
+    rtcd->recon.build_intra_predictors_mbuv =
+      vp8_build_intra_predictors_mbuv_sse2;
+    rtcd->recon.build_intra_predictors_mbuv_s =
+      vp8_build_intra_predictors_mbuv_s_sse2;
 #endif
 
-        //rtcd->idct.iwalsh16     = vp8_short_inv_walsh4x4_sse2;
+    // rtcd->idct.iwalsh16     = vp8_short_inv_walsh4x4_sse2;
 
 #if CONFIG_ENHANCED_INTERP == 0 && CONFIG_HIGH_PRECISION_MV == 0 && CONFIG_SIXTEENTH_SUBPEL_UV == 0
-        rtcd->subpix.sixtap16x16   = vp8_sixtap_predict16x16_sse2;
-        rtcd->subpix.sixtap8x8     = vp8_sixtap_predict8x8_sse2;
-        rtcd->subpix.sixtap8x4     = vp8_sixtap_predict8x4_sse2;
+    rtcd->subpix.sixtap16x16   = vp8_sixtap_predict16x16_sse2;
+    rtcd->subpix.sixtap8x8     = vp8_sixtap_predict8x8_sse2;
+    rtcd->subpix.sixtap8x4     = vp8_sixtap_predict8x4_sse2;
 #endif
-        rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_sse2;
-        rtcd->subpix.bilinear8x8   = vp8_bilinear_predict8x8_sse2;
-
-        rtcd->loopfilter.normal_mb_v = vp8_loop_filter_mbv_sse2;
-        rtcd->loopfilter.normal_b_v  = vp8_loop_filter_bv_sse2;
-        rtcd->loopfilter.normal_mb_h = vp8_loop_filter_mbh_sse2;
-        rtcd->loopfilter.normal_b_h  = vp8_loop_filter_bh_sse2;
-        rtcd->loopfilter.simple_mb_v = vp8_loop_filter_simple_vertical_edge_sse2;
-        rtcd->loopfilter.simple_b_v  = vp8_loop_filter_bvs_sse2;
-        rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_sse2;
-        rtcd->loopfilter.simple_b_h  = vp8_loop_filter_bhs_sse2;
+    rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_sse2;
+    rtcd->subpix.bilinear8x8   = vp8_bilinear_predict8x8_sse2;
+
+    rtcd->loopfilter.normal_mb_v = vp8_loop_filter_mbv_sse2;
+    rtcd->loopfilter.normal_b_v  = vp8_loop_filter_bv_sse2;
+    rtcd->loopfilter.normal_mb_h = vp8_loop_filter_mbh_sse2;
+    rtcd->loopfilter.normal_b_h  = vp8_loop_filter_bh_sse2;
+    rtcd->loopfilter.simple_mb_v = vp8_loop_filter_simple_vertical_edge_sse2;
+    rtcd->loopfilter.simple_b_v  = vp8_loop_filter_bvs_sse2;
+    rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_sse2;
+    rtcd->loopfilter.simple_b_h  = vp8_loop_filter_bhs_sse2;
 
 #if CONFIG_POSTPROC
-        rtcd->postproc.down        = vp8_mbpost_proc_down_xmm;
-        rtcd->postproc.across      = vp8_mbpost_proc_across_ip_xmm;
-        rtcd->postproc.downacross  = vp8_post_proc_down_and_across_xmm;
-        rtcd->postproc.addnoise    = vp8_plane_add_noise_wmt;
+    rtcd->postproc.down        = vp8_mbpost_proc_down_xmm;
+    rtcd->postproc.across      = vp8_mbpost_proc_across_ip_xmm;
+    rtcd->postproc.downacross  = vp8_post_proc_down_and_across_xmm;
+    rtcd->postproc.addnoise    = vp8_plane_add_noise_wmt;
 #endif
-    }
+  }
 
 #endif
 
 #if HAVE_SSSE3
 
-    if (flags & HAS_SSSE3)
-    {
+  if (flags & HAS_SSSE3) {
 #if CONFIG_ENHANCED_INTERP == 0 && CONFIG_HIGH_PRECISION_MV == 0 && CONFIG_SIXTEENTH_SUBPEL_UV == 0
-        rtcd->subpix.sixtap16x16   = vp8_sixtap_predict16x16_ssse3;
-        rtcd->subpix.sixtap8x8     = vp8_sixtap_predict8x8_ssse3;
-        rtcd->subpix.sixtap8x4     = vp8_sixtap_predict8x4_ssse3;
-        rtcd->subpix.sixtap4x4     = vp8_sixtap_predict4x4_ssse3;
-        rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_ssse3;
-        rtcd->subpix.bilinear8x8   = vp8_bilinear_predict8x8_ssse3;
+    rtcd->subpix.sixtap16x16   = vp8_sixtap_predict16x16_ssse3;
+    rtcd->subpix.sixtap8x8     = vp8_sixtap_predict8x8_ssse3;
+    rtcd->subpix.sixtap8x4     = vp8_sixtap_predict8x4_ssse3;
+    rtcd->subpix.sixtap4x4     = vp8_sixtap_predict4x4_ssse3;
+    rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_ssse3;
+    rtcd->subpix.bilinear8x8   = vp8_bilinear_predict8x8_ssse3;
 #endif
 
 #if CONFIG_NEWINTRAMODES == 0
-        rtcd->recon.build_intra_predictors_mbuv =
-            vp8_build_intra_predictors_mbuv_ssse3;
-        rtcd->recon.build_intra_predictors_mbuv_s =
-            vp8_build_intra_predictors_mbuv_s_ssse3;
+    rtcd->recon.build_intra_predictors_mbuv =
+      vp8_build_intra_predictors_mbuv_ssse3;
+    rtcd->recon.build_intra_predictors_mbuv_s =
+      vp8_build_intra_predictors_mbuv_s_ssse3;
 #endif
-    }
+  }
 #endif
 
 #endif