From a68356202d3f4c75194b5ae0efc7facb078cefea Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Mon, 3 Aug 2015 09:54:13 -0700 Subject: [PATCH] Remove vpx_ prefix from the dspr2 file name in vpx_dsp/mips Make it consistent with other formats. Change-Id: I28f0d05ff7c5bf2b815989b3f1bd6c6b25608677 --- ...lve2_avg_dspr2.c => convolve2_avg_dspr2.c} | 2 +- ...iz_dspr2.c => convolve2_avg_horiz_dspr2.c} | 2 +- ...px_convolve2_dspr2.c => convolve2_dspr2.c} | 2 +- ..._horiz_dspr2.c => convolve2_horiz_dspr2.c} | 2 +- ...e2_vert_dspr2.c => convolve2_vert_dspr2.c} | 2 +- ...lve8_avg_dspr2.c => convolve8_avg_dspr2.c} | 2 +- ...iz_dspr2.c => convolve8_avg_horiz_dspr2.c} | 2 +- ...px_convolve8_dspr2.c => convolve8_dspr2.c} | 2 +- ..._horiz_dspr2.c => convolve8_horiz_dspr2.c} | 2 +- ...e8_vert_dspr2.c => convolve8_vert_dspr2.c} | 2 +- ...common_dspr2.h => convolve_common_dspr2.h} | 2 -- vpx_dsp/vpx_dsp.mk | 22 +++++++++---------- 12 files changed, 21 insertions(+), 23 deletions(-) rename vpx_dsp/mips/{vpx_convolve2_avg_dspr2.c => convolve2_avg_dspr2.c} (99%) rename vpx_dsp/mips/{vpx_convolve2_avg_horiz_dspr2.c => convolve2_avg_horiz_dspr2.c} (99%) rename vpx_dsp/mips/{vpx_convolve2_dspr2.c => convolve2_dspr2.c} (99%) rename vpx_dsp/mips/{vpx_convolve2_horiz_dspr2.c => convolve2_horiz_dspr2.c} (99%) rename vpx_dsp/mips/{vpx_convolve2_vert_dspr2.c => convolve2_vert_dspr2.c} (99%) rename vpx_dsp/mips/{vpx_convolve8_avg_dspr2.c => convolve8_avg_dspr2.c} (99%) rename vpx_dsp/mips/{vpx_convolve8_avg_horiz_dspr2.c => convolve8_avg_horiz_dspr2.c} (99%) rename vpx_dsp/mips/{vpx_convolve8_dspr2.c => convolve8_dspr2.c} (99%) rename vpx_dsp/mips/{vpx_convolve8_horiz_dspr2.c => convolve8_horiz_dspr2.c} (99%) rename vpx_dsp/mips/{vpx_convolve8_vert_dspr2.c => convolve8_vert_dspr2.c} (99%) rename vpx_dsp/mips/{vpx_common_dspr2.h => convolve_common_dspr2.h} (98%) 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 4a738b996..f2a1269a2 100644 --- a/vpx_dsp/mips/vpx_convolve2_avg_dspr2.c +++ b/vpx_dsp/mips/convolve2_avg_dspr2.c @@ -12,7 +12,7 @@ #include #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 b8f33f697..c031fd44a 100644 --- a/vpx_dsp/mips/vpx_convolve2_avg_horiz_dspr2.c +++ b/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c @@ -12,7 +12,7 @@ #include #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 4a722e1a5..d111029d4 100644 --- a/vpx_dsp/mips/vpx_convolve2_dspr2.c +++ b/vpx_dsp/mips/convolve2_dspr2.c @@ -12,7 +12,7 @@ #include #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 b6fc665a4..5c143c506 100644 --- a/vpx_dsp/mips/vpx_convolve2_horiz_dspr2.c +++ b/vpx_dsp/mips/convolve2_horiz_dspr2.c @@ -12,7 +12,7 @@ #include #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 41197ebd2..275bb5354 100644 --- a/vpx_dsp/mips/vpx_convolve2_vert_dspr2.c +++ b/vpx_dsp/mips/convolve2_vert_dspr2.c @@ -12,7 +12,7 @@ #include #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 3ba4c9727..dad543dbb 100644 --- a/vpx_dsp/mips/vpx_convolve8_avg_dspr2.c +++ b/vpx_dsp/mips/convolve8_avg_dspr2.c @@ -12,7 +12,7 @@ #include #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 f8ba96b8b..5ad075f94 100644 --- a/vpx_dsp/mips/vpx_convolve8_avg_horiz_dspr2.c +++ b/vpx_dsp/mips/convolve8_avg_horiz_dspr2.c @@ -12,7 +12,7 @@ #include #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 f239c116a..4aa0c9ca5 100644 --- a/vpx_dsp/mips/vpx_convolve8_dspr2.c +++ b/vpx_dsp/mips/convolve8_dspr2.c @@ -12,7 +12,7 @@ #include #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 65720d9da..c71f93f24 100644 --- a/vpx_dsp/mips/vpx_convolve8_horiz_dspr2.c +++ b/vpx_dsp/mips/convolve8_horiz_dspr2.c @@ -12,7 +12,7 @@ #include #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 cf9b4f1a0..6922387b5 100644 --- a/vpx_dsp/mips/vpx_convolve8_vert_dspr2.c +++ b/vpx_dsp/mips/convolve8_vert_dspr2.c @@ -12,7 +12,7 @@ #include #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 4aff9e581..66d77a285 100644 --- 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 cced04811..776921dfd 100644 --- 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 -- 2.40.0