From 876cc19d49e241dfaa2eb794f2544e7ae70d9858 Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Sat, 9 Nov 2024 11:44:39 -0500 Subject: [PATCH] griffin: include all audio filters (#17177) --- Makefile.common | 7 +++++-- griffin/griffin.c | 5 ++++- libretro-common/audio/dsp_filter.c | 32 +++++++++++++++++++----------- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/Makefile.common b/Makefile.common index 8ba76cf6c7..c73350c8b6 100644 --- a/Makefile.common +++ b/Makefile.common @@ -2494,13 +2494,16 @@ ifeq ($(WANT_LIBFAT), 1) endif ifeq ($(HAVE_STATIC_AUDIO_FILTERS), 1) - OBJ += libretro-common/audio/dsp_filters/echo.o \ + OBJ += libretro-common/audio/dsp_filters/chorus.o \ + libretro-common/audio/dsp_filters/crystalizer.o \ + libretro-common/audio/dsp_filters/echo.o \ libretro-common/audio/dsp_filters/eq.o \ - libretro-common/audio/dsp_filters/chorus.o \ libretro-common/audio/dsp_filters/iir.o \ libretro-common/audio/dsp_filters/panning.o \ libretro-common/audio/dsp_filters/phaser.o \ libretro-common/audio/dsp_filters/reverb.o \ + libretro-common/audio/dsp_filters/tremolo.o \ + libretro-common/audio/dsp_filters/vibrato.o \ libretro-common/audio/dsp_filters/wahwah.o endif diff --git a/griffin/griffin.c b/griffin/griffin.c index f1a366c139..a8aafe2ad0 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -1006,13 +1006,16 @@ FILTERS #endif #ifdef HAVE_DSP_FILTER +#include "../libretro-common/audio/dsp_filters/chorus.c" +#include "../libretro-common/audio/dsp_filters/crystalizer.c" #include "../libretro-common/audio/dsp_filters/echo.c" #include "../libretro-common/audio/dsp_filters/eq.c" -#include "../libretro-common/audio/dsp_filters/chorus.c" #include "../libretro-common/audio/dsp_filters/iir.c" #include "../libretro-common/audio/dsp_filters/panning.c" #include "../libretro-common/audio/dsp_filters/phaser.c" #include "../libretro-common/audio/dsp_filters/reverb.c" +#include "../libretro-common/audio/dsp_filters/tremolo.c" +#include "../libretro-common/audio/dsp_filters/vibrato.c" #include "../libretro-common/audio/dsp_filters/wahwah.c" #endif #endif diff --git a/libretro-common/audio/dsp_filter.c b/libretro-common/audio/dsp_filter.c index 544a9fbe2a..3dd27807ee 100644 --- a/libretro-common/audio/dsp_filter.c +++ b/libretro-common/audio/dsp_filter.c @@ -134,22 +134,30 @@ static bool create_filter_graph(retro_dsp_filter_t *dsp, float sample_rate) } #if defined(HAVE_FILTERS_BUILTIN) -extern const struct dspfilter_implementation *panning_dspfilter_get_implementation(dspfilter_simd_mask_t mask); -extern const struct dspfilter_implementation *iir_dspfilter_get_implementation(dspfilter_simd_mask_t mask); -extern const struct dspfilter_implementation *echo_dspfilter_get_implementation(dspfilter_simd_mask_t mask); -extern const struct dspfilter_implementation *phaser_dspfilter_get_implementation(dspfilter_simd_mask_t mask); -extern const struct dspfilter_implementation *wahwah_dspfilter_get_implementation(dspfilter_simd_mask_t mask); -extern const struct dspfilter_implementation *eq_dspfilter_get_implementation(dspfilter_simd_mask_t mask); extern const struct dspfilter_implementation *chorus_dspfilter_get_implementation(dspfilter_simd_mask_t mask); +extern const struct dspfilter_implementation *delta_dspfilter_get_implementation(dspfilter_simd_mask_t mask); +extern const struct dspfilter_implementation *echo_dspfilter_get_implementation(dspfilter_simd_mask_t mask); +extern const struct dspfilter_implementation *eq_dspfilter_get_implementation(dspfilter_simd_mask_t mask); +extern const struct dspfilter_implementation *iir_dspfilter_get_implementation(dspfilter_simd_mask_t mask); +extern const struct dspfilter_implementation *panning_dspfilter_get_implementation(dspfilter_simd_mask_t mask); +extern const struct dspfilter_implementation *phaser_dspfilter_get_implementation(dspfilter_simd_mask_t mask); +extern const struct dspfilter_implementation *reverb_dspfilter_get_implementation(dspfilter_simd_mask_t mask); +extern const struct dspfilter_implementation *tremolo_dspfilter_get_implementation(dspfilter_simd_mask_t mask); +extern const struct dspfilter_implementation *vibrato_dspfilter_get_implementation(dspfilter_simd_mask_t mask); +extern const struct dspfilter_implementation *wahwah_dspfilter_get_implementation(dspfilter_simd_mask_t mask); static const dspfilter_get_implementation_t dsp_plugs_builtin[] = { - panning_dspfilter_get_implementation, - iir_dspfilter_get_implementation, - echo_dspfilter_get_implementation, - phaser_dspfilter_get_implementation, - wahwah_dspfilter_get_implementation, - eq_dspfilter_get_implementation, chorus_dspfilter_get_implementation, + delta_dspfilter_get_implementation, + echo_dspfilter_get_implementation, + eq_dspfilter_get_implementation, + iir_dspfilter_get_implementation, + panning_dspfilter_get_implementation, + phaser_dspfilter_get_implementation, + reverb_dspfilter_get_implementation, + tremolo_dspfilter_get_implementation, + vibrato_dspfilter_get_implementation, + wahwah_dspfilter_get_implementation, }; static bool append_plugs(retro_dsp_filter_t *dsp, struct string_list *list)