Fix formatting in a few files Change-Id: Ia5175afe82b142d9e18c01c546610202c630588e
diff --git a/aom_dsp/mips/sad_msa.c b/aom_dsp/mips/sad_msa.c index 7f7364d..258eb5c 100644 --- a/aom_dsp/mips/sad_msa.c +++ b/aom_dsp/mips/sad_msa.c
@@ -1435,93 +1435,95 @@ second_pred); \ } +/* clang-format off */ // 64x64 -AOM_SAD_64xHEIGHT_MSA(64); -AOM_SAD_64xHEIGHTx3_MSA(64); -AOM_SAD_64xHEIGHTx8_MSA(64); -AOM_SAD_64xHEIGHTx4D_MSA(64); -AOM_AVGSAD_64xHEIGHT_MSA(64); +AOM_SAD_64xHEIGHT_MSA(64) +AOM_SAD_64xHEIGHTx3_MSA(64) +AOM_SAD_64xHEIGHTx8_MSA(64) +AOM_SAD_64xHEIGHTx4D_MSA(64) +AOM_AVGSAD_64xHEIGHT_MSA(64) // 64x32 -AOM_SAD_64xHEIGHT_MSA(32); -AOM_SAD_64xHEIGHTx3_MSA(32); -AOM_SAD_64xHEIGHTx8_MSA(32); -AOM_SAD_64xHEIGHTx4D_MSA(32); -AOM_AVGSAD_64xHEIGHT_MSA(32); +AOM_SAD_64xHEIGHT_MSA(32) +AOM_SAD_64xHEIGHTx3_MSA(32) +AOM_SAD_64xHEIGHTx8_MSA(32) +AOM_SAD_64xHEIGHTx4D_MSA(32) +AOM_AVGSAD_64xHEIGHT_MSA(32) // 32x64 -AOM_SAD_32xHEIGHT_MSA(64); -AOM_SAD_32xHEIGHTx3_MSA(64); -AOM_SAD_32xHEIGHTx8_MSA(64); -AOM_SAD_32xHEIGHTx4D_MSA(64); -AOM_AVGSAD_32xHEIGHT_MSA(64); +AOM_SAD_32xHEIGHT_MSA(64) +AOM_SAD_32xHEIGHTx3_MSA(64) +AOM_SAD_32xHEIGHTx8_MSA(64) +AOM_SAD_32xHEIGHTx4D_MSA(64) +AOM_AVGSAD_32xHEIGHT_MSA(64) // 32x32 -AOM_SAD_32xHEIGHT_MSA(32); -AOM_SAD_32xHEIGHTx3_MSA(32); -AOM_SAD_32xHEIGHTx8_MSA(32); -AOM_SAD_32xHEIGHTx4D_MSA(32); -AOM_AVGSAD_32xHEIGHT_MSA(32); +AOM_SAD_32xHEIGHT_MSA(32) +AOM_SAD_32xHEIGHTx3_MSA(32) +AOM_SAD_32xHEIGHTx8_MSA(32) +AOM_SAD_32xHEIGHTx4D_MSA(32) +AOM_AVGSAD_32xHEIGHT_MSA(32) // 32x16 -AOM_SAD_32xHEIGHT_MSA(16); -AOM_SAD_32xHEIGHTx3_MSA(16); -AOM_SAD_32xHEIGHTx8_MSA(16); -AOM_SAD_32xHEIGHTx4D_MSA(16); -AOM_AVGSAD_32xHEIGHT_MSA(16); +AOM_SAD_32xHEIGHT_MSA(16) +AOM_SAD_32xHEIGHTx3_MSA(16) +AOM_SAD_32xHEIGHTx8_MSA(16) +AOM_SAD_32xHEIGHTx4D_MSA(16) +AOM_AVGSAD_32xHEIGHT_MSA(16) // 16x32 -AOM_SAD_16xHEIGHT_MSA(32); -AOM_SAD_16xHEIGHTx3_MSA(32); -AOM_SAD_16xHEIGHTx8_MSA(32); -AOM_SAD_16xHEIGHTx4D_MSA(32); -AOM_AVGSAD_16xHEIGHT_MSA(32); +AOM_SAD_16xHEIGHT_MSA(32) +AOM_SAD_16xHEIGHTx3_MSA(32) +AOM_SAD_16xHEIGHTx8_MSA(32) +AOM_SAD_16xHEIGHTx4D_MSA(32) +AOM_AVGSAD_16xHEIGHT_MSA(32) // 16x16 -AOM_SAD_16xHEIGHT_MSA(16); -AOM_SAD_16xHEIGHTx3_MSA(16); -AOM_SAD_16xHEIGHTx8_MSA(16); -AOM_SAD_16xHEIGHTx4D_MSA(16); -AOM_AVGSAD_16xHEIGHT_MSA(16); +AOM_SAD_16xHEIGHT_MSA(16) +AOM_SAD_16xHEIGHTx3_MSA(16) +AOM_SAD_16xHEIGHTx8_MSA(16) +AOM_SAD_16xHEIGHTx4D_MSA(16) +AOM_AVGSAD_16xHEIGHT_MSA(16) // 16x8 -AOM_SAD_16xHEIGHT_MSA(8); -AOM_SAD_16xHEIGHTx3_MSA(8); -AOM_SAD_16xHEIGHTx8_MSA(8); -AOM_SAD_16xHEIGHTx4D_MSA(8); -AOM_AVGSAD_16xHEIGHT_MSA(8); +AOM_SAD_16xHEIGHT_MSA(8) +AOM_SAD_16xHEIGHTx3_MSA(8) +AOM_SAD_16xHEIGHTx8_MSA(8) +AOM_SAD_16xHEIGHTx4D_MSA(8) +AOM_AVGSAD_16xHEIGHT_MSA(8) // 8x16 -AOM_SAD_8xHEIGHT_MSA(16); -AOM_SAD_8xHEIGHTx3_MSA(16); -AOM_SAD_8xHEIGHTx8_MSA(16); -AOM_SAD_8xHEIGHTx4D_MSA(16); -AOM_AVGSAD_8xHEIGHT_MSA(16); +AOM_SAD_8xHEIGHT_MSA(16) +AOM_SAD_8xHEIGHTx3_MSA(16) +AOM_SAD_8xHEIGHTx8_MSA(16) +AOM_SAD_8xHEIGHTx4D_MSA(16) +AOM_AVGSAD_8xHEIGHT_MSA(16) // 8x8 -AOM_SAD_8xHEIGHT_MSA(8); -AOM_SAD_8xHEIGHTx3_MSA(8); -AOM_SAD_8xHEIGHTx8_MSA(8); -AOM_SAD_8xHEIGHTx4D_MSA(8); -AOM_AVGSAD_8xHEIGHT_MSA(8); +AOM_SAD_8xHEIGHT_MSA(8) +AOM_SAD_8xHEIGHTx3_MSA(8) +AOM_SAD_8xHEIGHTx8_MSA(8) +AOM_SAD_8xHEIGHTx4D_MSA(8) +AOM_AVGSAD_8xHEIGHT_MSA(8) // 8x4 -AOM_SAD_8xHEIGHT_MSA(4); -AOM_SAD_8xHEIGHTx3_MSA(4); -AOM_SAD_8xHEIGHTx8_MSA(4); -AOM_SAD_8xHEIGHTx4D_MSA(4); -AOM_AVGSAD_8xHEIGHT_MSA(4); +AOM_SAD_8xHEIGHT_MSA(4) +AOM_SAD_8xHEIGHTx3_MSA(4) +AOM_SAD_8xHEIGHTx8_MSA(4) +AOM_SAD_8xHEIGHTx4D_MSA(4) +AOM_AVGSAD_8xHEIGHT_MSA(4) // 4x8 -AOM_SAD_4xHEIGHT_MSA(8); -AOM_SAD_4xHEIGHTx3_MSA(8); -AOM_SAD_4xHEIGHTx8_MSA(8); -AOM_SAD_4xHEIGHTx4D_MSA(8); -AOM_AVGSAD_4xHEIGHT_MSA(8); +AOM_SAD_4xHEIGHT_MSA(8) +AOM_SAD_4xHEIGHTx3_MSA(8) +AOM_SAD_4xHEIGHTx8_MSA(8) +AOM_SAD_4xHEIGHTx4D_MSA(8) +AOM_AVGSAD_4xHEIGHT_MSA(8) // 4x4 -AOM_SAD_4xHEIGHT_MSA(4); -AOM_SAD_4xHEIGHTx3_MSA(4); -AOM_SAD_4xHEIGHTx8_MSA(4); -AOM_SAD_4xHEIGHTx4D_MSA(4); -AOM_AVGSAD_4xHEIGHT_MSA(4); +AOM_SAD_4xHEIGHT_MSA(4) +AOM_SAD_4xHEIGHTx3_MSA(4) +AOM_SAD_4xHEIGHTx8_MSA(4) +AOM_SAD_4xHEIGHTx4D_MSA(4) +AOM_AVGSAD_4xHEIGHT_MSA(4) + /* clang-format on */
diff --git a/aom_dsp/mips/sub_pixel_variance_msa.c b/aom_dsp/mips/sub_pixel_variance_msa.c index cfbdb15..3eb8510 100644 --- a/aom_dsp/mips/sub_pixel_variance_msa.c +++ b/aom_dsp/mips/sub_pixel_variance_msa.c
@@ -1,11 +1,12 @@ /* - * Copyright (c) 2015 The WebM project authors. All Rights Reserved. + * Copyright (c) 2016, Alliance for Open Media. All rights reserved * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. + * This source code is subject to the terms of the BSD 2 Clause License and + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * was not distributed with this source code in the LICENSE file, you can + * obtain it at www.aomedia.org/license/software. If the Alliance for Open + * Media Patent License 1.0 was not distributed with this source code in the + * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ #include "./aom_dsp_rtcd.h" @@ -1652,23 +1653,25 @@ return var; \ } -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(4, 4); -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(4, 8); +/* clang-format off */ +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(4, 4) +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(4, 8) -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(8, 4); -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(8, 8); -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(8, 16); +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(8, 4) +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(8, 8) +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(8, 16) -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(16, 8); -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(16, 16); -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(16, 32); +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(16, 8) +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(16, 16) +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(16, 32) -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(32, 16); -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(32, 32); -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(32, 64); +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(32, 16) +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(32, 32) +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(32, 64) -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(64, 32); -AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(64, 64); +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(64, 32) +AOM_SUB_PIXEL_VARIANCE_WDXHT_MSA(64, 64) +/* clang-format on */ #define AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(wd, ht) \ uint32_t aom_sub_pixel_avg_variance##wd##x##ht##_msa( \ @@ -1703,19 +1706,21 @@ return VARIANCE_##wd##Wx##ht##H(*sse, diff); \ } -AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(4, 4); -AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(4, 8); +/* clang-format off */ +AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(4, 4) +AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(4, 8) -AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(8, 4); -AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(8, 8); -AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(8, 16); +AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(8, 4) +AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(8, 8) +AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(8, 16) -AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(16, 8); -AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(16, 16); -AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(16, 32); +AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(16, 8) +AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(16, 16) +AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(16, 32) -AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(32, 16); -AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(32, 32); +AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(32, 16) +AOM_SUB_PIXEL_AVG_VARIANCE_WDXHT_MSA(32, 32) +/* clang-format on */ uint32_t aom_sub_pixel_avg_variance32x64_msa(const uint8_t *src_ptr, int32_t src_stride, @@ -1784,5 +1789,7 @@ return VARIANCE_64Wx##ht##H(*sse, diff); \ } -AOM_SUB_PIXEL_AVG_VARIANCE64XHEIGHT_MSA(32); -AOM_SUB_PIXEL_AVG_VARIANCE64XHEIGHT_MSA(64); +/* clang-format off */ +AOM_SUB_PIXEL_AVG_VARIANCE64XHEIGHT_MSA(32) +AOM_SUB_PIXEL_AVG_VARIANCE64XHEIGHT_MSA(64) +/* clang-format on */
diff --git a/aom_dsp/mips/variance_msa.c b/aom_dsp/mips/variance_msa.c index 1479363..745fdfc 100644 --- a/aom_dsp/mips/variance_msa.c +++ b/aom_dsp/mips/variance_msa.c
@@ -540,8 +540,9 @@ return VARIANCE_##wd##Wx##ht##H(*sse, diff); \ } -AOM_VARIANCE_WDXHT_MSA(4, 4); -AOM_VARIANCE_WDXHT_MSA(4, 8); +/* clang-format off */ +AOM_VARIANCE_WDXHT_MSA(4, 4) +AOM_VARIANCE_WDXHT_MSA(4, 8) AOM_VARIANCE_WDXHT_MSA(8, 4) AOM_VARIANCE_WDXHT_MSA(8, 8) @@ -553,6 +554,7 @@ AOM_VARIANCE_WDXHT_MSA(32, 16) AOM_VARIANCE_WDXHT_MSA(32, 32) +/* clang-format on */ uint32_t aom_variance32x64_msa(const uint8_t *src, int32_t src_stride, const uint8_t *ref, int32_t ref_stride,