History

avfilter/af_aiir: add missing normalization of biquads gains

Paul B Mahol committed 6 years ago

Commit eecc45c1 parent 2f5fb9e1 file · +19 −6Browse files

Unified · Split

libavfilter/af_aiir.c+19−6
@@ -499,6 +499,7 @@ static int decompose_zp2biquads(AVFilterContext *ctx, int channels) · 498 unmodified lines
499499 double a[6] = { 0 };
500500 double min_distance = DBL_MAX;
501501 double max_mag = 0;
502+ double factor;
502503 int i;
503504
504505 for (i = 0; i < iir->nb_ab[0]; i++) {
@@ -593,12 +594,24 @@ static int decompose_zp2biquads(AVFilterContext *ctx, int channels) · 88 unmodified lines
593594 iir->ab[1][2 * nearest_zero.a] = iir->ab[1][2 * nearest_zero.a + 1] = NAN;
594595 iir->ab[1][2 * nearest_zero.b] = iir->ab[1][2 * nearest_zero.b + 1] = NAN;
595596
596− iir->biquads[current_biquad].a[0] = 1.0;
597− iir->biquads[current_biquad].a[1] = a[2] / a[4];
598− iir->biquads[current_biquad].a[2] = a[0] / a[4];
599− iir->biquads[current_biquad].b[0] = (b[4] / a[4]) * (current_biquad ? 1.0 : iir->g);
600− iir->biquads[current_biquad].b[1] = (b[2] / a[4]) * (current_biquad ? 1.0 : iir->g);
601− iir->biquads[current_biquad].b[2] = (b[0] / a[4]) * (current_biquad ? 1.0 : iir->g);
597+ iir->biquads[current_biquad].a[0] = a[4];
598+ iir->biquads[current_biquad].a[1] = a[2];
599+ iir->biquads[current_biquad].a[2] = a[0];
600+ iir->biquads[current_biquad].b[0] = b[4];
601+ iir->biquads[current_biquad].b[1] = b[2];
602+ iir->biquads[current_biquad].b[2] = b[0];
603+
604+ factor = (iir->biquads[current_biquad].a[0] +
605+ iir->biquads[current_biquad].a[1] +
606+ iir->biquads[current_biquad].a[2]) / 4;
607+
608+ iir->biquads[current_biquad].b[0] *= factor;
609+ iir->biquads[current_biquad].b[1] *= factor;
610+ iir->biquads[current_biquad].b[2] *= factor;
611+
612+ iir->biquads[current_biquad].b[0] *= (current_biquad ? 1.0 : iir->g);
613+ iir->biquads[current_biquad].b[1] *= (current_biquad ? 1.0 : iir->g);
614+ iir->biquads[current_biquad].b[2] *= (current_biquad ? 1.0 : iir->g);
602615
603616 av_log(ctx, AV_LOG_VERBOSE, "a=%f %f %f:b=%f %f %f\n",
604617 iir->biquads[current_biquad].a[0],

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