[FFmpeg-cvslog] avfilter/af_biquads: add lattice-ladder form
Paul B Mahol
git at videolan.org
Mon Nov 2 14:31:32 EET 2020
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Nov 2 13:09:23 2020 +0100| [40ce4ad999e746aacab70c3733df65d2b0e269ad] | committer: Paul B Mahol
avfilter/af_biquads: add lattice-ladder form
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40ce4ad999e746aacab70c3733df65d2b0e269ad
---
doc/filters.texi | 9 ++++
libavfilter/af_biquads.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 115 insertions(+), 1 deletion(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index f664f0824d..d98c696f60 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1611,6 +1611,7 @@ Set transform type of IIR filter.
@item di
@item dii
@item tdii
+ at item latt
@end table
@end table
@@ -2754,6 +2755,7 @@ Set transform type of IIR filter.
@item di
@item dii
@item tdii
+ at item latt
@end table
@end table
@@ -2825,6 +2827,7 @@ Set transform type of IIR filter.
@item di
@item dii
@item tdii
+ at item latt
@end table
@end table
@@ -2903,6 +2906,7 @@ Set transform type of IIR filter.
@item di
@item dii
@item tdii
+ at item latt
@end table
@end table
@@ -2969,6 +2973,7 @@ Set transform type of IIR filter.
@item di
@item dii
@item tdii
+ at item latt
@end table
@end table
@@ -3700,6 +3705,7 @@ Set transform type of IIR filter.
@item di
@item dii
@item tdii
+ at item latt
@end table
@end table
@@ -4185,6 +4191,7 @@ Set transform type of IIR filter.
@item di
@item dii
@item tdii
+ at item latt
@end table
@end table
@@ -4519,6 +4526,7 @@ Set transform type of IIR filter.
@item di
@item dii
@item tdii
+ at item latt
@end table
@end table
@@ -5647,6 +5655,7 @@ Set transform type of IIR filter.
@item di
@item dii
@item tdii
+ at item latt
@end table
@end table
diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c
index 84f9c94bc3..230266434d 100644
--- a/libavfilter/af_biquads.c
+++ b/libavfilter/af_biquads.c
@@ -97,6 +97,7 @@ enum TransformType {
DI,
DII,
TDII,
+ LATT,
NB_TTYPE,
};
@@ -361,6 +362,80 @@ BIQUAD_TDII_FILTER(s32, int32_t, INT32_MIN, INT32_MAX, 1)
BIQUAD_TDII_FILTER(flt, float, -1., 1., 0)
BIQUAD_TDII_FILTER(dbl, double, -1., 1., 0)
+#define BIQUAD_LATT_FILTER(name, type, min, max, need_clipping) \
+static void biquad_latt_## name (BiquadsContext *s, \
+ const void *input, void *output, int len, \
+ double *z1, double *z2, \
+ double *unused1, double *unused2, \
+ double v0, double v1, double v2, \
+ double k0, double k1, int *clippings, \
+ int disabled) \
+{ \
+ const type *ibuf = input; \
+ type *obuf = output; \
+ double s0 = *z1; \
+ double s1 = *z2; \
+ double wet = s->mix; \
+ double dry = 1. - wet; \
+ double in, out; \
+ double t0, t1; \
+ \
+ for (int i = 0; i < len; i++) { \
+ out = 0.; \
+ in = ibuf[i]; \
+ t0 = in - k1 * s0; \
+ t1 = t0 * k1 + s0; \
+ s0 = t1; \
+ out += t1 * v2; \
+ \
+ t0 = t0 - k0 * s1; \
+ t1 = t0 * k0 + s1; \
+ out += t1 * v1; \
+ s1 = t1; \
+ \
+ out += t0 * v0; \
+ s0 = s1; \
+ s1 = t0; \
+ \
+ out = out * wet + in * dry; \
+ if (disabled) { \
+ obuf[i] = in; \
+ } else if (need_clipping && out < min) { \
+ (*clippings)++; \
+ obuf[i] = min; \
+ } else if (need_clipping && out > max) { \
+ (*clippings)++; \
+ obuf[i] = max; \
+ } else { \
+ obuf[i] = out; \
+ } \
+ } \
+ *z1 = s0; \
+ *z2 = s1; \
+}
+
+BIQUAD_LATT_FILTER(s16, int16_t, INT16_MIN, INT16_MAX, 1)
+BIQUAD_LATT_FILTER(s32, int32_t, INT32_MIN, INT32_MAX, 1)
+BIQUAD_LATT_FILTER(flt, float, -1., 1., 0)
+BIQUAD_LATT_FILTER(dbl, double, -1., 1., 0)
+
+static void convert_dir2latt(BiquadsContext *s)
+{
+ double k0, k1, v0, v1, v2;
+
+ k1 = s->a2;
+ k0 = s->a1 / (1. + k1);
+ v2 = s->b2;
+ v1 = s->b1 - v2 * s->a1;
+ v0 = s->b0 - v1 * k0 - v2 * k1;
+
+ s->a1 = k0;
+ s->a2 = k1;
+ s->b0 = v0;
+ s->b1 = v1;
+ s->b2 = v2;
+}
+
static int config_filter(AVFilterLink *outlink, int reset)
{
AVFilterContext *ctx = outlink->src;
@@ -540,7 +615,6 @@ static int config_filter(AVFilterLink *outlink, int reset)
if (reset)
memset(s->cache, 0, sizeof(ChanCache) * inlink->channels);
-
switch (s->transform_type) {
case DI:
switch (inlink->format) {
@@ -593,12 +667,32 @@ static int config_filter(AVFilterLink *outlink, int reset)
default: av_assert0(0);
}
break;
+ case LATT:
+ switch (inlink->format) {
+ case AV_SAMPLE_FMT_S16P:
+ s->filter = biquad_latt_s16;
+ break;
+ case AV_SAMPLE_FMT_S32P:
+ s->filter = biquad_latt_s32;
+ break;
+ case AV_SAMPLE_FMT_FLTP:
+ s->filter = biquad_latt_flt;
+ break;
+ case AV_SAMPLE_FMT_DBLP:
+ s->filter = biquad_latt_dbl;
+ break;
+ default: av_assert0(0);
+ }
+ break;
default:
av_assert0(0);
}
s->block_align = av_get_bytes_per_sample(inlink->format);
+ if (s->transform_type == LATT)
+ convert_dir2latt(s);
+
return 0;
}
@@ -767,6 +861,7 @@ static const AVOption equalizer_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
@@ -798,6 +893,7 @@ static const AVOption bass_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
@@ -829,6 +925,7 @@ static const AVOption treble_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
@@ -859,6 +956,7 @@ static const AVOption bandpass_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
@@ -888,6 +986,7 @@ static const AVOption bandreject_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
@@ -919,6 +1018,7 @@ static const AVOption lowpass_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
@@ -950,6 +1050,7 @@ static const AVOption highpass_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
@@ -981,6 +1082,7 @@ static const AVOption allpass_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
@@ -1012,6 +1114,7 @@ static const AVOption lowshelf_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
@@ -1043,6 +1146,7 @@ static const AVOption highshelf_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
@@ -1067,6 +1171,7 @@ static const AVOption biquad_options[] = {
{"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"},
{"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"},
{"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"},
+ {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"},
{NULL}
};
More information about the ffmpeg-cvslog
mailing list