From: Johann Date: Tue, 8 Jan 2019 18:34:39 +0000 (-0800) Subject: ppc: resolve missing declarations X-Git-Tag: v1.8.1~324^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=744a1d8f4c14d5003ee642470cd8d539716cf81e;p=libvpx ppc: resolve missing declarations Add rtcd headers and make local functions static. BUG=webm:1584 Change-Id: Ic19aec1dc90703b0b89d1092baee487d0fd0cb4e --- diff --git a/vp9/common/ppc/vp9_idct_vsx.c b/vp9/common/ppc/vp9_idct_vsx.c index 1b2a93edb..e861596ad 100644 --- a/vp9/common/ppc/vp9_idct_vsx.c +++ b/vp9/common/ppc/vp9_idct_vsx.c @@ -10,6 +10,7 @@ #include +#include "./vp9_rtcd.h" #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_dsp/ppc/inv_txfm_vsx.h" #include "vpx_dsp/ppc/bitdepth_conversion_vsx.h" diff --git a/vpx_dsp/ppc/fdct32x32_vsx.c b/vpx_dsp/ppc/fdct32x32_vsx.c index 0156683c2..611071689 100644 --- a/vpx_dsp/ppc/fdct32x32_vsx.c +++ b/vpx_dsp/ppc/fdct32x32_vsx.c @@ -11,9 +11,9 @@ #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" -#include "vpx_dsp/ppc/types_vsx.h" -#include "vpx_dsp/ppc/txfm_common_vsx.h" #include "vpx_dsp/ppc/transpose_vsx.h" +#include "vpx_dsp/ppc/txfm_common_vsx.h" +#include "vpx_dsp/ppc/types_vsx.h" // Returns ((a +/- b) * cospi16 + (2 << 13)) >> 14. static INLINE void single_butterfly(int16x8_t a, int16x8_t b, int16x8_t *add, @@ -223,7 +223,7 @@ static INLINE int16x8_t add_round_shift_s16(const int16x8_t a) { return vec_sra(vec_add(vec_add(a, vec_ones_s16), sign), vec_dct_scale_log2); } -void vpx_fdct32_vsx(const int16x8_t *in, int16x8_t *out, int pass) { +static void fdct32_vsx(const int16x8_t *in, int16x8_t *out, int pass) { int16x8_t temp0[32]; // Hold stages: 1, 4, 7 int16x8_t temp1[32]; // Hold stages: 2, 5 int16x8_t temp2[32]; // Hold stages: 3, 6 @@ -478,16 +478,16 @@ void vpx_fdct32x32_rd_vsx(const int16_t *input, tran_low_t *out, int stride) { // Process in 8x32 columns. load(input, stride, temp0); - vpx_fdct32_vsx(temp0, temp1, 0); + fdct32_vsx(temp0, temp1, 0); load(input + 8, stride, temp0); - vpx_fdct32_vsx(temp0, temp2, 0); + fdct32_vsx(temp0, temp2, 0); load(input + 16, stride, temp0); - vpx_fdct32_vsx(temp0, temp3, 0); + fdct32_vsx(temp0, temp3, 0); load(input + 24, stride, temp0); - vpx_fdct32_vsx(temp0, temp4, 0); + fdct32_vsx(temp0, temp4, 0); // Generate the top row by munging the first set of 8 from each one // together. @@ -496,7 +496,7 @@ void vpx_fdct32x32_rd_vsx(const int16_t *input, tran_low_t *out, int stride) { transpose_8x8(&temp3[0], &temp0[16]); transpose_8x8(&temp4[0], &temp0[24]); - vpx_fdct32_vsx(temp0, temp5, 1); + fdct32_vsx(temp0, temp5, 1); transpose_8x8(&temp5[0], &temp6[0]); transpose_8x8(&temp5[8], &temp6[8]); @@ -511,7 +511,7 @@ void vpx_fdct32x32_rd_vsx(const int16_t *input, tran_low_t *out, int stride) { transpose_8x8(&temp3[8], &temp0[16]); transpose_8x8(&temp4[8], &temp0[24]); - vpx_fdct32_vsx(temp0, temp5, 1); + fdct32_vsx(temp0, temp5, 1); transpose_8x8(&temp5[0], &temp6[0]); transpose_8x8(&temp5[8], &temp6[8]); @@ -526,7 +526,7 @@ void vpx_fdct32x32_rd_vsx(const int16_t *input, tran_low_t *out, int stride) { transpose_8x8(&temp3[16], &temp0[16]); transpose_8x8(&temp4[16], &temp0[24]); - vpx_fdct32_vsx(temp0, temp5, 1); + fdct32_vsx(temp0, temp5, 1); transpose_8x8(&temp5[0], &temp6[0]); transpose_8x8(&temp5[8], &temp6[8]); @@ -541,7 +541,7 @@ void vpx_fdct32x32_rd_vsx(const int16_t *input, tran_low_t *out, int stride) { transpose_8x8(&temp3[24], &temp0[16]); transpose_8x8(&temp4[24], &temp0[24]); - vpx_fdct32_vsx(temp0, temp5, 1); + fdct32_vsx(temp0, temp5, 1); transpose_8x8(&temp5[0], &temp6[0]); transpose_8x8(&temp5[8], &temp6[8]); diff --git a/vpx_dsp/ppc/subtract_vsx.c b/vpx_dsp/ppc/subtract_vsx.c index 51a24151a..76ad302da 100644 --- a/vpx_dsp/ppc/subtract_vsx.c +++ b/vpx_dsp/ppc/subtract_vsx.c @@ -11,6 +11,7 @@ #include #include "./vpx_config.h" +#include "./vpx_dsp_rtcd.h" #include "vpx/vpx_integer.h" #include "vpx_dsp/ppc/types_vsx.h"