Remove vpx_ prefix from the dspr2 file name in vpx_dsp/mips

Make it consistent with other formats.

Change-Id: I28f0d05ff7c5bf2b815989b3f1bd6c6b25608677

diff --git a/vpx_dsp/mips/vpx_convolve2_avg_dspr2.c b/vpx_dsp/mips/convolve2_avg_dspr2.c
similarity index 99%
rename from vpx_dsp/mips/vpx_convolve2_avg_dspr2.c
rename to vpx_dsp/mips/convolve2_avg_dspr2.c
index 4a738b99691270a7c578c124e4419ac87a1b6c1a..f2a1269a2ac878d488091cc75679446c52c51732 100644 (file)
--- a/vpx_dsp/mips/vpx_convolve2_avg_dspr2.c
+++ b/vpx_dsp/mips/convolve2_avg_dspr2.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_dsp_rtcd.h"
-#include "vpx_dsp/mips/vpx_common_dspr2.h"
+#include "vpx_dsp/mips/convolve_common_dspr2.h"
 #include "vpx_dsp/vpx_convolve.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"

diff --git a/vpx_dsp/mips/vpx_convolve2_avg_horiz_dspr2.c b/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c
similarity index 99%
rename from vpx_dsp/mips/vpx_convolve2_avg_horiz_dspr2.c
rename to vpx_dsp/mips/convolve2_avg_horiz_dspr2.c
index b8f33f697469dbf29b1719aede510be2fde368f6..c031fd44ae9790191d4ad5cb13f30696e6b54195 100644 (file)
--- a/vpx_dsp/mips/vpx_convolve2_avg_horiz_dspr2.c
+++ b/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_dsp_rtcd.h"
-#include "vpx_dsp/mips/vpx_common_dspr2.h"
+#include "vpx_dsp/mips/convolve_common_dspr2.h"
 #include "vpx_dsp/vpx_convolve.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"

diff --git a/vpx_dsp/mips/vpx_convolve2_dspr2.c b/vpx_dsp/mips/convolve2_dspr2.c
similarity index 99%
rename from vpx_dsp/mips/vpx_convolve2_dspr2.c
rename to vpx_dsp/mips/convolve2_dspr2.c
index 4a722e1a54c4024e76ed0a45aa4b723537a981db..d111029d42a59858dccc7329d3298f2876826f57 100644 (file)
--- a/vpx_dsp/mips/vpx_convolve2_dspr2.c
+++ b/vpx_dsp/mips/convolve2_dspr2.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_dsp_rtcd.h"
-#include "vpx_dsp/mips/vpx_common_dspr2.h"
+#include "vpx_dsp/mips/convolve_common_dspr2.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_dsp/vpx_filter.h"
 #include "vpx_ports/mem.h"

diff --git a/vpx_dsp/mips/vpx_convolve2_horiz_dspr2.c b/vpx_dsp/mips/convolve2_horiz_dspr2.c
similarity index 99%
rename from vpx_dsp/mips/vpx_convolve2_horiz_dspr2.c
rename to vpx_dsp/mips/convolve2_horiz_dspr2.c
index b6fc665a445d3b91e422ce0423c7b7c8f5e17df3..5c143c506bf30155638001173093870c067c3d28 100644 (file)
--- a/vpx_dsp/mips/vpx_convolve2_horiz_dspr2.c
+++ b/vpx_dsp/mips/convolve2_horiz_dspr2.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_dsp_rtcd.h"
-#include "vpx_dsp/mips/vpx_common_dspr2.h"
+#include "vpx_dsp/mips/convolve_common_dspr2.h"
 #include "vpx_dsp/vpx_convolve.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"

