Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -39,8 +39,8 @@ · 38 unmodified lines | |||
| 39 | #define MAX_BANDS MAX_SPLITS + 1 | 39 | #define MAX_BANDS MAX_SPLITS + 1 |
| 40 | 40 | ||
| 41 | typedef struct BiquadContext { | 41 | typedef struct BiquadContext { |
| 42 | double a0, a1, a2; | 42 | double b0, b1, b2; |
| 43 | double b1, b2; | 43 | double a1, a2; |
| 44 | double z1, z2; | 44 | double z1, z2; |
| 45 | } BiquadContext; | 45 | } BiquadContext; |
| 46 | 46 | ||
| @@ -146,30 +146,42 @@ static av_cold int init(AVFilterContext *ctx) · 99 unmodified lines | |||
| 146 | 146 | ||
| 147 | static void set_lp(BiquadContext *b, double fc, double q, double sr) | 147 | static void set_lp(BiquadContext *b, double fc, double q, double sr) |
| 148 | { | 148 | { |
| 149 | double thetac = 2.0 * M_PI * fc / sr; | 149 | double omega = M_PI * fc / sr; |
| 150 | double d = 1.0 / q; | 150 | double cosine = cos(omega); |
| 151 | double beta = 0.5 * (1.0 - (d / 2.0) * sin(thetac)) / (1.0 + (d / 2.0) * sin(thetac)); | 151 | double alpha = sin(omega) / (2. * q); |
| 152 | double gamma = (0.5 + beta) * cos(thetac); | 152 | |
| 153 | 153 | double b0 = (1. - cosine) / 2.; | |
| 154 | b->a0 = (0.5 + beta - gamma) / 2.0; | 154 | double b1 = 1. - cosine; |
| 155 | b->a1 = 0.5 + beta - gamma; | 155 | double b2 = (1. - cosine) / 2.; |
| 156 | b->a2 = b->a1 / 2.0; | 156 | double a0 = 1. + alpha; |
| 157 | b->b1 = 2.0 * gamma; | 157 | double a1 = -2. * cosine; |
| 158 | b->b2 = -2.0 * beta; | 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; | ||
| 159 | } | 165 | } |
| 160 | 166 | ||
| 161 | static void set_hp(BiquadContext *b, double fc, double q, double sr) | 167 | static void set_hp(BiquadContext *b, double fc, double q, double sr) |
| 162 | { | 168 | { |
| 163 | double thetac = 2.0 * M_PI * fc / sr; | 169 | double omega = M_PI * fc / sr; |
| 164 | double d = 1.0 / q; | 170 | double cosine = cos(omega); |
| 165 | double beta = 0.5 * (1.0 - (d / 2.0) * sin(thetac)) / (1.0 + (d / 2.0) * sin(thetac)); | 171 | double alpha = sin(omega) / (2. * q); |
| 166 | double gamma = (0.5 + beta) * cos(thetac); | 172 | |
| 167 | 173 | double b0 = (1. + cosine) / 2.; | |
| 168 | b->a0 = (0.5 + beta + gamma) / 2.0; | 174 | double b1 = -1. - cosine; |
| 169 | b->a1 = -(0.5 + beta + gamma); | 175 | double b2 = (1. + cosine) / 2.; |
| 170 | b->a2 = b->a0; | 176 | double a0 = 1. + alpha; |
| 171 | b->b1 = 2.0 * gamma; | 177 | double a1 = -2. * cosine; |
| 172 | b->b2 = -2.0 * beta; | 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; | ||
| 173 | } | 185 | } |
| 174 | 186 | ||
| 175 | static void calc_q_factors(int order, double *q) | 187 | static void calc_q_factors(int order, double *q) |
| @@ -250,11 +262,11 @@ static void biquad_process(BiquadContext *b, · 74 unmodified lines | |||
| 250 | double *dst, const double *src, | 262 | double *dst, const double *src, |
| 251 | int nb_samples) | 263 | int nb_samples) |
| 252 | { | 264 | { |
| 253 | const double a0 = b->a0; | 265 | const double b0 = b->b0; |
| 254 | const double a1 = b->a1; | ||
| 255 | const double a2 = b->a2; | ||
| 256 | const double b1 = b->b1; | 266 | const double b1 = b->b1; |
| 257 | const double b2 = b->b2; | 267 | const double b2 = b->b2; |
| 268 | const double a1 = b->a1; | ||
| 269 | const double a2 = b->a2; | ||
| 258 | double z1 = b->z1; | 270 | double z1 = b->z1; |
| 259 | double z2 = b->z2; | 271 | double z2 = b->z2; |
| 260 | 272 | ||
| @@ -262,9 +274,9 @@ static void biquad_process(BiquadContext *b, · 1 unmodified line | |||
| 262 | const double in = src[n]; | 274 | const double in = src[n]; |
| 263 | double out; | 275 | double out; |
| 264 | 276 | ||
| 265 | out = in * a0 + z1; | 277 | out = in * b0 + z1; |
| 266 | z1 = a1 * in + z2 + b1 * out; | 278 | z1 = b1 * in + z2 + a1 * out; |
| 267 | z2 = a2 * in + b2 * out; | 279 | z2 = b2 * in + a2 * out; |
| 268 | dst[n] = out; | 280 | dst[n] = out; |
| 269 | } | 281 | } |
| 270 | 282 | ||