virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

avfilter/af_sidechaincompress: do not require writable input frames for acompressor filter

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-11-30 12:25:32 +01:00
parent 376a3bdb7b
commit 6b978dadc6
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavfilter/af_sidechaincompress.c
View File

@ -145,7 +145,7 @@ static int compressor_config_output(AVFilterLink *outlink)
} }
static void compressor(SidechainCompressContext *s, static void compressor(SidechainCompressContext *s,
double *sample, const double *scsrc, int nb_samples, const double *src, double *dst, const double *scsrc, int nb_samples,
double level_in, double level_sc, double level_in, double level_sc,
AVFilterLink *inlink, AVFilterLink *sclink) AVFilterLink *inlink, AVFilterLink *sclink)
{ {
@ -179,9 +179,10 @@ static void compressor(SidechainCompressContext *s,
s->compressed_knee_stop, s->detection); s->compressed_knee_stop, s->detection);
for (c = 0; c < inlink->channels; c++) for (c = 0; c < inlink->channels; c++)
sample[c] *= level_in * (gain * makeup * mix + (1. - mix)); dst[c] = src[c] * level_in * (gain * makeup * mix + (1. - mix));
sample += inlink->channels; src += inlink->channels;
dst += inlink->channels;
scsrc += sclink->channels; scsrc += sclink->channels;
} }
} }
@ -212,7 +213,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame)
sample = (double *)s->input_frame[0]->data[0]; sample = (double *)s->input_frame[0]->data[0];
scsrc = (const double *)s->input_frame[1]->data[0]; scsrc = (const double *)s->input_frame[1]->data[0];
compressor(s, sample, scsrc, nb_samples, compressor(s, sample, sample, scsrc, nb_samples,
s->level_in, s->level_sc, s->level_in, s->level_sc,
ctx->inputs[0], ctx->inputs[1]); ctx->inputs[0], ctx->inputs[1]);
ret = ff_filter_frame(outlink, s->input_frame[0]); ret = ff_filter_frame(outlink, s->input_frame[0]);
@ -340,19 +341,34 @@ AVFilter ff_af_sidechaincompress = {
#endif /* CONFIG_SIDECHAINCOMPRESS_FILTER */ #endif /* CONFIG_SIDECHAINCOMPRESS_FILTER */
#if CONFIG_ACOMPRESSOR_FILTER #if CONFIG_ACOMPRESSOR_FILTER
static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *frame) static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *in)
{ {
const double *src = (const double *)in->data[0];
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
SidechainCompressContext *s = ctx->priv; SidechainCompressContext *s = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
double *sample; AVFrame *out;
double *dst;
sample = (double *)frame->data[0]; if (av_frame_is_writable(in)) {
compressor(s, sample, sample, frame->nb_samples, out = in;
} else {
out = ff_get_audio_buffer(inlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
}
av_frame_copy_props(out, in);
}
dst = (double *)out->data[0];
compressor(s, src, dst, src, in->nb_samples,
s->level_in, s->level_in, s->level_in, s->level_in,
inlink, inlink); inlink, inlink);
return ff_filter_frame(outlink, frame); if (out != in)
av_frame_free(&in);
return ff_filter_frame(outlink, out);
} }
static int acompressor_query_formats(AVFilterContext *ctx) static int acompressor_query_formats(AVFilterContext *ctx)
@ -393,7 +409,6 @@ static const AVFilterPad acompressor_inputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.filter_frame = acompressor_filter_frame, .filter_frame = acompressor_filter_frame,
.needs_writable = 1,
}, },
{ NULL } { NULL }
}; };