History

avfilter/af_acrossover: simplify coefficients

Paul B Mahol committed 5 years ago

Commit 4e3c4df1 parent cc747001 file · +40 −28Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/af_acrossover.c+40−28
@@ -39,8 +39,8 @@ · 38 unmodified lines
3939 #define MAX_BANDS MAX_SPLITS + 1
4040
4141 typedef struct BiquadContext {
42− double a0, a1, a2;
43− double b1, b2;
42+ double b0, b1, b2;
43+ double a1, a2;
4444 double z1, z2;
4545 } BiquadContext;
4646
@@ -146,30 +146,42 @@ static av_cold int init(AVFilterContext *ctx) · 99 unmodified lines
146146
147147 static void set_lp(BiquadContext *b, double fc, double q, double sr)
148148 {
149− double thetac = 2.0 * M_PI * fc / sr;
150− double d = 1.0 / q;
151− double beta = 0.5 * (1.0 - (d / 2.0) * sin(thetac)) / (1.0 + (d / 2.0) * sin(thetac));
152− double gamma = (0.5 + beta) * cos(thetac);
153−
154− b->a0 = (0.5 + beta - gamma) / 2.0;
155− b->a1 = 0.5 + beta - gamma;
156− b->a2 = b->a1 / 2.0;
157− b->b1 = 2.0 * gamma;
158− b->b2 = -2.0 * beta;
149+ double omega = M_PI * fc / sr;
150+ double cosine = cos(omega);
151+ double alpha = sin(omega) / (2. * q);
152+
153+ double b0 = (1. - cosine) / 2.;
154+ double b1 = 1. - cosine;
155+ double b2 = (1. - cosine) / 2.;
156+ double a0 = 1. + alpha;
157+ double a1 = -2. * cosine;
158+ double a2 = 1. - alpha;
159+
160+ b->b0 = b0 / a0;
161+ b->b1 = b1 / a0;
162+ b->b2 = b2 / a0;
163+ b->a1 = -a1 / a0;
164+ b->a2 = -a2 / a0;
159165 }
160166
161167 static void set_hp(BiquadContext *b, double fc, double q, double sr)
162168 {
163− double thetac = 2.0 * M_PI * fc / sr;
164− double d = 1.0 / q;
165− double beta = 0.5 * (1.0 - (d / 2.0) * sin(thetac)) / (1.0 + (d / 2.0) * sin(thetac));
166− double gamma = (0.5 + beta) * cos(thetac);
167−
168− b->a0 = (0.5 + beta + gamma) / 2.0;
169− b->a1 = -(0.5 + beta + gamma);
170− b->a2 = b->a0;
171− b->b1 = 2.0 * gamma;
172− b->b2 = -2.0 * beta;
169+ double omega = M_PI * fc / sr;
170+ double cosine = cos(omega);
171+ double alpha = sin(omega) / (2. * q);
172+
173+ double b0 = (1. + cosine) / 2.;
174+ double b1 = -1. - cosine;
175+ double b2 = (1. + cosine) / 2.;
176+ double a0 = 1. + alpha;
177+ double a1 = -2. * cosine;
178+ double a2 = 1. - alpha;
179+
180+ b->b0 = b0 / a0;
181+ b->b1 = b1 / a0;
182+ b->b2 = b2 / a0;
183+ b->a1 = -a1 / a0;
184+ b->a2 = -a2 / a0;
173185 }
174186
175187 static void calc_q_factors(int order, double *q)
@@ -250,11 +262,11 @@ static void biquad_process(BiquadContext *b, · 74 unmodified lines
250262 double *dst, const double *src,
251263 int nb_samples)
252264 {
253− const double a0 = b->a0;
254− const double a1 = b->a1;
255− const double a2 = b->a2;
265+ const double b0 = b->b0;
256266 const double b1 = b->b1;
257267 const double b2 = b->b2;
268+ const double a1 = b->a1;
269+ const double a2 = b->a2;
258270 double z1 = b->z1;
259271 double z2 = b->z2;
260272
@@ -262,9 +274,9 @@ static void biquad_process(BiquadContext *b, · 1 unmodified line
262274 const double in = src[n];
263275 double out;
264276
265− out = in * a0 + z1;
266− z1 = a1 * in + z2 + b1 * out;
267− z2 = a2 * in + b2 * out;
277+ out = in * b0 + z1;
278+ z1 = b1 * in + z2 + a1 * out;
279+ z2 = b2 * in + a2 * out;
268280 dst[n] = out;
269281 }
270282

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t