[FFmpeg-cvslog] avfilter/avf_showcwt: rename option value

Paul B Mahol git at videolan.org
Sun Jul 30 19:10:08 EEST 2023


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Jul 30 17:40:07 2023 +0200| [48cd5561e18967285f82afed117bae2175fd4451] | committer: Paul B Mahol

avfilter/avf_showcwt: rename option value

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48cd5561e18967285f82afed117bae2175fd4451
---

 libavfilter/avf_showcwt.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c
index 51a89706ab..9f6265f105 100644
--- a/libavfilter/avf_showcwt.c
+++ b/libavfilter/avf_showcwt.c
@@ -37,7 +37,7 @@
 
 enum FrequencyScale {
     FSCALE_LINEAR,
-    FSCALE_LOG2,
+    FSCALE_LOG,
     FSCALE_BARK,
     FSCALE_MEL,
     FSCALE_ERBS,
@@ -136,7 +136,7 @@ static const AVOption showcwt_options[] = {
     { "r",    "set video rate",  OFFSET(rate_str), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, FLAGS },
     { "scale", "set frequency scale", OFFSET(frequency_scale), AV_OPT_TYPE_INT,  {.i64=0}, 0, NB_FSCALE-1, FLAGS, "scale" },
     {  "linear",  "linear",           0,                       AV_OPT_TYPE_CONST,{.i64=FSCALE_LINEAR}, 0, 0, FLAGS, "scale" },
-    {  "log2",    "logarithmic",      0,                       AV_OPT_TYPE_CONST,{.i64=FSCALE_LOG2},   0, 0, FLAGS, "scale" },
+    {  "log",     "logarithmic",      0,                       AV_OPT_TYPE_CONST,{.i64=FSCALE_LOG},    0, 0, FLAGS, "scale" },
     {  "bark",    "bark",             0,                       AV_OPT_TYPE_CONST,{.i64=FSCALE_BARK},   0, 0, FLAGS, "scale" },
     {  "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" },
@@ -259,7 +259,7 @@ static void frequency_band(float *frequency_band,
         float frequency_derivative = frequency_range / frequency_band_count;
 
         switch (frequency_scale) {
-        case FSCALE_LOG2:
+        case FSCALE_LOG:
             frequency = powf(2.f, frequency);
             frequency_derivative *= logf(2.f) * frequency;
             break;
@@ -919,7 +919,7 @@ static int config_output(AVFilterLink *outlink)
     maximum_frequency *= factor;
 
     switch (s->frequency_scale) {
-    case FSCALE_LOG2:
+    case FSCALE_LOG:
         minimum_frequency = logf(minimum_frequency) / logf(2.f);
         maximum_frequency = logf(maximum_frequency) / logf(2.f);
         break;



More information about the ffmpeg-cvslog mailing list