libvpx: Pull from upstream

source/libvpx/vpx_dsp/mips/itrans32_dspr2.c

Index: source/libvpx/vpx_dsp/mips/itrans32_dspr2.c
diff --git a/source/libvpx/vp9/common/mips/dspr2/vp9_itrans32_dspr2.c b/source/libvpx/vpx_dsp/mips/itrans32_dspr2.c
similarity index 99%
rename from source/libvpx/vp9/common/mips/dspr2/vp9_itrans32_dspr2.c
rename to source/libvpx/vpx_dsp/mips/itrans32_dspr2.c
index b4b0d248c696280c0b9a709fb1929e8c5ab8dffb..523da1df1bc7bb45e78b94f29041e4a7a990c114 100644
--- a/source/libvpx/vp9/common/mips/dspr2/vp9_itrans32_dspr2.c
+++ b/source/libvpx/vpx_dsp/mips/itrans32_dspr2.c
@@ -12,10 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_config.h"
-#include "./vp9_rtcd.h"
-#include "vp9/common/vp9_common.h"
-#include "vp9/common/vp9_blockd.h"
-#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
+#include "vpx_dsp/mips/inv_txfm_dspr2.h"
 #include "vpx_dsp/txfm_common.h"
 
 #if HAVE_DSPR2
@@ -868,7 +865,7 @@ static void idct32_rows_dspr2(const int16_t *input, int16_t *output,
   }
 }
 
-void vp9_idct32x32_1024_add_dspr2(const int16_t *input, uint8_t *dest,
+void vpx_idct32x32_1024_add_dspr2(const int16_t *input, uint8_t *dest,
                                   int dest_stride) {
   DECLARE_ALIGNED(32, int16_t,  out[32 * 32]);
   int16_t *outptr = out;
@@ -885,10 +882,10 @@ void vp9_idct32x32_1024_add_dspr2(const int16_t *input, uint8_t *dest,
   idct32_rows_dspr2(input, outptr, 32);
 
   // Columns
-  vp9_idct32_cols_add_blk_dspr2(out, dest, dest_stride);
+  vpx_idct32_cols_add_blk_dspr2(out, dest, dest_stride);
 }
 
-void vp9_idct32x32_34_add_dspr2(const int16_t *input, uint8_t *dest,
+void vpx_idct32x32_34_add_dspr2(const int16_t *input, uint8_t *dest,
                                 int stride) {
   DECLARE_ALIGNED(32, int16_t,  out[32 * 32]);
   int16_t *outptr = out;
@@ -947,10 +944,10 @@ void vp9_idct32x32_34_add_dspr2(const int16_t *input, uint8_t *dest,
   }
 
   // Columns
-  vp9_idct32_cols_add_blk_dspr2(out, dest, stride);
+  vpx_idct32_cols_add_blk_dspr2(out, dest, stride);
 }
 
-void vp9_idct32x32_1_add_dspr2(const int16_t *input, uint8_t *dest,
+void vpx_idct32x32_1_add_dspr2(const int16_t *input, uint8_t *dest,
                                int stride) {
   int       r, out;
   int32_t   a1, absa1;