X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faf_aiir.c;h=717388f45050d56a77bfc4b41fb296ca59baf841;hb=d5e3d8e2f7a5a576e27789a50c29717b648bc488;hp=20dea98cbbd758e6536286d9552b0e5b73c770f9;hpb=c6892f59eb0e9f2a9ec1f55b21a5841a60540e1f;p=ffmpeg diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index 20dea98cbbd..717388f4505 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -38,8 +38,8 @@ typedef struct Pair { } Pair; typedef struct BiquadContext { - double a0, a1, a2; - double b0, b1, b2; + double a[3]; + double b[3]; double i1, i2; double o1, o2; } BiquadContext; @@ -57,6 +57,7 @@ typedef struct AudioIIRContext { const AVClass *class; char *a_str, *b_str, *g_str; double dry_gain, wet_gain; + double mix; int format; int process; int precision; @@ -124,6 +125,7 @@ static int iir_ch_## name(AVFilterContext *ctx, void *arg, int ch, int nb_jobs) AudioIIRContext *s = ctx->priv; \ const double ig = s->dry_gain; \ const double og = s->wet_gain; \ + const double mix = s->mix; \ ThreadData *td = arg; \ AVFrame *in = td->in, *out = td->out; \ const type *src = (const type *)in->extended_data[ch]; \ @@ -133,6 +135,7 @@ static int iir_ch_## name(AVFilterContext *ctx, void *arg, int ch, int nb_jobs) const int nb_b = s->iir[ch].nb_ab[1]; \ const double *a = s->iir[ch].ab[0]; \ const double *b = s->iir[ch].ab[1]; \ + const double g = s->iir[ch].g; \ int *clippings = &s->iir[ch].clippings; \ type *dst = (type *)out->extended_data[ch]; \ int n; \ @@ -151,7 +154,8 @@ static int iir_ch_## name(AVFilterContext *ctx, void *arg, int ch, int nb_jobs) sample -= a[x] * oc[x]; \ \ oc[0] = sample; \ - sample *= og; \ + sample *= og * g; \ + sample = sample * mix + ic[0] * (1. - mix); \ if (need_clipping && sample < min) { \ (*clippings)++; \ dst[n] = min; \ @@ -177,21 +181,23 @@ static int iir_ch_serial_## name(AVFilterContext *ctx, void *arg, int ch, int nb AudioIIRContext *s = ctx->priv; \ const double ig = s->dry_gain; \ const double og = s->wet_gain; \ + const double mix = s->mix; \ ThreadData *td = arg; \ AVFrame *in = td->in, *out = td->out; \ const type *src = (const type *)in->extended_data[ch]; \ type *dst = (type *)out->extended_data[ch]; \ IIRChannel *iir = &s->iir[ch]; \ + const double g = iir->g; \ int *clippings = &iir->clippings; \ int nb_biquads = (FFMAX(iir->nb_ab[0], iir->nb_ab[1]) + 1) / 2; \ int n, i; \ \ for (i = 0; i < nb_biquads; i++) { \ - const double a1 = -iir->biquads[i].a1; \ - const double a2 = -iir->biquads[i].a2; \ - const double b0 = iir->biquads[i].b0; \ - const double b1 = iir->biquads[i].b1; \ - const double b2 = iir->biquads[i].b2; \ + const double a1 = -iir->biquads[i].a[1]; \ + const double a2 = -iir->biquads[i].a[2]; \ + const double b0 = iir->biquads[i].b[0]; \ + const double b1 = iir->biquads[i].b[1]; \ + const double b2 = iir->biquads[i].b[2]; \ double i1 = iir->biquads[i].i1; \ double i2 = iir->biquads[i].i2; \ double o1 = iir->biquads[i].o1; \ @@ -205,8 +211,9 @@ static int iir_ch_serial_## name(AVFilterContext *ctx, void *arg, int ch, int nb i1 = src[n]; \ o2 = o1; \ o1 = o0; \ - o0 *= og; \ + o0 *= og * g; \ \ + o0 = o0 * mix + (1. - mix) * sample; \ if (need_clipping && o0 < min) { \ (*clippings)++; \ dst[n] = min; \ @@ -492,6 +499,7 @@ static int decompose_zp2biquads(AVFilterContext *ctx, int channels) double a[6] = { 0 }; double min_distance = DBL_MAX; double max_mag = 0; + double factor; int i; for (i = 0; i < iir->nb_ab[0]; i++) { @@ -507,7 +515,7 @@ static int decompose_zp2biquads(AVFilterContext *ctx, int channels) } } - for (i = 0; i < iir->nb_ab[1]; i++) { + for (i = 0; i < iir->nb_ab[0]; i++) { if (isnan(iir->ab[0][2 * i]) || isnan(iir->ab[0][2 * i + 1])) continue; @@ -586,20 +594,41 @@ static int decompose_zp2biquads(AVFilterContext *ctx, int channels) iir->ab[1][2 * nearest_zero.a] = iir->ab[1][2 * nearest_zero.a + 1] = NAN; iir->ab[1][2 * nearest_zero.b] = iir->ab[1][2 * nearest_zero.b + 1] = NAN; - iir->biquads[current_biquad].a0 = 1.0; - iir->biquads[current_biquad].a1 = a[2] / a[4]; - iir->biquads[current_biquad].a2 = a[0] / a[4]; - iir->biquads[current_biquad].b0 = b[4] / a[4] * (current_biquad ? 1.0 : iir->g); - iir->biquads[current_biquad].b1 = b[2] / a[4] * (current_biquad ? 1.0 : iir->g); - iir->biquads[current_biquad].b2 = b[0] / a[4] * (current_biquad ? 1.0 : iir->g); + iir->biquads[current_biquad].a[0] = 1.; + iir->biquads[current_biquad].a[1] = a[2] / a[4]; + iir->biquads[current_biquad].a[2] = a[0] / a[4]; + iir->biquads[current_biquad].b[0] = b[4] / a[4]; + iir->biquads[current_biquad].b[1] = b[2] / a[4]; + iir->biquads[current_biquad].b[2] = b[0] / a[4]; + + if (fabs(iir->biquads[current_biquad].b[0] + + iir->biquads[current_biquad].b[1] + + iir->biquads[current_biquad].b[2]) > 1e-6) { + factor = (iir->biquads[current_biquad].a[0] + + iir->biquads[current_biquad].a[1] + + iir->biquads[current_biquad].a[2]) / + (iir->biquads[current_biquad].b[0] + + iir->biquads[current_biquad].b[1] + + iir->biquads[current_biquad].b[2]); + + av_log(ctx, AV_LOG_VERBOSE, "factor=%f\n", factor); + + iir->biquads[current_biquad].b[0] *= factor; + iir->biquads[current_biquad].b[1] *= factor; + iir->biquads[current_biquad].b[2] *= factor; + } + + iir->biquads[current_biquad].b[0] *= (current_biquad ? 1.0 : iir->g); + iir->biquads[current_biquad].b[1] *= (current_biquad ? 1.0 : iir->g); + iir->biquads[current_biquad].b[2] *= (current_biquad ? 1.0 : iir->g); av_log(ctx, AV_LOG_VERBOSE, "a=%f %f %f:b=%f %f %f\n", - iir->biquads[current_biquad].a0, - iir->biquads[current_biquad].a1, - iir->biquads[current_biquad].a2, - iir->biquads[current_biquad].b0, - iir->biquads[current_biquad].b1, - iir->biquads[current_biquad].b2); + iir->biquads[current_biquad].a[0], + iir->biquads[current_biquad].a[1], + iir->biquads[current_biquad].a[2], + iir->biquads[current_biquad].b[0], + iir->biquads[current_biquad].b[1], + iir->biquads[current_biquad].b[2]); current_biquad++; } @@ -662,6 +691,25 @@ static void convert_pd2zp(AVFilterContext *ctx, int channels) } } +static void check_stability(AVFilterContext *ctx, int channels) +{ + AudioIIRContext *s = ctx->priv; + int ch; + + for (ch = 0; ch < channels; ch++) { + IIRChannel *iir = &s->iir[ch]; + + for (int n = 0; n < iir->nb_ab[0]; n++) { + double pr = hypot(iir->ab[0][2*n], iir->ab[0][2*n+1]); + + if (pr >= 1.) { + av_log(ctx, AV_LOG_WARNING, "pole %d at channel %d is unstable\n", n, ch); + break; + } + } + } +} + static void drawtext(AVFrame *pic, int x, int y, const char *txt, uint32_t color) { const uint8_t *font; @@ -711,76 +759,93 @@ static void draw_line(AVFrame *out, int x0, int y0, int x1, int y1, uint32_t col } } +static void get_response(int channel, int format, double w, + const double *b, const double *a, + int nb_b, int nb_a, double *r, double *i) +{ + double realz, realp; + double imagz, imagp; + double real, imag; + double div; + + if (format == 0) { + realz = 0., realp = 0.; + imagz = 0., imagp = 0.; + for (int x = 0; x < nb_a; x++) { + realz += cos(-x * w) * a[x]; + imagz += sin(-x * w) * a[x]; + } + + for (int x = 0; x < nb_b; x++) { + realp += cos(-x * w) * b[x]; + imagp += sin(-x * w) * b[x]; + } + + div = realp * realp + imagp * imagp; + real = (realz * realp + imagz * imagp) / div; + imag = (imagz * realp - imagp * realz) / div; + } else { + real = 1; + imag = 0; + for (int x = 0; x < nb_a; x++) { + double ore, oim, re, im; + + re = cos(w) - a[2 * x]; + im = sin(w) - a[2 * x + 1]; + + ore = real; + oim = imag; + + real = ore * re - oim * im; + imag = ore * im + oim * re; + } + + for (int x = 0; x < nb_b; x++) { + double ore, oim, re, im; + + re = cos(w) - b[2 * x]; + im = sin(w) - b[2 * x + 1]; + + ore = real; + oim = imag; + div = re * re + im * im; + + real = (ore * re + oim * im) / div; + imag = (oim * re - ore * im) / div; + } + } + + *r = real; + *i = imag; +} + static void draw_response(AVFilterContext *ctx, AVFrame *out) { AudioIIRContext *s = ctx->priv; - float *mag, *phase, min = FLT_MAX, max = FLT_MIN; - int prev_ymag = -1, prev_yphase = -1; + float *mag, *phase, *delay, min = FLT_MAX, max = FLT_MIN; + float min_delay = FLT_MAX, max_delay = FLT_MIN; + int prev_ymag = -1, prev_yphase = -1, prev_ydelay = -1; char text[32]; - int ch, i, x; + int ch, i; memset(out->data[0], 0, s->h * out->linesize[0]); phase = av_malloc_array(s->w, sizeof(*phase)); mag = av_malloc_array(s->w, sizeof(*mag)); - if (!mag || !phase) + delay = av_malloc_array(s->w, sizeof(*delay)); + if (!mag || !phase || !delay) goto end; ch = av_clip(s->ir_channel, 0, s->channels - 1); for (i = 0; i < s->w; i++) { const double *b = s->iir[ch].ab[0]; const double *a = s->iir[ch].ab[1]; + const int nb_b = s->iir[ch].nb_ab[0]; + const int nb_a = s->iir[ch].nb_ab[1]; double w = i * M_PI / (s->w - 1); - double realz, realp; - double imagz, imagp; - double real, imag, div; - - if (s->format == 0) { - realz = 0., realp = 0.; - imagz = 0., imagp = 0.; - for (x = 0; x < s->iir[ch].nb_ab[1]; x++) { - realz += cos(-x * w) * a[x]; - imagz += sin(-x * w) * a[x]; - } - - for (x = 0; x < s->iir[ch].nb_ab[0]; x++) { - realp += cos(-x * w) * b[x]; - imagp += sin(-x * w) * b[x]; - } - - div = realp * realp + imagp * imagp; - real = (realz * realp + imagz * imagp) / div; - imag = (imagz * realp - imagp * realz) / div; - } else { - real = 1; - imag = 0; - for (x = 0; x < s->iir[ch].nb_ab[1]; x++) { - double ore, oim, re, im; - - re = cos(w) - a[2 * x]; - im = sin(w) - a[2 * x + 1]; - - ore = real; - oim = imag; + double real, imag; - real = ore * re - oim * im; - imag = ore * im + oim * re; - } - - for (x = 0; x < s->iir[ch].nb_ab[0]; x++) { - double ore, oim, re, im; - - re = cos(w) - b[2 * x]; - im = sin(w) - b[2 * x + 1]; - - ore = real; - oim = imag; - div = re * re + im * im; - - real = (ore * re + oim * im) / div; - imag = (oim * re - ore * im) / div; - } - } + get_response(ch, s->format, w, b, a, nb_b, nb_a, &real, &imag); mag[i] = s->iir[ch].g * hypot(real, imag); phase[i] = atan2(imag, real); @@ -788,23 +853,39 @@ static void draw_response(AVFilterContext *ctx, AVFrame *out) max = fmaxf(max, mag[i]); } + for (i = 0; i < s->w - 1; i++) { + float dw = M_PI / (s->w - 1); + + delay[i] = -(phase[i + 1] - phase[i]) / dw; + min_delay = fminf(min_delay, delay[i]); + max_delay = fmaxf(max_delay, delay[i]); + } + + delay[i] = delay[i - 1]; + for (i = 0; i < s->w; i++) { int ymag = mag[i] / max * (s->h - 1); + int ydelay = (delay[i] - min_delay) / (max_delay - min_delay) * (s->h - 1); int yphase = (0.5 * (1. + phase[i] / M_PI)) * (s->h - 1); ymag = s->h - 1 - av_clip(ymag, 0, s->h - 1); yphase = s->h - 1 - av_clip(yphase, 0, s->h - 1); + ydelay = s->h - 1 - av_clip(ydelay, 0, s->h - 1); if (prev_ymag < 0) prev_ymag = ymag; if (prev_yphase < 0) prev_yphase = yphase; + if (prev_ydelay < 0) + prev_ydelay = ydelay; draw_line(out, i, ymag, FFMAX(i - 1, 0), prev_ymag, 0xFFFF00FF); draw_line(out, i, yphase, FFMAX(i - 1, 0), prev_yphase, 0xFF00FF00); + draw_line(out, i, ydelay, FFMAX(i - 1, 0), prev_ydelay, 0xFF00FFFF); prev_ymag = ymag; prev_yphase = yphase; + prev_ydelay = ydelay; } if (s->w > 400 && s->h > 100) { @@ -815,9 +896,18 @@ static void draw_response(AVFilterContext *ctx, AVFrame *out) drawtext(out, 2, 12, "Min Magnitude:", 0xDDDDDDDD); snprintf(text, sizeof(text), "%.2f", min); drawtext(out, 15 * 8 + 2, 12, text, 0xDDDDDDDD); + + drawtext(out, 2, 22, "Max Delay:", 0xDDDDDDDD); + snprintf(text, sizeof(text), "%.2f", max_delay); + drawtext(out, 11 * 8 + 2, 22, text, 0xDDDDDDDD); + + drawtext(out, 2, 32, "Min Delay:", 0xDDDDDDDD); + snprintf(text, sizeof(text), "%.2f", min_delay); + drawtext(out, 11 * 8 + 2, 32, text, 0xDDDDDDDD); } end: + av_free(delay); av_free(phase); av_free(mag); } @@ -851,6 +941,9 @@ static int config_output(AVFilterLink *outlink) } else if (s->format == 3) { convert_pd2zp(ctx, inlink->channels); } + if (s->format > 0) { + check_stability(ctx, inlink->channels); + } av_frame_free(&s->video); if (s->response) { @@ -1074,6 +1167,7 @@ static const AVOption aiir_options[] = { { "flt", "single-precision floating-point", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, AF, "precision" }, { "i32", "32-bit integers", 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, AF, "precision" }, { "i16", "16-bit integers", 0, AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, AF, "precision" }, + { "mix", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, AF }, { "response", "show IR frequency response", OFFSET(response), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, VF }, { "channel", "set IR channel to display frequency response", OFFSET(ir_channel), AV_OPT_TYPE_INT, {.i64=0}, 0, 1024, VF }, { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "hd720"}, 0, 0, VF },