VP9->VPX in fdct function names

Change-Id: I664dadad44b98a82a22e87a481b6ec596f272bd6

diff --git a/vp10/encoder/mips/msa/fdct4x4_msa.c b/vp10/encoder/mips/msa/fdct4x4_msa.c
index 37269f0a43a8f739f663681eebb475e190ef2ce2..f9028f096a1134f8a11f98cab57a5325aa45a7fc 100644 (file)
--- a/vp10/encoder/mips/msa/fdct4x4_msa.c
+++ b/vp10/encoder/mips/msa/fdct4x4_msa.c
@@ -67,24 +67,24 @@ void vp10_fht4x4_msa(const int16_t *input, int16_t *output, int32_t stride,
 
   switch (tx_type) {
     case DCT_DCT:
-      VP9_FDCT4(in0, in1, in2, in3, in0, in1, in2, in3);
+      VPX_FDCT4(in0, in1, in2, in3, in0, in1, in2, in3);
       TRANSPOSE4x4_SH_SH(in0, in1, in2, in3, in0, in1, in2, in3);
-      VP9_FDCT4(in0, in1, in2, in3, in0, in1, in2, in3);
+      VPX_FDCT4(in0, in1, in2, in3, in0, in1, in2, in3);
       break;
     case ADST_DCT:
-      VP9_FADST4(in0, in1, in2, in3, in0, in1, in2, in3);
+      VPX_FADST4(in0, in1, in2, in3, in0, in1, in2, in3);
       TRANSPOSE4x4_SH_SH(in0, in1, in2, in3, in0, in1, in2, in3);
-      VP9_FDCT4(in0, in1, in2, in3, in0, in1, in2, in3);
+      VPX_FDCT4(in0, in1, in2, in3, in0, in1, in2, in3);
       break;
     case DCT_ADST:
-      VP9_FDCT4(in0, in1, in2, in3, in0, in1, in2, in3);
+      VPX_FDCT4(in0, in1, in2, in3, in0, in1, in2, in3);
       TRANSPOSE4x4_SH_SH(in0, in1, in2, in3, in0, in1, in2, in3);
-      VP9_FADST4(in0, in1, in2, in3, in0, in1, in2, in3);
+      VPX_FADST4(in0, in1, in2, in3, in0, in1, in2, in3);
       break;
     case ADST_ADST:
-      VP9_FADST4(in0, in1, in2, in3, in0, in1, in2, in3);
+      VPX_FADST4(in0, in1, in2, in3, in0, in1, in2, in3);
       TRANSPOSE4x4_SH_SH(in0, in1, in2, in3, in0, in1, in2, in3);
-      VP9_FADST4(in0, in1, in2, in3, in0, in1, in2, in3);
+      VPX_FADST4(in0, in1, in2, in3, in0, in1, in2, in3);
       break;
     default:
       assert(0);

diff --git a/vp10/encoder/mips/msa/fdct8x8_msa.c b/vp10/encoder/mips/msa/fdct8x8_msa.c
index 5ce9a656c4def62ba0cb34bcb19f451b1b6c317d..8e1e111b3684cea7bfb4358524b06f5acf100c91 100644 (file)
--- a/vp10/encoder/mips/msa/fdct8x8_msa.c
+++ b/vp10/encoder/mips/msa/fdct8x8_msa.c
@@ -23,11 +23,11 @@ void vp10_fht8x8_msa(const int16_t *input, int16_t *output, int32_t stride,
 
   switch (tx_type) {
     case DCT_DCT:
-      VP9_FDCT8(in0, in1, in2, in3, in4, in5, in6, in7,
+      VPX_FDCT8(in0, in1, in2, in3, in4, in5, in6, in7,
                 in0, in1, in2, in3, in4, in5, in6, in7);
       TRANSPOSE8x8_SH_SH(in0, in1, in2, in3, in4, in5, in6, in7,
                          in0, in1, in2, in3, in4, in5, in6, in7);
-      VP9_FDCT8(in0, in1, in2, in3, in4, in5, in6, in7,
+      VPX_FDCT8(in0, in1, in2, in3, in4, in5, in6, in7,
                 in0, in1, in2, in3, in4, in5, in6, in7);
       break;
     case ADST_DCT:
@@ -35,11 +35,11 @@ void vp10_fht8x8_msa(const int16_t *input, int16_t *output, int32_t stride,
                 in0, in1, in2, in3, in4, in5, in6, in7);
       TRANSPOSE8x8_SH_SH(in0, in1, in2, in3, in4, in5, in6, in7,
                          in0, in1, in2, in3, in4, in5, in6, in7);
-      VP9_FDCT8(in0, in1, in2, in3, in4, in5, in6, in7,
+      VPX_FDCT8(in0, in1, in2, in3, in4, in5, in6, in7,
                 in0, in1, in2, in3, in4, in5, in6, in7);
       break;
     case DCT_ADST:
-      VP9_FDCT8(in0, in1, in2, in3, in4, in5, in6, in7,
+      VPX_FDCT8(in0, in1, in2, in3, in4, in5, in6, in7,
                 in0, in1, in2, in3, in4, in5, in6, in7);
       TRANSPOSE8x8_SH_SH(in0, in1, in2, in3, in4, in5, in6, in7,
                          in0, in1, in2, in3, in4, in5, in6, in7);

diff --git a/vp10/encoder/mips/msa/fdct_msa.h b/vp10/encoder/mips/msa/fdct_msa.h
index 74a756e44e5da49150047ca2b28b9dcceeef932e..57672805262a3f2ae31c0200be927933d3bae522 100644 (file)
--- a/vp10/encoder/mips/msa/fdct_msa.h
+++ b/vp10/encoder/mips/msa/fdct_msa.h
@@ -81,7 +81,7 @@
   out5 = -out5;                                                             \
 }
 
-#define VP9_FADST4(in0, in1, in2, in3, out0, out1, out2, out3) {  \
+#define VPX_FADST4(in0, in1, in2, in3, out0, out1, out2, out3) {  \
   v4i32 s0_m, s1_m, s2_m, s3_m, constant_m;                       \
   v4i32 in0_r_m, in1_r_m, in2_r_m, in3_r_m;                       \
                                                                   \