virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avfilter/af_afftdn: switch to activate

Browse Source
This commit is contained in:
Paul B Mahol 2018-10-28 14:27:32 +01:00
parent bdfd2e3c79
commit bb54c0ae71
1 changed files with 129 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libavfilter/af_afftdn.c
View File

@ -28,6 +28,7 @@
#include "avfilter.h"
#include "audio.h"
#include "formats.h"
#include "filters.h"
#define C (M_LN10 * 0.1)
#define RATIO 0.98
@ -1153,7 +1154,7 @@ static void get_auto_noise_levels(AudioFFTDeNoiseContext *s,
}
}
static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
static int output_frame(AVFilterLink *inlink)
{
AVFilterContext *ctx = inlink->dst;
AVFilterLink *outlink = ctx->outputs[0];
@ -1162,15 +1163,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
ThreadData td;
int ret = 0;
if (s->pts == AV_NOPTS_VALUE)
s->pts = frame->pts;
ret = av_audio_fifo_write(s->fifo, (void **)frame->extended_data, frame->nb_samples);
av_frame_free(&frame);
if (ret < 0)
return ret;
while (av_audio_fifo_size(s->fifo) >= s->window_length) {
if (!in) {
in = ff_get_audio_buffer(outlink, s->window_length);
if (!in)
@ -1179,7 +1171,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
ret = av_audio_fifo_peek(s->fifo, (void **)in->extended_data, s->window_length);
if (ret < 0)
break;
return ret;
if (s->track_noise) {
for (int ch = 0; ch < inlink->channels; ch++) {
@ -1233,7 +1225,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
out = ff_get_audio_buffer(outlink, s->sample_advance);
if (!out) {
ret = AVERROR(ENOMEM);
break;
goto end;
}
for (int ch = 0; ch < inlink->channels; ch++) {
@ -1267,14 +1259,51 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
out->pts = s->pts;
ret = ff_filter_frame(outlink, out);
if (ret < 0)
break;
goto end;
s->pts += s->sample_advance;
}
end:
av_frame_free(&in);
return ret;
}
static int activate(AVFilterContext *ctx)
{
AVFilterLink *inlink = ctx->inputs[0];
AVFilterLink *outlink = ctx->outputs[0];
AudioFFTDeNoiseContext *s = ctx->priv;
AVFrame *frame = NULL;
int ret;
FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
ret = ff_inlink_consume_frame(inlink, &frame);
if (ret < 0)
return ret;
if (ret > 0) {
if (s->pts == AV_NOPTS_VALUE)
s->pts = frame->pts;
ret = av_audio_fifo_write(s->fifo, (void **)frame->extended_data, frame->nb_samples);
av_frame_free(&frame);
if (ret < 0)
return ret;
}
if (av_audio_fifo_size(s->fifo) >= s->window_length)
return output_frame(inlink);
FF_FILTER_FORWARD_STATUS(inlink, outlink);
if (ff_outlink_frame_wanted(outlink) &&
av_audio_fifo_size(s->fifo) < s->window_length) {
ff_inlink_request_frame(inlink);
return 0;
}
return FFERROR_NOT_READY;
}
static av_cold void uninit(AVFilterContext *ctx)
{
AudioFFTDeNoiseContext *s = ctx->priv;
@ -1393,7 +1422,6 @@ static const AVFilterPad inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_AUDIO,
.filter_frame = filter_frame,
.config_props = config_input,
},
{ NULL }
@ -1413,6 +1441,7 @@ AVFilter ff_af_afftdn = {
.query_formats = query_formats,
.priv_size = sizeof(AudioFFTDeNoiseContext),
.priv_class = &afftdn_class,
.activate = activate,
.uninit = uninit,
.inputs = inputs,
.outputs = outputs,