virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 22:24:04 +02:00
Code Issues Releases Activity

avfilter/af_afreqshift: add timeline and slice threading support

Browse Source
This commit is contained in:
Paul B Mahol
2020-11-22 10:44:49 +01:00
parent d29a9b8891
commit 0066bf4d1a
1 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
libavfilter/af_afreqshift.c
View File

@ -273,12 +273,40 @@ static int config_input(AVFilterLink *inlink)
return 0; return 0;
} }
typedef struct ThreadData {
AVFrame *in, *out;
} ThreadData;
static int filter_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{
AFreqShift *s = ctx->priv;
ThreadData *td = arg;
AVFrame *out = td->out;
AVFrame *in = td->in;
const int start = (in->channels * jobnr) / nb_jobs;
const int end = (in->channels * (jobnr+1)) / nb_jobs;
for (int ch = start; ch < end; ch++) {
s->filter_channel(ctx, in->nb_samples,
in->sample_rate,
(const double *)in->extended_data[ch],
(double *)out->extended_data[ch],
(double *)s->i1->extended_data[ch],
(double *)s->o1->extended_data[ch],
(double *)s->i2->extended_data[ch],
(double *)s->o2->extended_data[ch]);
}
return 0;
}
static int filter_frame(AVFilterLink *inlink, AVFrame *in) static int filter_frame(AVFilterLink *inlink, AVFrame *in)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
AFreqShift *s = ctx->priv; AFreqShift *s = ctx->priv;
AVFrame *out; AVFrame *out;
ThreadData td;
if (av_frame_is_writable(in)) { if (av_frame_is_writable(in)) {
out = in; out = in;
@ -291,16 +319,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
av_frame_copy_props(out, in); av_frame_copy_props(out, in);
} }
for (int ch = 0; ch < in->channels; ch++) { td.in = in; td.out = out;
s->filter_channel(ctx, in->nb_samples, ctx->internal->execute(ctx, filter_channels, &td, NULL, FFMIN(inlink->channels,
in->sample_rate, ff_filter_get_nb_threads(ctx)));
(const double *)in->extended_data[ch],
(double *)out->extended_data[ch],
(double *)s->i1->extended_data[ch],
(double *)s->o1->extended_data[ch],
(double *)s->i2->extended_data[ch],
(double *)s->o2->extended_data[ch]);
}
s->in_samples += in->nb_samples; s->in_samples += in->nb_samples;
@ -357,6 +378,8 @@ AVFilter ff_af_afreqshift = {
.inputs = inputs, .inputs = inputs,
.outputs = outputs, .outputs = outputs,
.process_command = ff_filter_process_command, .process_command = ff_filter_process_command,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC |
AVFILTER_FLAG_SLICE_THREADS,
}; };
static const AVOption aphaseshift_options[] = { static const AVOption aphaseshift_options[] = {
@ -376,4 +399,6 @@ AVFilter ff_af_aphaseshift = {
.inputs = inputs, .inputs = inputs,
.outputs = outputs, .outputs = outputs,
.process_command = ff_filter_process_command, .process_command = ff_filter_process_command,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC |
AVFILTER_FLAG_SLICE_THREADS,
}; };