From 07a9e5ec5eb239c22ce3324f53cfde209cdfb6d6 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 22 May 2020 12:37:17 +0200 Subject: [PATCH] avfilter/af_aiir: add more descriptive options aliases --- doc/filters.texi | 14 +++++++------- libavfilter/af_aiir.c | 7 +++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 052f0b97aa..3b444bd143 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1389,13 +1389,13 @@ Apply an arbitrary Infinite Impulse Response filter. It accepts the following parameters: @table @option -@item z +@item zeros, z Set numerator/zeros coefficients. -@item p +@item poles, p Set denominator/poles coefficients. -@item k +@item gains, k Set channels gains. @item dry_gain @@ -1404,7 +1404,7 @@ Set input gain. @item wet_gain Set output gain. -@item f +@item format, f Set coefficients format. @table @samp @@ -1418,11 +1418,11 @@ Z-plane zeros/poles, polar radians Z-plane zeros/poles, polar degrees @end table -@item r +@item process, r Set kind of processing. Can be @code{d} - direct or @code{s} - serial cascading. Default is @code{s}. -@item e +@item precision, e Set filtering precision. @table @samp @@ -1436,7 +1436,7 @@ single-precision floating-point 16-bit integers @end table -@item n +@item normalize, n Normalize filter coefficients, by default is enabled. Enabling it will normalize magnitude response at DC to 0dB. diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index 588b9a6087..8b362817b7 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -1212,24 +1212,31 @@ static const AVFilterPad inputs[] = { #define VF AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM static const AVOption aiir_options[] = { + { "zeros", "set B/numerator/zeros coefficients", OFFSET(b_str), AV_OPT_TYPE_STRING, {.str="1+0i 1-0i"}, 0, 0, AF }, { "z", "set B/numerator/zeros coefficients", OFFSET(b_str), AV_OPT_TYPE_STRING, {.str="1+0i 1-0i"}, 0, 0, AF }, + { "poles", "set A/denominator/poles coefficients", OFFSET(a_str),AV_OPT_TYPE_STRING, {.str="1+0i 1-0i"}, 0, 0, AF }, { "p", "set A/denominator/poles coefficients", OFFSET(a_str), AV_OPT_TYPE_STRING, {.str="1+0i 1-0i"}, 0, 0, AF }, + { "gains", "set channels gains", OFFSET(g_str), AV_OPT_TYPE_STRING, {.str="1|1"}, 0, 0, AF }, { "k", "set channels gains", OFFSET(g_str), AV_OPT_TYPE_STRING, {.str="1|1"}, 0, 0, AF }, { "dry", "set dry gain", OFFSET(dry_gain), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, AF }, { "wet", "set wet gain", OFFSET(wet_gain), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, AF }, + { "format", "set coefficients format", OFFSET(format), AV_OPT_TYPE_INT, {.i64=1}, 0, 3, AF, "format" }, { "f", "set coefficients format", OFFSET(format), AV_OPT_TYPE_INT, {.i64=1}, 0, 3, AF, "format" }, { "tf", "transfer function", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, AF, "format" }, { "zp", "Z-plane zeros/poles", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, AF, "format" }, { "pr", "Z-plane zeros/poles (polar radians)", 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, AF, "format" }, { "pd", "Z-plane zeros/poles (polar degrees)", 0, AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, AF, "format" }, + { "process", "set kind of processing", OFFSET(process), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, AF, "process" }, { "r", "set kind of processing", OFFSET(process), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, AF, "process" }, { "d", "direct", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, AF, "process" }, { "s", "serial cascading", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, AF, "process" }, + { "precision", "set filtering precision", OFFSET(precision),AV_OPT_TYPE_INT, {.i64=0}, 0, 3, AF, "precision" }, { "e", "set precision", OFFSET(precision),AV_OPT_TYPE_INT, {.i64=0}, 0, 3, AF, "precision" }, { "dbl", "double-precision floating-point", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, AF, "precision" }, { "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" }, + { "normalize", "normalize coefficients", OFFSET(normalize),AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, AF }, { "n", "normalize coefficients", OFFSET(normalize),AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, AF }, { "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 },