notwa/crap
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bump eq; factor out process funcs

Browse source
This commit is contained in:
Connor Olding 2015-04-06 17:35:57 -07:00
parent 4022d11349
commit 8e7dde59f6
3 changed files with 58 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
crap/eq.h
View file

@ -1,9 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "util.h"
#include "param.h"
#define BANDS 4 #define BANDS 4
#define ID 0x000CAFED #define ID 0x000CAFED
@ -13,44 +10,29 @@
#define COPYRIGHT "MIT" #define COPYRIGHT "MIT"
#define PARAMETERS (BANDS*3) #define PARAMETERS (BANDS*3)
#define BLOCK_SIZE 256
#include "util.h"
#include "param.h"
typedef struct { typedef struct {
biquad filters[2][BANDS]; biquad filters[2][BANDS];
float fs; float fs;
} personal; } personal;
INNER double static void
process_one(biquad *filters, double samp)
{
for (int i = 0; i < BANDS; i++)
samp = biquad_run(&filters[i], samp);
return samp;
}
INNER void
process(personal *data,
float *in_L, float *in_R,
float *out_L, float *out_R,
unsigned long count)
{
disable_denormals();
for (unsigned long pos = 0; pos < count; pos++) {
out_L[pos] = process_one(data->filters[0], in_L[pos]);
out_R[pos] = process_one(data->filters[1], in_R[pos]);
}
}
INNER void
process_double(personal *data, process_double(personal *data,
double *in_L, double *in_R, double *in_L, double *in_R,
double *out_L, double *out_R, double *out_L, double *out_R,
unsigned long count) unsigned long count)
{ #include "process_biquads.h"
disable_denormals();
for (unsigned long pos = 0; pos < count; pos++) { static void
out_L[pos] = process_one(data->filters[0], in_L[pos]); process(personal *data,
out_R[pos] = process_one(data->filters[1], in_R[pos]); float *in_L, float *in_R,
} float *out_L, float *out_R,
} ulong count)
#include "process_biquads.h"
INNER void INNER void
resume(personal *data) resume(personal *data)

46
crap/eq_const.h
View file

@ -20,45 +20,15 @@ static void
process_double(personal *data, process_double(personal *data,
double *in_L, double *in_R, double *in_L, double *in_R,
double *out_L, double *out_R, double *out_L, double *out_R,
unsigned long count)
#include "process_biquads.h"
static void
process(personal *data,
float *in_L, float *in_R,
float *out_L, float *out_R,
ulong count) ulong count)
{ #include "process_biquads.h"
disable_denormals();
v2df buf[BLOCK_SIZE];
biquad *f0, *f1;
for (ulong pos = 0; pos < count; pos += BLOCK_SIZE) {
ulong rem = BLOCK_SIZE;
if (pos + BLOCK_SIZE > count)
rem = count - pos;
for (ulong i = 0; i < rem; i++) {
buf[i][0] = in_L[i];
buf[i][1] = in_R[i];
}
f0 = data->filters[0];
f1 = data->filters[1];
for (ulong i = 0; i < BANDS; i++) {
biquad_run_block_stereo(f0, f1, buf, rem);
f0++;
f1++;
}
for (ulong i = 0; i < rem; i++) {
out_L[i] = buf[i][0];
out_R[i] = buf[i][1];
}
in_L += BLOCK_SIZE;
in_R += BLOCK_SIZE;
out_L += BLOCK_SIZE;
out_R += BLOCK_SIZE;
}
}
#include "process.h"
INNER void INNER void
construct(personal *data) construct(personal *data)

36
include/process_biquads.h Normal file
View file

@ -0,0 +1,36 @@
{
disable_denormals();
v2df buf[BLOCK_SIZE];
biquad *f0, *f1;
for (ulong pos = 0; pos < count; pos += BLOCK_SIZE) {
ulong rem = BLOCK_SIZE;
if (pos + BLOCK_SIZE > count)
rem = count - pos;
for (ulong i = 0; i < rem; i++) {
buf[i][0] = in_L[i];
buf[i][1] = in_R[i];
}
f0 = data->filters[0];
f1 = data->filters[1];
for (ulong i = 0; i < BANDS; i++) {
biquad_run_block_stereo(f0, f1, buf, rem);
f0++;
f1++;
}
for (ulong i = 0; i < rem; i++) {
out_L[i] = buf[i][0];
out_R[i] = buf[i][1];
}
in_L += BLOCK_SIZE;
in_R += BLOCK_SIZE;
out_L += BLOCK_SIZE;
out_R += BLOCK_SIZE;
}
}