shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "ppc: resolve missing declarations"

--- a/vp9/common/ppc/vp9_idct_vsx.c

+++ b/vp9/common/ppc/vp9_idct_vsx.c

@@ -10,6 +10,7 @@

 #include <assert.h>

+#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"

--- 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 @@

   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 @@

   // 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 @@

   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 @@

   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 @@

   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 @@

   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]);

--- a/vpx_dsp/ppc/subtract_vsx.c

+++ b/vpx_dsp/ppc/subtract_vsx.c

@@ -11,6 +11,7 @@

 #include <assert.h>

 #include "./vpx_config.h"

+#include "./vpx_dsp_rtcd.h"

 #include "vpx/vpx_integer.h"

 #include "vpx_dsp/ppc/types_vsx.h"