History

avfilter/af_acrossover: use transposed direct II form

Paul B Mahol committed 5 years ago

Commit bc529ea1 parent 810e2131 file · +13 −19Browse files

Unified · Split

libavfilter/af_acrossover.c+13−19
@@ -41,8 +41,7 @@ · 40 unmodified lines
4141 typedef struct BiquadContext {
4242 double a0, a1, a2;
4343 double b1, b2;
44− double i1, i2;
45− double o1, o2;
44+ double z1, z2;
4645 } BiquadContext;
4746
4847 typedef struct CrossoverChannel {
@@ -150,8 +149,8 @@ static void set_lp(BiquadContext *b, double fc, double q, double sr) · 101 unmodified lines
150149 b->a0 = (0.5 + beta - gamma) / 2.0;
151150 b->a1 = 0.5 + beta - gamma;
152151 b->a2 = b->a1 / 2.0;
153− b->b1 = -2.0 * gamma;
154− b->b2 = 2.0 * beta;
152+ b->b1 = 2.0 * gamma;
153+ b->b2 = -2.0 * beta;
155154 }
156155
157156 static void set_hp(BiquadContext *b, double fc, double q, double sr)
@@ -164,8 +163,8 @@ static void set_hp(BiquadContext *b, double fc, double q, double sr) · 6 unmodified lines
164163 b->a0 = (0.5 + beta + gamma) / 2.0;
165164 b->a1 = -(0.5 + beta + gamma);
166165 b->a2 = b->a0;
167− b->b1 = -2.0 * gamma;
168− b->b2 = 2.0 * beta;
166+ b->b1 = 2.0 * gamma;
167+ b->b2 = -2.0 * beta;
169168 }
170169
171170 static void calc_q_factors(int order, double *q)
@@ -246,26 +245,21 @@ static void biquad_process(BiquadContext *b, · 74 unmodified lines
246245 const double a2 = b->a2;
247246 const double b1 = b->b1;
248247 const double b2 = b->b2;
249− double i1 = b->i1;
250− double i2 = b->i2;
251− double o1 = b->o1;
252− double o2 = b->o2;
248+ double z1 = b->z1;
249+ double z2 = b->z2;
253250
254251 for (int n = 0; n < nb_samples; n++) {
255252 const double in = src[n];
256253 double out;
257254
258− out = in * a0 + i1 * a1 + i2 * a2 - o1 * b1 - o2 * b2;
259− i2 = i1;
260− o2 = o1;
261− i1 = in;
262− o1 = dst[n] = out;
255+ out = in * a0 + z1;
256+ z1 = a1 * in + z2 + b1 * out;
257+ z2 = a2 * in + b2 * out;
258+ dst[n] = out;
263259 }
264260
265− b->i1 = i1;
266− b->i2 = i2;
267− b->o1 = o1;
268− b->o2 = o2;
261+ b->z1 = z1;
262+ b->z2 = z2;
269263 }
270264
271265 static int filter_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)

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