From aee8689ba5700c0335fbc020910eab0f13009086 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 9 Jul 2023 20:06:46 +0200 Subject: [PATCH] avfilter/avf_showcwt: add cbrt frequency scale --- doc/filters.texi | 1 + libavfilter/avf_showcwt.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index ab90f2a876..1a07e03bad 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -30710,6 +30710,7 @@ Set the frequency scale used. Allowed values are: @item mel @item erbs @item sqrt +@item cbrt @end table Default value is @code{linear}. diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index f9bbcb8ab3..b989beab11 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -41,6 +41,7 @@ enum FrequencyScale { FSCALE_MEL, FSCALE_ERBS, FSCALE_SQRT, + FSCALE_CBRT, NB_FSCALE }; @@ -129,6 +130,7 @@ static const AVOption showcwt_options[] = { { "mel", "mel", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_MEL}, 0, 0, FLAGS, "scale" }, { "erbs", "erbs", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_ERBS}, 0, 0, FLAGS, "scale" }, { "sqrt", "sqrt", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_SQRT}, 0, 0, FLAGS, "scale" }, + { "cbrt", "cbrt", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_CBRT}, 0, 0, FLAGS, "scale" }, { "min", "set minimum frequency", OFFSET(minimum_frequency), AV_OPT_TYPE_FLOAT, {.dbl = 20.}, 1, 2000, FLAGS }, { "max", "set maximum frequency", OFFSET(maximum_frequency), AV_OPT_TYPE_FLOAT, {.dbl = 20000.}, 0, 192000, FLAGS }, { "logb", "set logarithmic basis", OFFSET(logarithmic_basis), AV_OPT_TYPE_FLOAT, {.dbl = 0.0001}, 0, 1, FLAGS }, @@ -247,6 +249,10 @@ static void frequency_band(float *frequency_band, frequency = frequency * frequency; frequency_derivative *= 2.f * sqrtf(frequency); break; + case FSCALE_CBRT: + frequency = frequency * frequency * frequency; + frequency_derivative *= 3.f * powf(frequency, 2.f / 3.f); + break; } frequency_band[y*2 ] = frequency; @@ -690,6 +696,10 @@ static int config_output(AVFilterLink *outlink) minimum_frequency = sqrtf(minimum_frequency); maximum_frequency = sqrtf(maximum_frequency); break; + case FSCALE_CBRT: + minimum_frequency = cbrtf(minimum_frequency); + maximum_frequency = cbrtf(maximum_frequency); + break; } frequency_band(s->frequency_band,