diff --git a/vpx_dsp/mips/vpx_convolve2_vert_dspr2.c b/vpx_dsp/mips/convolve2_vert_dspr2.c
similarity index 99%
rename from vpx_dsp/mips/vpx_convolve2_vert_dspr2.c
rename to vpx_dsp/mips/convolve2_vert_dspr2.c
index 41197ebd2fcada3ba0df4a895538f932682f9321..275bb5354924a3ce1dcde5ccf2e6af4aba845cc1 100644 (file)
--- a/vpx_dsp/mips/vpx_convolve2_vert_dspr2.c
+++ b/vpx_dsp/mips/convolve2_vert_dspr2.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_dsp_rtcd.h"
-#include "vpx_dsp/mips/vpx_common_dspr2.h"
+#include "vpx_dsp/mips/convolve_common_dspr2.h"
 #include "vpx_dsp/vpx_convolve.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"

diff --git a/vpx_dsp/mips/vpx_convolve8_avg_dspr2.c b/vpx_dsp/mips/convolve8_avg_dspr2.c
similarity index 99%
rename from vpx_dsp/mips/vpx_convolve8_avg_dspr2.c
rename to vpx_dsp/mips/convolve8_avg_dspr2.c
index 3ba4c9727afbefdbaf0c7efae2251e86f4a16ab2..dad543dbb11b0687019f46faeac95b84811fe6cc 100644 (file)
--- a/vpx_dsp/mips/vpx_convolve8_avg_dspr2.c
+++ b/vpx_dsp/mips/convolve8_avg_dspr2.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_dsp_rtcd.h"
-#include "vpx_dsp/mips/vpx_common_dspr2.h"
+#include "vpx_dsp/mips/convolve_common_dspr2.h"
 #include "vpx_dsp/vpx_convolve.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"

diff --git a/vpx_dsp/mips/vpx_convolve8_avg_horiz_dspr2.c b/vpx_dsp/mips/convolve8_avg_horiz_dspr2.c
similarity index 99%
rename from vpx_dsp/mips/vpx_convolve8_avg_horiz_dspr2.c
rename to vpx_dsp/mips/convolve8_avg_horiz_dspr2.c
index f8ba96b8bdd3dcb76981090520b3dc50cae3ef66..5ad075f940bd5bc79cff8bcacdc65341f5f46232 100644 (file)
--- a/vpx_dsp/mips/vpx_convolve8_avg_horiz_dspr2.c
+++ b/vpx_dsp/mips/convolve8_avg_horiz_dspr2.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_dsp_rtcd.h"
-#include "vpx_dsp/mips/vpx_common_dspr2.h"
+#include "vpx_dsp/mips/convolve_common_dspr2.h"
 #include "vpx_dsp/vpx_convolve.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"

diff --git a/vpx_dsp/mips/vpx_convolve8_dspr2.c b/vpx_dsp/mips/convolve8_dspr2.c
similarity index 99%
rename from vpx_dsp/mips/vpx_convolve8_dspr2.c
rename to vpx_dsp/mips/convolve8_dspr2.c
index f239c116a459e059f34ace464c14d52255d1f42a..4aa0c9ca56b1ddd1da04c924a49e942b0b2d0232 100644 (file)
--- a/vpx_dsp/mips/vpx_convolve8_dspr2.c
+++ b/vpx_dsp/mips/convolve8_dspr2.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_dsp_rtcd.h"
-#include "vpx_dsp/mips/vpx_common_dspr2.h"
+#include "vpx_dsp/mips/convolve_common_dspr2.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_dsp/vpx_filter.h"
 #include "vpx_ports/mem.h"

diff --git a/vpx_dsp/mips/vpx_convolve8_horiz_dspr2.c b/vpx_dsp/mips/convolve8_horiz_dspr2.c
similarity index 99%
rename from vpx_dsp/mips/vpx_convolve8_horiz_dspr2.c
rename to vpx_dsp/mips/convolve8_horiz_dspr2.c
index 65720d9da3b0e168de9bda5e0a048a17e8d4bf65..c71f93f24fcfe8d6057c7844ffe5a40517a19869 100644 (file)
--- a/vpx_dsp/mips/vpx_convolve8_horiz_dspr2.c
+++ b/vpx_dsp/mips/convolve8_horiz_dspr2.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_dsp_rtcd.h"
-#include "vpx_dsp/mips/vpx_common_dspr2.h"
+#include "vpx_dsp/mips/convolve_common_dspr2.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_dsp/vpx_filter.h"
 #include "vpx_ports/mem.h"

