har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/af_vibrato: refactor code

Browse Source 
Move some code out of inner loop.
This commit is contained in:
Paul B Mahol 2023-08-08 11:27:23 +02:00
parent b98ee1a355
commit c7bfc826c3
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libavfilter/af_vibrato.c
View File

@ -54,9 +54,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
VibratoContext *s = ctx->priv; VibratoContext *s = ctx->priv;
const int wave_table_size = s->wave_table_size;
const double *wave_table = s->wave_table;
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
const int channels = s->channels;
const int buf_size = s->buf_size;
const double depth = s->depth;
int wave_table_index = s->wave_table_index;
int buf_index = s->buf_index;
AVFrame *out; AVFrame *out;
int n, c;
const double *src; const double *src;
double *dst; double *dst;
@ -71,39 +77,40 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
av_frame_copy_props(out, in); av_frame_copy_props(out, in);
} }
for (n = 0; n < in->nb_samples; n++) { for (int n = 0; n < in->nb_samples; n++) {
int samp1_index, samp2_index;
double integer, decimal; double integer, decimal;
decimal = modf(s->depth * s->wave_table[s->wave_table_index], &integer); decimal = modf(depth * wave_table[wave_table_index], &integer);
s->wave_table_index++; wave_table_index++;
if (s->wave_table_index >= s->wave_table_size) if (wave_table_index >= wave_table_size)
s->wave_table_index -= s->wave_table_size; wave_table_index -= wave_table_size;
for (c = 0; c < inlink->ch_layout.nb_channels; c++) { samp1_index = buf_index + integer;
int samp1_index, samp2_index; if (samp1_index >= buf_size)
double *buf; samp1_index -= buf_size;
double this_samp; samp2_index = samp1_index + 1;
if (samp2_index >= buf_size)
samp2_index -= buf_size;
for (int c = 0; c < channels; c++) {
double *buf, this_samp;
src = (const double *)in->extended_data[c]; src = (const double *)in->extended_data[c];
dst = (double *)out->extended_data[c]; dst = (double *)out->extended_data[c];
buf = s->buf[c]; buf = s->buf[c];
samp1_index = s->buf_index + integer;
if (samp1_index >= s->buf_size)
samp1_index -= s->buf_size;
samp2_index = samp1_index + 1;
if (samp2_index >= s->buf_size)
samp2_index -= s->buf_size;
this_samp = src[n]; this_samp = src[n];
dst[n] = buf[samp1_index] + (decimal * (buf[samp2_index] - buf[samp1_index])); dst[n] = buf[samp1_index] + (decimal * (buf[samp2_index] - buf[samp1_index]));
buf[s->buf_index] = this_samp; buf[buf_index] = this_samp;
} }
s->buf_index++; buf_index++;
if (s->buf_index >= s->buf_size) if (buf_index >= buf_size)
s->buf_index -= s->buf_size; buf_index -= buf_size;
} }
s->wave_table_index = wave_table_index;
s->buf_index = buf_index;
if (in != out) if (in != out)
av_frame_free(&in); av_frame_free(&in);