zdoom
/
fluidsynth
mirror of https://github.com/ZDoom/fluidsynth.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup fluid_synth_process() 

remove code duplications
This commit is contained in:
derselbst 2018-07-15 19:52:48 +02:00
parent af1fc75717
commit 2185194d43
1 changed files with 38 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/synth/fluid_synth.c
View File

@ -3477,6 +3477,33 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
return FLUID_OK; return FLUID_OK;
} }
/**
* mixes the samples of \p in to \p out
*
* @param out the output sample buffer to mix to
* @param ooff sample offset in \p out
* @param in the rvoice_mixer input sample buffer to mix from
* @param ioff sample offset in \p in
* @param buf_idx the sample buffer index of \p in to mix from
* @param num number of samples to mix
*/
static FLUID_INLINE void fluid_synth_mix_single_buffer(float *FLUID_RESTRICT out,
int ooff,
const fluid_real_t *FLUID_RESTRICT in,
int ioff,
int buf_idx,
int num)
{
if(out != NULL)
{
int j;
for(j = 0; j < num; j++)
{
out[j + ooff] += (float) in[buf_idx * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j + ioff];
}
}
}
/** /**
* @brief Synthesize floating point audio to stereo audio channels (implements the default interface #fluid_audio_func_t). * @brief Synthesize floating point audio to stereo audio channels (implements the default interface #fluid_audio_func_t).
* *
@ -3601,26 +3628,11 @@ fluid_synth_process(fluid_synth_t *synth, int len, int nfx, float *fx[],
{ {
for(i = 0; i < naudchan; i++) for(i = 0; i < naudchan; i++)
{ {
int j;
float *out_buf = out[(i * 2) % nout]; float *out_buf = out[(i * 2) % nout];
fluid_synth_mix_single_buffer(out_buf, 0, left_in, synth->cur, i, num);
if(out_buf != NULL)
{
for(j = 0; j < num; j++)
{
out_buf[j] += (float) left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j + synth->cur];
}
}
out_buf = out[(i * 2 + 1) % nout]; out_buf = out[(i * 2 + 1) % nout];
fluid_synth_mix_single_buffer(out_buf, 0, right_in, synth->cur, i, num);
if(out_buf != NULL)
{
for(j = 0; j < num; j++)
{
out_buf[j] += (float) right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j + synth->cur];
}
}
} }
} }
@ -3632,27 +3644,13 @@ fluid_synth_process(fluid_synth_t *synth, int len, int nfx, float *fx[],
// write out all effects (i.e. reverb and chorus) // write out all effects (i.e. reverb and chorus)
for(i = 0; i < nfxchan; i++) for(i = 0; i < nfxchan; i++)
{ {
int j;
int buf_idx = f * nfxchan + i; int buf_idx = f * nfxchan + i;
float *out_buf = fx[(buf_idx * 2) % nfx]; float *out_buf = fx[(buf_idx * 2) % nfx];
fluid_synth_mix_single_buffer(out_buf, 0, fx_left_in, synth->cur, buf_idx, num);
if(out_buf != NULL)
{
for(j = 0; j < num; j++)
{
out_buf[j] += (float) fx_left_in[buf_idx * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j + synth->cur];
}
}
out_buf = fx[(buf_idx * 2 + 1) % nfx]; out_buf = fx[(buf_idx * 2 + 1) % nfx];
fluid_synth_mix_single_buffer(out_buf, 0, fx_right_in, synth->cur, buf_idx, num);
if(out_buf != NULL)
{
for(j = 0; j < num; j++)
{
out_buf[j] += (float) fx_right_in[buf_idx * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j + synth->cur];
}
}
} }
} }
} }
@ -3673,26 +3671,11 @@ fluid_synth_process(fluid_synth_t *synth, int len, int nfx, float *fx[],
{ {
for(i = 0; i < naudchan; i++) for(i = 0; i < naudchan; i++)
{ {
int j;
float *out_buf = out[(i * 2) % nout]; float *out_buf = out[(i * 2) % nout];
fluid_synth_mix_single_buffer(out_buf, count, left_in, 0, i, num);
if(out_buf != NULL)
{
for(j = 0; j < num; j++)
{
out_buf[j + count] += (float) left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j];
}
}
out_buf = out[(i * 2 + 1) % nout]; out_buf = out[(i * 2 + 1) % nout];
fluid_synth_mix_single_buffer(out_buf, count, right_in, 0, i, num);
if(out_buf != NULL)
{
for(j = 0; j < num; j++)
{
out_buf[j + count] += (float) right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j];
}
}
} }
} }
@ -3704,27 +3687,13 @@ fluid_synth_process(fluid_synth_t *synth, int len, int nfx, float *fx[],
// write out all effects (i.e. reverb and chorus) // write out all effects (i.e. reverb and chorus)
for(i = 0; i < nfxchan; i++) for(i = 0; i < nfxchan; i++)
{ {
int j;
int buf_idx = f * nfxchan + i; int buf_idx = f * nfxchan + i;
float *out_buf = fx[(buf_idx * 2) % nfx]; float *out_buf = fx[(buf_idx * 2) % nfx];
fluid_synth_mix_single_buffer(out_buf, count, fx_left_in, 0, buf_idx, num);
if(out_buf != NULL)
{
for(j = 0; j < num; j++)
{
out_buf[j + count] += (float) fx_left_in[buf_idx * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j];
}
}
out_buf = fx[(buf_idx * 2 + 1) % nfx]; out_buf = fx[(buf_idx * 2 + 1) % nfx];
fluid_synth_mix_single_buffer(out_buf, count, fx_right_in, 0, buf_idx, num);
if(out_buf != NULL)
{
for(j = 0; j < num; j++)
{
out_buf[j + count] += (float) fx_right_in[buf_idx * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j];
}
}
} }
} }
} }