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

remove bq_t type, use double instead

Browse source
This commit is contained in:
Connor Olding 2014-02-05 23:32:24 -08:00
parent 0a5c150ca6
commit 153331f5f7
4 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crap_eq.h
View file

@ -1,7 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#define BIQUAD_DOUBLE
#include "crap_util.h" #include "crap_util.h"
#include "param.h" #include "param.h"
@ -19,8 +18,8 @@ typedef struct {
float fs; float fs;
} personal; } personal;
static bq_t static double
process_one(biquad *filters, bq_t samp) process_one(biquad *filters, double samp)
{ {
for (int i = 0; i < BANDS; i++) for (int i = 0; i < BANDS; i++)
samp = biquad_run(&filters[i], samp); samp = biquad_run(&filters[i], samp);

5
crap_eq_const.h
View file

@ -1,6 +1,5 @@
#include <string.h> #include <string.h>
#define BIQUAD_DOUBLE
#include "crap_util.h" #include "crap_util.h"
#define ID 0x0DEFACED #define ID 0x0DEFACED
@ -15,8 +14,8 @@ typedef struct {
biquad filters[2][BANDS]; biquad filters[2][BANDS];
} personal; } personal;
static bq_t static double
process_one(biquad *filters, bq_t samp) process_one(biquad *filters, double samp)
{ {
for (int i = 0; i < BANDS; i++) for (int i = 0; i < BANDS; i++)
samp = biquad_run(&filters[i], samp); samp = biquad_run(&filters[i], samp);

14
crap_util.h
View file

@ -7,16 +7,8 @@
#define ANGULAR(fc, fs) (2 * M_PI / (fs) * (fc)) #define ANGULAR(fc, fs) (2 * M_PI / (fs) * (fc))
#define ANGULAR_LIM(fc, fs) (2 * M_PI / (fs) * LIMIT((fc), 1, (fs)/2)) #define ANGULAR_LIM(fc, fs) (2 * M_PI / (fs) * LIMIT((fc), 1, (fs)/2))
/* this is pretty gross;
* it's too easy to define BIQUAD_DOUBLE in one file and not another */
#ifdef BIQUAD_DOUBLE
typedef double bq_t;
#else
typedef float bq_t;
#endif
typedef struct { typedef struct {
bq_t a1, a2, b0, b1, b2, x1, x2, y1, y2; double a1, a2, b0, b1, b2, x1, x2, y1, y2;
} biquad; } biquad;
typedef struct { typedef struct {
@ -51,7 +43,7 @@ design(double cw, double sw,
double num0, double num1, double num2, double num0, double num1, double num2,
double den0, double den1, double den2); double den0, double den1, double den2);
static bq_t static double
biquad_run(biquad *bq, bq_t x); biquad_run(biquad *bq, double x);
#include "crap_util_def.h" #include "crap_util_def.h"

6
crap_util_def.h
View file

@ -76,9 +76,9 @@ biquad_gen(filter_t type, double fc, double gain, double bw, double fs) {
return out; return out;
} }
static bq_t static double
biquad_run(biquad *bq, bq_t x) { biquad_run(biquad *bq, double x) {
bq_t y; double y;
y = bq->b0*x + bq->b1*bq->x1 + bq->b2*bq->x2 y = bq->b0*x + bq->b1*bq->x1 + bq->b2*bq->x2
+ bq->a1*bq->y1 + bq->a2*bq->y2; + bq->a1*bq->y1 + bq->a2*bq->y2;