mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(libretro-common) Backport reverb.c changes

Browse Source
This commit is contained in:
libretroadmin 2023-02-20 14:40:10 +01:00
parent a6bb8679c9
commit 22cdfaf95a
1 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
libretro-common/audio/dsp_filters/reverb.c
View File

@ -50,7 +50,6 @@ static INLINE float comb_process(struct comb *c, float input)
{ {
float output = c->buffer[c->bufidx]; float output = c->buffer[c->bufidx];
c->filterstore = (output * c->damp2) + (c->filterstore * c->damp1); c->filterstore = (output * c->damp2) + (c->filterstore * c->damp1);
c->buffer[c->bufidx] = input + (c->filterstore * c->feedback); c->buffer[c->bufidx] = input + (c->filterstore * c->feedback);
c->bufidx++; c->bufidx++;
@ -73,30 +72,31 @@ static INLINE float allpass_process(struct allpass *a, float input)
return output; return output;
} }
#define numcombs 8 #define NUMCOMBS 8
#define numallpasses 4 #define NUMALLPASSES 4
static const float muted = 0;
static const float muted = 0.0f;
static const float fixedgain = 0.015f; static const float fixedgain = 0.015f;
static const float scalewet = 3; static const float scalewet = 3.0f;
static const float scaledry = 2; static const float scaledry = 2.0f;
static const float scaledamp = 0.4f; static const float scaledamp = 0.4f;
static const float scaleroom = 0.28f; static const float scaleroom = 0.28f;
static const float offsetroom = 0.7f; static const float offsetroom = 0.7f;
static const float initialroom = 0.5f; static const float initialroom = 0.5f;
static const float initialdamp = 0.5f; static const float initialdamp = 0.5f;
static const float initialwet = 1.0f / 3.0f; static const float initialwet = 1.0f / 3.0f;
static const float initialdry = 0; static const float initialdry = 0.0f;
static const float initialwidth = 1; static const float initialwidth = 1.0f;
static const float initialmode = 0; static const float initialmode = 0.0f;
static const float freezemode = 0.5f; static const float freezemode = 0.5f;
struct revmodel struct revmodel
{ {
struct comb combL[numcombs]; struct comb combL[NUMCOMBS];
struct allpass allpassL[numallpasses]; struct allpass allpassL[NUMALLPASSES];
float *bufcomb[numcombs]; float *bufcomb[NUMCOMBS];
float *bufallpass[numallpasses]; float *bufallpass[NUMALLPASSES];
float gain; float gain;
float roomsize, roomsize1; float roomsize, roomsize1;
@ -114,10 +114,10 @@ static float revmodel_process(struct revmodel *rev, float in)
float mono_in = in; float mono_in = in;
float input = mono_in * rev->gain; float input = mono_in * rev->gain;
for (i = 0; i < numcombs; i++) for (i = 0; i < NUMCOMBS; i++)
mono_out += comb_process(&rev->combL[i], input); mono_out += comb_process(&rev->combL[i], input);
for (i = 0; i < numallpasses; i++) for (i = 0; i < NUMALLPASSES; i++)
mono_out = allpass_process(&rev->allpassL[i], mono_out); mono_out = allpass_process(&rev->allpassL[i], mono_out);
return mono_in * rev->dry + mono_out * rev->wet1; return mono_in * rev->dry + mono_out * rev->wet1;
@ -141,7 +141,7 @@ static void revmodel_update(struct revmodel *rev)
rev->gain = fixedgain; rev->gain = fixedgain;
} }
for (i = 0; i < numcombs; i++) for (i = 0; i < NUMCOMBS; i++)
{ {
rev->combL[i].feedback = rev->roomsize1; rev->combL[i].feedback = rev->roomsize1;
rev->combL[i].damp1 = rev->damp1; rev->combL[i].damp1 = rev->damp1;
@ -185,28 +185,28 @@ static void revmodel_setmode(struct revmodel *rev, float value)
revmodel_update(rev); revmodel_update(rev);
} }
static void revmodel_init(struct revmodel *rev,int srate) static void revmodel_init(struct revmodel *rev,int srate,bool right)
{ {
static const int comb_lengths[8] = { 1116,1188,1277,1356,1422,1491,1557,1617 };
static const int allpass_lengths[4] = { 225,341,441,556 };
double r = srate * (1 / 44100.0);
unsigned c; unsigned c;
static const int comb_lengths[8] = { 1116, 1188, 1277, 1356, 1422, 1491, 1557, 1617 };
static const int allpass_lengths[4] = { 225, 341, 441, 556 };
double r = srate * (1 / 44100.0);
int stereosep = right ? 23 : 0;
for (c = 0; c < numcombs; ++c) for (c = 0; c < NUMCOMBS; ++c)
{ {
rev->bufcomb[c] = malloc(r*comb_lengths[c]*sizeof(float)); rev->bufcomb[c] = malloc(r*comb_lengths[c]+stereosep*sizeof(float));
rev->combL[c].buffer = rev->bufcomb[c]; rev->combL[c].buffer = rev->bufcomb[c];
memset(rev->combL[c].buffer,0,r*comb_lengths[c]*sizeof(float)); memset(rev->combL[c].buffer,0,r*comb_lengths[c]+stereosep*sizeof(float));
rev->combL[c].bufsize=r*comb_lengths[c]; rev->combL[c].bufsize=r*comb_lengths[c]+stereosep;
} }
for (c = 0; c < numallpasses; ++c) for (c = 0; c < NUMALLPASSES; ++c)
{ {
rev->bufallpass[c] = malloc(r*allpass_lengths[c]*sizeof(float)); rev->bufallpass[c] = malloc(r*allpass_lengths[c]+stereosep*sizeof(float));
rev->allpassL[c].buffer = rev->bufallpass[c]; rev->allpassL[c].buffer = rev->bufallpass[c];
memset(rev->allpassL[c].buffer,0,r*allpass_lengths[c]*sizeof(float)); memset(rev->allpassL[c].buffer,0,r*allpass_lengths[c]+stereosep*sizeof(float));
rev->allpassL[c].bufsize=r*allpass_lengths[c]; rev->allpassL[c].bufsize=r*allpass_lengths[c]+stereosep;
rev->allpassL[c].feedback = 0.5f; rev->allpassL[c].feedback = 0.5f;
} }
@ -228,12 +228,14 @@ static void reverb_free(void *data)
struct reverb_data *rev = (struct reverb_data*)data; struct reverb_data *rev = (struct reverb_data*)data;
unsigned i; unsigned i;
for (i = 0; i < numcombs; i++) { for (i = 0; i < NUMCOMBS; i++)
{
free(rev->left.bufcomb[i]); free(rev->left.bufcomb[i]);
free(rev->right.bufcomb[i]); free(rev->right.bufcomb[i]);
} }
for (i = 0; i < numallpasses; i++) { for (i = 0; i < NUMALLPASSES; i++)
{
free(rev->left.bufallpass[i]); free(rev->left.bufallpass[i]);
free(rev->right.bufallpass[i]); free(rev->right.bufallpass[i]);
} }
@ -254,7 +256,6 @@ static void reverb_process(void *data, struct dspfilter_output *output,
for (i = 0; i < input->frames; i++, out += 2) for (i = 0; i < input->frames; i++, out += 2)
{ {
float in[2] = { out[0], out[1] }; float in[2] = { out[0], out[1] };
out[0] = revmodel_process(&rev->left, in[0]); out[0] = revmodel_process(&rev->left, in[0]);
out[1] = revmodel_process(&rev->right, in[1]); out[1] = revmodel_process(&rev->right, in[1]);
} }
@ -275,8 +276,8 @@ static void *reverb_init(const struct dspfilter_info *info,
config->get_float(userdata, "roomwidth", &roomwidth, 0.56f); config->get_float(userdata, "roomwidth", &roomwidth, 0.56f);
config->get_float(userdata, "roomsize", &roomsize, 0.56f); config->get_float(userdata, "roomsize", &roomsize, 0.56f);
revmodel_init(&rev->left,info->input_rate); revmodel_init(&rev->left,info->input_rate,false);
revmodel_init(&rev->right,info->input_rate); revmodel_init(&rev->right,info->input_rate,true);
revmodel_setdamp(&rev->left, damping); revmodel_setdamp(&rev->left, damping);
revmodel_setdry(&rev->left, drytime); revmodel_setdry(&rev->left, drytime);
@ -309,7 +310,6 @@ static const struct dspfilter_implementation reverb_plug = {
const struct dspfilter_implementation *dspfilter_get_implementation(dspfilter_simd_mask_t mask) const struct dspfilter_implementation *dspfilter_get_implementation(dspfilter_simd_mask_t mask)
{ {
(void)mask;
return &reverb_plug; return &reverb_plug;
} }