shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Turn on dspr2 loop filter functions in vpx_dsp"

--- a/vpx_dsp/vpx_dsp.mk

+++ b/vpx_dsp/vpx_dsp.mk

@@ -149,6 +149,13 @@

 DSP_SRCS-$(HAVE_MSA)    += mips/loopfilter_16_msa.c

 DSP_SRCS-$(HAVE_MSA)    += mips/loopfilter_8_msa.c

 DSP_SRCS-$(HAVE_MSA)    += mips/loopfilter_4_msa.c

+DSP_SRCS-$(HAVE_DSPR2)  += mips/loopfilter_filters_dspr2.h

+DSP_SRCS-$(HAVE_DSPR2)  += mips/loopfilter_filters_dspr2.c

+DSP_SRCS-$(HAVE_DSPR2)  += mips/loopfilter_macros_dspr2.h

+DSP_SRCS-$(HAVE_DSPR2)  += mips/loopfilter_masks_dspr2.h

+DSP_SRCS-$(HAVE_DSPR2)  += mips/loopfilter_mb_dspr2.c

+DSP_SRCS-$(HAVE_DSPR2)  += mips/loopfilter_mb_horiz_dspr2.c

+DSP_SRCS-$(HAVE_DSPR2)  += mips/loopfilter_mb_vert_dspr2.c

 ifeq ($(CONFIG_VP9_HIGHBITDEPTH),yes)

 DSP_SRCS-$(HAVE_SSE2)   += x86/highbd_loopfilter_sse2.c

--- a/vpx_dsp/vpx_dsp_rtcd_defs.pl

+++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl

@@ -449,42 +449,42 @@

 # Loopfilter

 #

 add_proto qw/void vpx_lpf_vertical_16/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh";

-specialize qw/vpx_lpf_vertical_16 sse2 neon_asm msa/;

+specialize qw/vpx_lpf_vertical_16 sse2 neon_asm dspr2 msa/;

 $vpx_lpf_vertical_16_neon_asm=vpx_lpf_vertical_16_neon;

 add_proto qw/void vpx_lpf_vertical_16_dual/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh";

-specialize qw/vpx_lpf_vertical_16_dual sse2 neon_asm msa/;

+specialize qw/vpx_lpf_vertical_16_dual sse2 neon_asm dspr2 msa/;

 $vpx_lpf_vertical_16_dual_neon_asm=vpx_lpf_vertical_16_dual_neon;

 add_proto qw/void vpx_lpf_vertical_8/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count";

-specialize qw/vpx_lpf_vertical_8 sse2 neon msa/;

+specialize qw/vpx_lpf_vertical_8 sse2 neon dspr2 msa/;

 add_proto qw/void vpx_lpf_vertical_8_dual/, "uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1";

-specialize qw/vpx_lpf_vertical_8_dual sse2 neon_asm msa/;

+specialize qw/vpx_lpf_vertical_8_dual sse2 neon_asm dspr2 msa/;

 $vpx_lpf_vertical_8_dual_neon_asm=vpx_lpf_vertical_8_dual_neon;

 add_proto qw/void vpx_lpf_vertical_4/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count";

-specialize qw/vpx_lpf_vertical_4 mmx neon msa/;

+specialize qw/vpx_lpf_vertical_4 mmx neon dspr2 msa/;

 add_proto qw/void vpx_lpf_vertical_4_dual/, "uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1";

-specialize qw/vpx_lpf_vertical_4_dual sse2 neon msa/;

+specialize qw/vpx_lpf_vertical_4_dual sse2 neon dspr2 msa/;

 add_proto qw/void vpx_lpf_horizontal_16/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count";

-specialize qw/vpx_lpf_horizontal_16 sse2 avx2 neon_asm msa/;

+specialize qw/vpx_lpf_horizontal_16 sse2 avx2 neon_asm dspr2 msa/;

 $vpx_lpf_horizontal_16_neon_asm=vpx_lpf_horizontal_16_neon;

 add_proto qw/void vpx_lpf_horizontal_8/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count";

-specialize qw/vpx_lpf_horizontal_8 sse2 neon msa/;

+specialize qw/vpx_lpf_horizontal_8 sse2 neon dspr2 msa/;

 add_proto qw/void vpx_lpf_horizontal_8_dual/, "uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1";

-specialize qw/vpx_lpf_horizontal_8_dual sse2 neon_asm msa/;

+specialize qw/vpx_lpf_horizontal_8_dual sse2 neon_asm dspr2 msa/;

 $vpx_lpf_horizontal_8_dual_neon_asm=vpx_lpf_horizontal_8_dual_neon;

 add_proto qw/void vpx_lpf_horizontal_4/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count";

-specialize qw/vpx_lpf_horizontal_4 mmx neon msa/;

+specialize qw/vpx_lpf_horizontal_4 mmx neon dspr2 msa/;

 add_proto qw/void vpx_lpf_horizontal_4_dual/, "uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1";

-specialize qw/vpx_lpf_horizontal_4_dual sse2 neon msa/;

+specialize qw/vpx_lpf_horizontal_4_dual sse2 neon dspr2 msa/;

 if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") {

   add_proto qw/void vpx_highbd_lpf_vertical_16/, "uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd";