Unified · Split
| @@ -41,8 +41,7 @@ · 40 unmodified lines | |||
| 41 | typedef struct BiquadContext { | 41 | typedef struct BiquadContext { |
| 42 | double a0, a1, a2; | 42 | double a0, a1, a2; |
| 43 | double b1, b2; | 43 | double b1, b2; |
| 44 | double i1, i2; | 44 | double z1, z2; |
| 45 | double o1, o2; | ||
| 46 | } BiquadContext; | 45 | } BiquadContext; |
| 47 | 46 | ||
| 48 | typedef struct CrossoverChannel { | 47 | typedef struct CrossoverChannel { |
| @@ -150,8 +149,8 @@ static void set_lp(BiquadContext *b, double fc, double q, double sr) · 101 unmodified lines | |||
| 150 | b->a0 = (0.5 + beta - gamma) / 2.0; | 149 | b->a0 = (0.5 + beta - gamma) / 2.0; |
| 151 | b->a1 = 0.5 + beta - gamma; | 150 | b->a1 = 0.5 + beta - gamma; |
| 152 | b->a2 = b->a1 / 2.0; | 151 | b->a2 = b->a1 / 2.0; |
| 153 | b->b1 = -2.0 * gamma; | 152 | b->b1 = 2.0 * gamma; |
| 154 | b->b2 = 2.0 * beta; | 153 | b->b2 = -2.0 * beta; |
| 155 | } | 154 | } |
| 156 | 155 | ||
| 157 | static void set_hp(BiquadContext *b, double fc, double q, double sr) | 156 | 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 | |||
| 164 | b->a0 = (0.5 + beta + gamma) / 2.0; | 163 | b->a0 = (0.5 + beta + gamma) / 2.0; |
| 165 | b->a1 = -(0.5 + beta + gamma); | 164 | b->a1 = -(0.5 + beta + gamma); |
| 166 | b->a2 = b->a0; | 165 | b->a2 = b->a0; |
| 167 | b->b1 = -2.0 * gamma; | 166 | b->b1 = 2.0 * gamma; |
| 168 | b->b2 = 2.0 * beta; | 167 | b->b2 = -2.0 * beta; |
| 169 | } | 168 | } |
| 170 | 169 | ||
| 171 | static void calc_q_factors(int order, double *q) | 170 | static void calc_q_factors(int order, double *q) |
| @@ -246,26 +245,21 @@ static void biquad_process(BiquadContext *b, · 74 unmodified lines | |||
| 246 | const double a2 = b->a2; | 245 | const double a2 = b->a2; |
| 247 | const double b1 = b->b1; | 246 | const double b1 = b->b1; |
| 248 | const double b2 = b->b2; | 247 | const double b2 = b->b2; |
| 249 | double i1 = b->i1; | 248 | double z1 = b->z1; |
| 250 | double i2 = b->i2; | 249 | double z2 = b->z2; |
| 251 | double o1 = b->o1; | ||
| 252 | double o2 = b->o2; | ||
| 253 | 250 | ||
| 254 | for (int n = 0; n < nb_samples; n++) { | 251 | for (int n = 0; n < nb_samples; n++) { |
| 255 | const double in = src[n]; | 252 | const double in = src[n]; |
| 256 | double out; | 253 | double out; |
| 257 | 254 | ||
| 258 | out = in * a0 + i1 * a1 + i2 * a2 - o1 * b1 - o2 * b2; | 255 | out = in * a0 + z1; |
| 259 | i2 = i1; | 256 | z1 = a1 * in + z2 + b1 * out; |
| 260 | o2 = o1; | 257 | z2 = a2 * in + b2 * out; |
| 261 | i1 = in; | 258 | dst[n] = out; |
| 262 | o1 = dst[n] = out; | ||
| 263 | } | 259 | } |
| 264 | 260 | ||
| 265 | b->i1 = i1; | 261 | b->z1 = z1; |
| 266 | b->i2 = i2; | 262 | b->z2 = z2; |
| 267 | b->o1 = o1; | ||
| 268 | b->o2 = o2; | ||
| 269 | } | 263 | } |
| 270 | 264 | ||
| 271 | static int filter_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) | 265 | static int filter_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) |