History

avfilter/af_surround: switch to activate

Paul B Mahol committed 7 years ago

Commit ce15c3a1 parent 7a128ac1 file · +65 −42Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/af_surround.c+65−42
@@ -24,6 +24,8 @@ · 23 unmodified lines
2424 #include "libavcodec/avfft.h"
2525 #include "avfilter.h"
2626 #include "audio.h"
27+#include "filters.h"
28+#include "internal.h"
2729 #include "formats.h"
2830 #include "window_func.h"
2931
@@ -90,6 +92,7 @@ typedef struct AudioSurroundContext { · 60 unmodified lines
9092 float *window_func_lut;
9193
9294 int64_t pts;
95+ int eof;
9396
9497 void (*filter)(AVFilterContext *ctx);
9598 void (*upmix_stereo)(AVFilterContext *ctx,
@@ -1491,70 +1494,91 @@ static int ifft_channel(AVFilterContext *ctx, void *arg, int ch, int nb_jobs) · 1395 unmodified lines
14911494 return 0;
14921495 }
14931496
1494−static int filter_frame(AVFilterLink *inlink, AVFrame *in)
1497+static int filter_frame(AVFilterLink *inlink)
14951498 {
14961499 AVFilterContext *ctx = inlink->dst;
14971500 AVFilterLink *outlink = ctx->outputs[0];
14981501 AudioSurroundContext *s = ctx->priv;
1502+ AVFrame *out;
14991503 int ret;
15001504
1501− ret = av_audio_fifo_write(s->fifo, (void **)in->extended_data,
1502− in->nb_samples);
1503− if (ret >= 0 && s->pts == AV_NOPTS_VALUE)
1504− s->pts = in->pts;
1505−
1506− av_frame_free(&in);
1505+ ret = av_audio_fifo_peek(s->fifo, (void **)s->input->extended_data, s->buf_size);
15071506 if (ret < 0)
15081507 return ret;
15091508
1510− while (av_audio_fifo_size(s->fifo) >= s->buf_size) {
1511− AVFrame *out;
1509+ ctx->internal->execute(ctx, fft_channel, NULL, NULL, inlink->channels);
15121510
1513− ret = av_audio_fifo_peek(s->fifo, (void **)s->input->extended_data, s->buf_size);
1514− if (ret < 0)
1515− return ret;
1511+ s->filter(ctx);
15161512
1517− ctx->internal->execute(ctx, fft_channel, NULL, NULL, inlink->channels);
1513+ out = ff_get_audio_buffer(outlink, s->hop_size);
1514+ if (!out)
1515+ return AVERROR(ENOMEM);
15181516
1519− s->filter(ctx);
1517+ ctx->internal->execute(ctx, ifft_channel, out, NULL, outlink->channels);
15201518
1521− out = ff_get_audio_buffer(outlink, s->hop_size);
1522− if (!out)
1523− return AVERROR(ENOMEM);
1519+ out->pts = s->pts;
1520+ if (s->pts != AV_NOPTS_VALUE)
1521+ s->pts += av_rescale_q(out->nb_samples, (AVRational){1, outlink->sample_rate}, outlink->time_base);
1522+ av_audio_fifo_drain(s->fifo, FFMIN(av_audio_fifo_size(s->fifo), s->hop_size));
15241523
1525− ctx->internal->execute(ctx, ifft_channel, out, NULL, outlink->channels);
1524+ return ff_filter_frame(outlink, out);
1525+}
15261526
1527− out->pts = s->pts;
1528− if (s->pts != AV_NOPTS_VALUE)
1529− s->pts += av_rescale_q(out->nb_samples, (AVRational){1, outlink->sample_rate}, outlink->time_base);
1530− av_audio_fifo_drain(s->fifo, s->hop_size);
1531− ret = ff_filter_frame(outlink, out);
1527+static int activate(AVFilterContext *ctx)
1528+{
1529+ AVFilterLink *inlink = ctx->inputs[0];
1530+ AVFilterLink *outlink = ctx->outputs[0];
1531+ AudioSurroundContext *s = ctx->priv;
1532+ AVFrame *in = NULL;
1533+ int ret = 0, status;
1534+ int64_t pts;
1535+
1536+ FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
1537+
1538+ if (!s->eof && av_audio_fifo_size(s->fifo) < s->buf_size) {
1539+ ret = ff_inlink_consume_frame(inlink, &in);
15321540 if (ret < 0)
15331541 return ret;
1534− }
15351542
1536− return 0;
1537−}
1543+ if (ret > 0) {
1544+ ret = av_audio_fifo_write(s->fifo, (void **)in->extended_data,
1545+ in->nb_samples);
1546+ if (ret >= 0 && s->pts == AV_NOPTS_VALUE)
1547+ s->pts = in->pts;
15381548
1539−static int request_frame(AVFilterLink *outlink)
1540−{
1541− AVFilterContext *ctx = outlink->src;
1542− AudioSurroundContext *s = ctx->priv;
1543− int ret = 0;
1549+ av_frame_free(&in);
1550+ if (ret < 0)
1551+ return ret;
1552+ }
1553+ }
15441554
1545− ret = ff_request_frame(ctx->inputs[0]);
1555+ if ((av_audio_fifo_size(s->fifo) >= s->buf_size) ||
1556+ (av_audio_fifo_size(s->fifo) > 0 && s->eof)) {
1557+ ret = filter_frame(inlink);
1558+ if (av_audio_fifo_size(s->fifo) >= s->buf_size)
1559+ ff_filter_set_ready(ctx, 100);
1560+ return ret;
1561+ }
15461562
1547− if (ret == AVERROR_EOF && av_audio_fifo_size(s->fifo) > 0 && av_audio_fifo_size(s->fifo) < s->buf_size) {
1548− AVFrame *in;
1563+ if (!s->eof && ff_inlink_acknowledge_status(inlink, &status, &pts)) {
1564+ if (status == AVERROR_EOF) {
1565+ s->eof = 1;
1566+ if (av_audio_fifo_size(s->fifo) >= 0) {
1567+ ff_filter_set_ready(ctx, 100);
1568+ return 0;
1569+ }
1570+ }
1571+ }
15491572
1550− in = ff_get_audio_buffer(outlink, s->buf_size - av_audio_fifo_size(s->fifo));
1551− if (!in)
1552− return AVERROR(ENOMEM);
1553− ret = filter_frame(ctx->inputs[0], in);
1554− av_audio_fifo_drain(s->fifo, s->buf_size);
1573+ if (s->eof && av_audio_fifo_size(s->fifo) <= 0) {
1574+ ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
1575+ return 0;
15551576 }
15561577
1557− return ret;
1578+ if (!s->eof)
1579+ FF_FILTER_FORWARD_WANTED(outlink, inlink);
1580+
1581+ return FFERROR_NOT_READY;
15581582 }
15591583
15601584 static av_cold void uninit(AVFilterContext *ctx)
@@ -1649,7 +1673,6 @@ static const AVFilterPad inputs[] = { · 88 unmodified lines
16491673 {
16501674 .name = "default",
16511675 .type = AVMEDIA_TYPE_AUDIO,
1652− .filter_frame = filter_frame,
16531676 .config_props = config_input,
16541677 },
16551678 { NULL }
@@ -1659,7 +1682,6 @@ static const AVFilterPad outputs[] = { · 3 unmodified lines
16591682 {
16601683 .name = "default",
16611684 .type = AVMEDIA_TYPE_AUDIO,
1662− .request_frame = request_frame,
16631685 .config_props = config_output,
16641686 },
16651687 { NULL }
@@ -1673,6 +1695,7 @@ AVFilter ff_af_surround = { · 7 unmodified lines
16731695 .priv_class = &surround_class,
16741696 .init = init,
16751697 .uninit = uninit,
1698+ .activate = activate,
16761699 .inputs = inputs,
16771700 .outputs = outputs,
16781701 .flags = AVFILTER_FLAG_SLICE_THREADS,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t