Commit b9a61068 authored by Paul B Mahol's avatar Paul B Mahol

avfilter/af_afftfilt: remove invalid scaling

parent feade2b4
...@@ -49,7 +49,6 @@ typedef struct AFFTFiltContext { ...@@ -49,7 +49,6 @@ typedef struct AFFTFiltContext {
AVFrame *buffer; AVFrame *buffer;
int eof; int eof;
int win_func; int win_func;
float win_scale;
float *window_func_lut; float *window_func_lut;
} AFFTFiltContext; } AFFTFiltContext;
...@@ -138,7 +137,7 @@ static int config_input(AVFilterLink *inlink) ...@@ -138,7 +137,7 @@ static int config_input(AVFilterLink *inlink)
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
AFFTFiltContext *s = ctx->priv; AFFTFiltContext *s = ctx->priv;
char *saveptr = NULL; char *saveptr = NULL;
int ret = 0, ch, i; int ret = 0, ch;
float overlap; float overlap;
char *args; char *args;
const char *last_expr = "1"; const char *last_expr = "1";
...@@ -226,10 +225,6 @@ static int config_input(AVFilterLink *inlink) ...@@ -226,10 +225,6 @@ static int config_input(AVFilterLink *inlink)
if (s->overlap == 1) if (s->overlap == 1)
s->overlap = overlap; s->overlap = overlap;
for (s->win_scale = 0, i = 0; i < s->window_size; i++) {
s->win_scale += s->window_func_lut[i] * s->window_func_lut[i];
}
s->hop_size = s->window_size * (1 - s->overlap); s->hop_size = s->window_size * (1 - s->overlap);
if (s->hop_size <= 0) if (s->hop_size <= 0)
return AVERROR(EINVAL); return AVERROR(EINVAL);
...@@ -247,7 +242,7 @@ static int filter_frame(AVFilterLink *inlink) ...@@ -247,7 +242,7 @@ static int filter_frame(AVFilterLink *inlink)
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
AFFTFiltContext *s = ctx->priv; AFFTFiltContext *s = ctx->priv;
const int window_size = s->window_size; const int window_size = s->window_size;
const float f = 1. / s->win_scale; const float f = 1. / (s->window_size / 2);
double values[VAR_VARS_NB]; double values[VAR_VARS_NB];
AVFrame *out, *in = NULL; AVFrame *out, *in = NULL;
int ch, n, ret, i; int ch, n, ret, i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment