Unified · Split
| @@ -37,7 +37,7 @@ · 36 unmodified lines | |||
| 37 | 37 | ||
| 38 | enum FrequencyScale { | 38 | enum FrequencyScale { |
| 39 | FSCALE_LINEAR, | 39 | FSCALE_LINEAR, |
| 40 | FSCALE_LOG2, | 40 | FSCALE_LOG, |
| 41 | FSCALE_BARK, | 41 | FSCALE_BARK, |
| 42 | FSCALE_MEL, | 42 | FSCALE_MEL, |
| 43 | FSCALE_ERBS, | 43 | FSCALE_ERBS, |
| @@ -136,7 +136,7 @@ static const AVOption showcwt_options[] = { · 92 unmodified lines | |||
| 136 | { "r", "set video rate", OFFSET(rate_str), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, FLAGS }, | 136 | { "r", "set video rate", OFFSET(rate_str), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, FLAGS }, |
| 137 | { "scale", "set frequency scale", OFFSET(frequency_scale), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_FSCALE-1, FLAGS, "scale" }, | 137 | { "scale", "set frequency scale", OFFSET(frequency_scale), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_FSCALE-1, FLAGS, "scale" }, |
| 138 | { "linear", "linear", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_LINEAR}, 0, 0, FLAGS, "scale" }, | 138 | { "linear", "linear", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_LINEAR}, 0, 0, FLAGS, "scale" }, |
| 139 | { "log2", "logarithmic", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_LOG2}, 0, 0, FLAGS, "scale" }, | 139 | { "log", "logarithmic", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_LOG}, 0, 0, FLAGS, "scale" }, |
| 140 | { "bark", "bark", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_BARK}, 0, 0, FLAGS, "scale" }, | 140 | { "bark", "bark", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_BARK}, 0, 0, FLAGS, "scale" }, |
| 141 | { "mel", "mel", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_MEL}, 0, 0, FLAGS, "scale" }, | 141 | { "mel", "mel", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_MEL}, 0, 0, FLAGS, "scale" }, |
| 142 | { "erbs", "erbs", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_ERBS}, 0, 0, FLAGS, "scale" }, | 142 | { "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, · 116 unmodified lines | |||
| 259 | float frequency_derivative = frequency_range / frequency_band_count; | 259 | float frequency_derivative = frequency_range / frequency_band_count; |
| 260 | 260 | ||
| 261 | switch (frequency_scale) { | 261 | switch (frequency_scale) { |
| 262 | case FSCALE_LOG2: | 262 | case FSCALE_LOG: |
| 263 | frequency = powf(2.f, frequency); | 263 | frequency = powf(2.f, frequency); |
| 264 | frequency_derivative *= logf(2.f) * frequency; | 264 | frequency_derivative *= logf(2.f) * frequency; |
| 265 | break; | 265 | break; |
| @@ -919,7 +919,7 @@ static int config_output(AVFilterLink *outlink) · 653 unmodified lines | |||
| 919 | maximum_frequency *= factor; | 919 | maximum_frequency *= factor; |
| 920 | 920 | ||
| 921 | switch (s->frequency_scale) { | 921 | switch (s->frequency_scale) { |
| 922 | case FSCALE_LOG2: | 922 | case FSCALE_LOG: |
| 923 | minimum_frequency = logf(minimum_frequency) / logf(2.f); | 923 | minimum_frequency = logf(minimum_frequency) / logf(2.f); |
| 924 | maximum_frequency = logf(maximum_frequency) / logf(2.f); | 924 | maximum_frequency = logf(maximum_frequency) / logf(2.f); |
| 925 | break; | 925 | break; |