Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -113,7 +113,6 @@ typedef struct AudioSurroundContext { · 112 unmodified lines | |||
| 113 | float *lfe_mag; | 113 | float *lfe_mag; |
| 114 | float *mag_total; | 114 | float *mag_total; |
| 115 | 115 | ||
| 116 | int buf_size; | ||
| 117 | int rdft_size; | 116 | int rdft_size; |
| 118 | int hop_size; | 117 | int hop_size; |
| 119 | AVTXContext **rdft, **irdft; | 118 | AVTXContext **rdft, **irdft; |
| @@ -286,7 +285,7 @@ static int config_input(AVFilterLink *inlink) · 166 unmodified lines | |||
| 286 | float scale = 1.f; | 285 | float scale = 1.f; |
| 287 | 286 | ||
| 288 | ret = av_tx_init(&s->rdft[ch], &s->tx_fn, AV_TX_FLOAT_RDFT, | 287 | 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); |
| 290 | if (ret < 0) | 289 | if (ret < 0) |
| 291 | return ret; | 290 | return ret; |
| 292 | } | 291 | } |
| @@ -296,20 +295,20 @@ static int config_input(AVFilterLink *inlink) · 3 unmodified lines | |||
| 296 | 295 | ||
| 297 | set_input_levels(ctx); | 296 | set_input_levels(ctx); |
| 298 | 297 | ||
| 299 | s->window = ff_get_audio_buffer(inlink, s->buf_size * 2); | 298 | s->window = ff_get_audio_buffer(inlink, s->win_size * 2); |
| 300 | if (!s->window) | 299 | if (!s->window) |
| 301 | return AVERROR(ENOMEM); | 300 | return AVERROR(ENOMEM); |
| 302 | 301 | ||
| 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); |
| 304 | if (!s->input_in) | 303 | if (!s->input_in) |
| 305 | return AVERROR(ENOMEM); | 304 | return AVERROR(ENOMEM); |
| 306 | 305 | ||
| 307 | s->input = ff_get_audio_buffer(inlink, s->buf_size + 2); | 306 | s->input = ff_get_audio_buffer(inlink, s->win_size + 2); |
| 308 | if (!s->input) | 307 | if (!s->input) |
| 309 | return AVERROR(ENOMEM); | 308 | return AVERROR(ENOMEM); |
| 310 | 309 | ||
| 311 | s->lowcut = 1.f * s->lowcutf / (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); |
| 312 | s->highcut = 1.f * s->highcutf / (inlink->sample_rate * 0.5) * (s->buf_size / 2); | 311 | s->highcut = 1.f * s->highcutf / (inlink->sample_rate * 0.5) * (s->win_size / 2); |
| 313 | 312 | ||
| 314 | return 0; | 313 | return 0; |
| 315 | } | 314 | } |
| @@ -329,7 +328,7 @@ static int config_output(AVFilterLink *outlink) · 13 unmodified lines | |||
| 329 | float iscale = 1.f; | 328 | float iscale = 1.f; |
| 330 | 329 | ||
| 331 | ret = av_tx_init(&s->irdft[ch], &s->itx_fn, AV_TX_FLOAT_RDFT, | 330 | 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); |
| 333 | if (ret < 0) | 332 | if (ret < 0) |
| 334 | return ret; | 333 | return ret; |
| 335 | } | 334 | } |
| @@ -340,13 +339,13 @@ static int config_output(AVFilterLink *outlink) · 4 unmodified lines | |||
| 340 | 339 | ||
| 341 | set_output_levels(ctx); | 340 | set_output_levels(ctx); |
| 342 | 341 | ||
| 343 | s->output_out = ff_get_audio_buffer(outlink, s->buf_size + 2); | 342 | s->output_out = ff_get_audio_buffer(outlink, s->win_size + 2); |
| 344 | s->output = ff_get_audio_buffer(outlink, s->buf_size + 2); | 343 | s->output = ff_get_audio_buffer(outlink, s->win_size + 2); |
| 345 | s->overlap_buffer = ff_get_audio_buffer(outlink, s->buf_size * 2); | 344 | s->overlap_buffer = ff_get_audio_buffer(outlink, s->win_size * 2); |
| 346 | if (!s->overlap_buffer || !s->output || !s->output_out) | 345 | if (!s->overlap_buffer || !s->output || !s->output_out) |
| 347 | return AVERROR(ENOMEM); | 346 | return AVERROR(ENOMEM); |
| 348 | 347 | ||
| 349 | s->rdft_size = s->buf_size / 2 + 1; | 348 | s->rdft_size = s->win_size / 2 + 1; |
| 350 | 349 | ||
| 351 | s->x_pos = av_calloc(s->rdft_size, sizeof(*s->x_pos)); | 350 | s->x_pos = av_calloc(s->rdft_size, sizeof(*s->x_pos)); |
| 352 | s->y_pos = av_calloc(s->rdft_size, sizeof(*s->y_pos)); | 351 | s->y_pos = av_calloc(s->rdft_size, sizeof(*s->y_pos)); |
| @@ -1222,19 +1221,17 @@ fail: · 869 unmodified lines | |||
| 1222 | return AVERROR(EINVAL); | 1221 | return AVERROR(EINVAL); |
| 1223 | } | 1222 | } |
| 1224 | 1223 | ||
| 1225 | s->buf_size = 1 << av_log2(s->win_size); | 1224 | s->window_func_lut = av_calloc(s->win_size, sizeof(*s->window_func_lut)); |
| 1226 | |||
| 1227 | s->window_func_lut = av_calloc(s->buf_size, sizeof(*s->window_func_lut)); | ||
| 1228 | if (!s->window_func_lut) | 1225 | if (!s->window_func_lut) |
| 1229 | return AVERROR(ENOMEM); | 1226 | return AVERROR(ENOMEM); |
| 1230 | 1227 | ||
| 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); |
| 1232 | if (s->overlap == 1) | 1229 | if (s->overlap == 1) |
| 1233 | s->overlap = overlap; | 1230 | s->overlap = overlap; |
| 1234 | 1231 | ||
| 1235 | for (i = 0; i < s->buf_size; i++) | 1232 | for (i = 0; i < s->win_size; i++) |
| 1236 | s->window_func_lut[i] = sqrtf(s->window_func_lut[i] / s->buf_size); | 1233 | s->window_func_lut[i] = sqrtf(s->window_func_lut[i] / s->win_size); |
| 1237 | s->hop_size = FFMAX(1, s->buf_size * (1. - s->overlap)); | 1234 | s->hop_size = FFMAX(1, s->win_size * (1. - s->overlap)); |
| 1238 | 1235 | ||
| 1239 | allchannels_spread(ctx); | 1236 | allchannels_spread(ctx); |
| 1240 | 1237 | ||
| @@ -1246,14 +1243,14 @@ static int fft_channel(AVFilterContext *ctx, AVFrame *in, int ch) · 5 unmodified lines | |||
| 1246 | AudioSurroundContext *s = ctx->priv; | 1243 | AudioSurroundContext *s = ctx->priv; |
| 1247 | float *src = (float *)s->input_in->extended_data[ch]; | 1244 | float *src = (float *)s->input_in->extended_data[ch]; |
| 1248 | float *win = (float *)s->window->extended_data[ch]; | 1245 | 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; |
| 1250 | const float level_in = s->input_levels[ch]; | 1247 | const float level_in = s->input_levels[ch]; |
| 1251 | 1248 | ||
| 1252 | memmove(src, &src[s->hop_size], offset * sizeof(float)); | 1249 | memmove(src, &src[s->hop_size], offset * sizeof(float)); |
| 1253 | memcpy(&src[offset], in->extended_data[ch], in->nb_samples * sizeof(float)); | 1250 | memcpy(&src[offset], in->extended_data[ch], in->nb_samples * sizeof(float)); |
| 1254 | memset(&src[offset + in->nb_samples], 0, (s->hop_size - in->nb_samples) * sizeof(float)); | 1251 | memset(&src[offset + in->nb_samples], 0, (s->hop_size - in->nb_samples) * sizeof(float)); |
| 1255 | 1252 | ||
| 1256 | for (int n = 0; n < s->buf_size; n++) | 1253 | for (int n = 0; n < s->win_size; n++) |
| 1257 | win[n] = src[n] * s->window_func_lut[n] * level_in; | 1254 | win[n] = src[n] * s->window_func_lut[n] * level_in; |
| 1258 | 1255 | ||
| 1259 | s->tx_fn(s->rdft[ch], (float *)s->input->extended_data[ch], win, sizeof(float)); | 1256 | 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 | |||
| 1285 | 1282 | ||
| 1286 | memmove(s->overlap_buffer->extended_data[ch], | 1283 | memmove(s->overlap_buffer->extended_data[ch], |
| 1287 | s->overlap_buffer->extended_data[ch] + s->hop_size * sizeof(float), | 1284 | s->overlap_buffer->extended_data[ch] + s->hop_size * sizeof(float), |
| 1288 | s->buf_size * sizeof(float)); | 1285 | s->win_size * sizeof(float)); |
| 1289 | memset(s->overlap_buffer->extended_data[ch] + s->buf_size * sizeof(float), | 1286 | memset(s->overlap_buffer->extended_data[ch] + s->win_size * sizeof(float), |
| 1290 | 0, s->hop_size * sizeof(float)); | 1287 | 0, s->hop_size * sizeof(float)); |
| 1291 | 1288 | ||
| 1292 | for (int n = 0; n < s->buf_size; n++) | 1289 | for (int n = 0; n < s->win_size; n++) |
| 1293 | ptr[n] += dst[n] * s->window_func_lut[n] * level_out; | 1290 | ptr[n] += dst[n] * s->window_func_lut[n] * level_out; |
| 1294 | 1291 | ||
| 1295 | ptr = (float *)s->overlap_buffer->extended_data[ch]; | 1292 | 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 | |||
| 1418 | if (ret < 0) | 1415 | if (ret < 0) |
| 1419 | return ret; | 1416 | return ret; |
| 1420 | 1417 | ||
| 1421 | s->hop_size = FFMAX(1, s->buf_size * (1. - s->overlap)); | 1418 | s->hop_size = FFMAX(1, s->win_size * (1. - s->overlap)); |
| 1422 | 1419 | ||
| 1423 | allchannels_spread(ctx); | 1420 | allchannels_spread(ctx); |
| 1424 | set_input_levels(ctx); | 1421 | set_input_levels(ctx); |