History

avfilter/af_surround: allow non-power of 2 win_size

Paul B Mahol committed 4 years ago

Commit a640b281 parent 404c2951 file · +22 −25Browse files

Unified · Split

libavfilter/af_surround.c+22−25
@@ -113,7 +113,6 @@ typedef struct AudioSurroundContext { · 112 unmodified lines
113113 float *lfe_mag;
114114 float *mag_total;
115115
116− int buf_size;
117116 int rdft_size;
118117 int hop_size;
119118 AVTXContext **rdft, **irdft;
@@ -286,7 +285,7 @@ static int config_input(AVFilterLink *inlink) · 166 unmodified lines
286285 float scale = 1.f;
287286
288287 ret = av_tx_init(&s->rdft[ch], &s->tx_fn, AV_TX_FLOAT_RDFT,
289− 0, s->buf_size, &scale, 0);
288+ 0, s->win_size, &scale, 0);
290289 if (ret < 0)
291290 return ret;
292291 }
@@ -296,20 +295,20 @@ static int config_input(AVFilterLink *inlink) · 3 unmodified lines
296295
297296 set_input_levels(ctx);
298297
299− s->window = ff_get_audio_buffer(inlink, s->buf_size * 2);
298+ s->window = ff_get_audio_buffer(inlink, s->win_size * 2);
300299 if (!s->window)
301300 return AVERROR(ENOMEM);
302301
303− s->input_in = ff_get_audio_buffer(inlink, s->buf_size * 2);
302+ s->input_in = ff_get_audio_buffer(inlink, s->win_size * 2);
304303 if (!s->input_in)
305304 return AVERROR(ENOMEM);
306305
307− s->input = ff_get_audio_buffer(inlink, s->buf_size + 2);
306+ s->input = ff_get_audio_buffer(inlink, s->win_size + 2);
308307 if (!s->input)
309308 return AVERROR(ENOMEM);
310309
311− s->lowcut = 1.f * s->lowcutf / (inlink->sample_rate * 0.5) * (s->buf_size / 2);
312− s->highcut = 1.f * s->highcutf / (inlink->sample_rate * 0.5) * (s->buf_size / 2);
310+ s->lowcut = 1.f * s->lowcutf / (inlink->sample_rate * 0.5) * (s->win_size / 2);
311+ s->highcut = 1.f * s->highcutf / (inlink->sample_rate * 0.5) * (s->win_size / 2);
313312
314313 return 0;
315314 }
@@ -329,7 +328,7 @@ static int config_output(AVFilterLink *outlink) · 13 unmodified lines
329328 float iscale = 1.f;
330329
331330 ret = av_tx_init(&s->irdft[ch], &s->itx_fn, AV_TX_FLOAT_RDFT,
332− 1, s->buf_size, &iscale, 0);
331+ 1, s->win_size, &iscale, 0);
333332 if (ret < 0)
334333 return ret;
335334 }
@@ -340,13 +339,13 @@ static int config_output(AVFilterLink *outlink) · 4 unmodified lines
340339
341340 set_output_levels(ctx);
342341
343− s->output_out = ff_get_audio_buffer(outlink, s->buf_size + 2);
344− s->output = ff_get_audio_buffer(outlink, s->buf_size + 2);
345− s->overlap_buffer = ff_get_audio_buffer(outlink, s->buf_size * 2);
342+ s->output_out = ff_get_audio_buffer(outlink, s->win_size + 2);
343+ s->output = ff_get_audio_buffer(outlink, s->win_size + 2);
344+ s->overlap_buffer = ff_get_audio_buffer(outlink, s->win_size * 2);
346345 if (!s->overlap_buffer || !s->output || !s->output_out)
347346 return AVERROR(ENOMEM);
348347
349− s->rdft_size = s->buf_size / 2 + 1;
348+ s->rdft_size = s->win_size / 2 + 1;
350349
351350 s->x_pos = av_calloc(s->rdft_size, sizeof(*s->x_pos));
352351 s->y_pos = av_calloc(s->rdft_size, sizeof(*s->y_pos));
@@ -1222,19 +1221,17 @@ fail: · 869 unmodified lines
12221221 return AVERROR(EINVAL);
12231222 }
12241223
1225− s->buf_size = 1 << av_log2(s->win_size);
1226−
1227− s->window_func_lut = av_calloc(s->buf_size, sizeof(*s->window_func_lut));
1224+ s->window_func_lut = av_calloc(s->win_size, sizeof(*s->window_func_lut));
12281225 if (!s->window_func_lut)
12291226 return AVERROR(ENOMEM);
12301227
1231− generate_window_func(s->window_func_lut, s->buf_size, s->win_func, &overlap);
1228+ generate_window_func(s->window_func_lut, s->win_size, s->win_func, &overlap);
12321229 if (s->overlap == 1)
12331230 s->overlap = overlap;
12341231
1235− for (i = 0; i < s->buf_size; i++)
1236− s->window_func_lut[i] = sqrtf(s->window_func_lut[i] / s->buf_size);
1237− s->hop_size = FFMAX(1, s->buf_size * (1. - s->overlap));
1232+ for (i = 0; i < s->win_size; i++)
1233+ s->window_func_lut[i] = sqrtf(s->window_func_lut[i] / s->win_size);
1234+ s->hop_size = FFMAX(1, s->win_size * (1. - s->overlap));
12381235
12391236 allchannels_spread(ctx);
12401237
@@ -1246,14 +1243,14 @@ static int fft_channel(AVFilterContext *ctx, AVFrame *in, int ch) · 5 unmodified lines
12461243 AudioSurroundContext *s = ctx->priv;
12471244 float *src = (float *)s->input_in->extended_data[ch];
12481245 float *win = (float *)s->window->extended_data[ch];
1249− const int offset = s->buf_size - s->hop_size;
1246+ const int offset = s->win_size - s->hop_size;
12501247 const float level_in = s->input_levels[ch];
12511248
12521249 memmove(src, &src[s->hop_size], offset * sizeof(float));
12531250 memcpy(&src[offset], in->extended_data[ch], in->nb_samples * sizeof(float));
12541251 memset(&src[offset + in->nb_samples], 0, (s->hop_size - in->nb_samples) * sizeof(float));
12551252
1256− for (int n = 0; n < s->buf_size; n++)
1253+ for (int n = 0; n < s->win_size; n++)
12571254 win[n] = src[n] * s->window_func_lut[n] * level_in;
12581255
12591256 s->tx_fn(s->rdft[ch], (float *)s->input->extended_data[ch], win, sizeof(float));
@@ -1285,11 +1282,11 @@ static int ifft_channel(AVFilterContext *ctx, AVFrame *out, int ch) · 25 unmodified lines
12851282
12861283 memmove(s->overlap_buffer->extended_data[ch],
12871284 s->overlap_buffer->extended_data[ch] + s->hop_size * sizeof(float),
1288− s->buf_size * sizeof(float));
1289− memset(s->overlap_buffer->extended_data[ch] + s->buf_size * sizeof(float),
1285+ s->win_size * sizeof(float));
1286+ memset(s->overlap_buffer->extended_data[ch] + s->win_size * sizeof(float),
12901287 0, s->hop_size * sizeof(float));
12911288
1292− for (int n = 0; n < s->buf_size; n++)
1289+ for (int n = 0; n < s->win_size; n++)
12931290 ptr[n] += dst[n] * s->window_func_lut[n] * level_out;
12941291
12951292 ptr = (float *)s->overlap_buffer->extended_data[ch];
@@ -1418,7 +1415,7 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar · 122 unmodified lines
14181415 if (ret < 0)
14191416 return ret;
14201417
1421− s->hop_size = FFMAX(1, s->buf_size * (1. - s->overlap));
1418+ s->hop_size = FFMAX(1, s->win_size * (1. - s->overlap));
14221419
14231420 allchannels_spread(ctx);
14241421 set_input_levels(ctx);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t