diff --git a/vpx_dsp/mips/vpx_convolve8_vert_dspr2.c b/vpx_dsp/mips/convolve8_vert_dspr2.c
similarity index 99%
rename from vpx_dsp/mips/vpx_convolve8_vert_dspr2.c
rename to vpx_dsp/mips/convolve8_vert_dspr2.c
index cf9b4f1a0a1e39aa6031f2561487af9592265447..6922387b5b80ab8350908bebf74fb144f8f8d255 100644 (file)
--- a/vpx_dsp/mips/vpx_convolve8_vert_dspr2.c
+++ b/vpx_dsp/mips/convolve8_vert_dspr2.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "./vpx_dsp_rtcd.h"
-#include "vpx_dsp/mips/vpx_common_dspr2.h"
+#include "vpx_dsp/mips/convolve_common_dspr2.h"
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_dsp/vpx_filter.h"
 #include "vpx_ports/mem.h"

diff --git a/vpx_dsp/mips/vpx_common_dspr2.h b/vpx_dsp/mips/convolve_common_dspr2.h
similarity index 98%
rename from vpx_dsp/mips/vpx_common_dspr2.h
rename to vpx_dsp/mips/convolve_common_dspr2.h
index 4aff9e5810375e3f28cafaec502c55470596871c..66d77a28544b9619432f646f530943899f320968 100644 (file)
--- a/vpx_dsp/mips/vpx_common_dspr2.h
+++ b/vpx_dsp/mips/convolve_common_dspr2.h
@@ -22,8 +22,6 @@ extern "C" {
 #endif
 
 #if HAVE_DSPR2
-extern uint8_t *vpx_ff_cropTbl;
-
 void vpx_convolve2_horiz_dspr2(const uint8_t *src, ptrdiff_t src_stride,
                                uint8_t *dst, ptrdiff_t dst_stride,
                                const int16_t *filter_x, int x_step_q4,

diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk
index cced04811a37cea78e9012de9cc465729549b995..776921dfdbc6c8f55be8ede8c39ea9d48537e4da 100644 (file)
--- a/vpx_dsp/vpx_dsp.mk
+++ b/vpx_dsp/vpx_dsp.mk
@@ -103,17 +103,17 @@ DSP_SRCS-$(HAVE_MSA) += mips/vpx_convolve_copy_msa.c
 DSP_SRCS-$(HAVE_MSA) += mips/vpx_convolve_msa.h
 
 # common (dspr2)
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_common_dspr2.h
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_convolve2_avg_dspr2.c
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_convolve2_avg_horiz_dspr2.c
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_convolve2_dspr2.c
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_convolve2_horiz_dspr2.c
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_convolve2_vert_dspr2.c
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_convolve8_avg_dspr2.c
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_convolve8_avg_horiz_dspr2.c
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_convolve8_dspr2.c
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_convolve8_horiz_dspr2.c
-DSP_SRCS-$(HAVE_DSPR2)  += mips/vpx_convolve8_vert_dspr2.c
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve_common_dspr2.h
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve2_avg_dspr2.c
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve2_avg_horiz_dspr2.c
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve2_dspr2.c
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve2_horiz_dspr2.c
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve2_vert_dspr2.c
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve8_avg_dspr2.c
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve8_avg_horiz_dspr2.c
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve8_dspr2.c
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve8_horiz_dspr2.c
+DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve8_vert_dspr2.c
 
 # loop filters
 DSP_SRCS-yes += loopfilter.c