History

avfilter/asrc_anullsrc: switch to activate

Allow to set the EOF timestamp.

Paul B Mahol committed 6 years ago

Commit e8819d81 parent 615d75f1 file · +24 −16Browse files

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

Unified · Split

libavfilter/asrc_anullsrc.c+24−16
@@ -32,6 +32,7 @@ · 31 unmodified lines
3232 #include "libavutil/opt.h"
3333 #include "audio.h"
3434 #include "avfilter.h"
35+#include "filters.h"
3536 #include "internal.h"
3637
3738 typedef struct ANullContext {
@@ -105,28 +106,35 @@ static int config_props(AVFilterLink *outlink) · 67 unmodified lines
105106 return 0;
106107 }
107108
108−static int request_frame(AVFilterLink *outlink)
109+static int activate(AVFilterContext *ctx)
109110 {
110− int ret;
111− ANullContext *null = outlink->src->priv;
112− AVFrame *samplesref;
111+ ANullContext *null = ctx->priv;
112+ AVFilterLink *outlink = ctx->outputs[0];
113113
114114 if (null->duration >= 0 &&
115− av_rescale_q(null->pts, outlink->time_base, AV_TIME_BASE_Q) >= null->duration)
116− return AVERROR_EOF;
115+ av_rescale_q(null->pts, outlink->time_base, AV_TIME_BASE_Q) >= null->duration) {
116+ ff_outlink_set_status(outlink, AVERROR_EOF, null->pts);
117+ return 0;
118+ }
117119
118− samplesref = ff_get_audio_buffer(outlink, null->nb_samples);
119− if (!samplesref)
120− return AVERROR(ENOMEM);
120+ if (ff_outlink_frame_wanted(outlink)) {
121+ AVFrame *samplesref = ff_get_audio_buffer(outlink, null->nb_samples);
122+ int ret;
121123
122− samplesref->pts = null->pts;
124+ if (!samplesref)
125+ return AVERROR(ENOMEM);
123126
124− ret = ff_filter_frame(outlink, samplesref);
125− if (ret < 0)
126− return ret;
127+ samplesref->pts = null->pts;
128+
129+ ret = ff_filter_frame(outlink, samplesref);
130+ if (ret < 0)
131+ return ret;
132+
133+ null->pts += null->nb_samples;
134+ return 0;
135+ }
127136
128− null->pts += null->nb_samples;
129− return ret;
137+ return FFERROR_NOT_READY;
130138 }
131139
132140 static const AVFilterPad avfilter_asrc_anullsrc_outputs[] = {
@@ -134,7 +142,6 @@ static const AVFilterPad avfilter_asrc_anullsrc_outputs[] = { · 1 unmodified line
134142 .name = "default",
135143 .type = AVMEDIA_TYPE_AUDIO,
136144 .config_props = config_props,
137− .request_frame = request_frame,
138145 },
139146 { NULL }
140147 };
@@ -147,5 +154,6 @@ AVFilter ff_asrc_anullsrc = { · 6 unmodified lines
147154 .priv_size = sizeof(ANullContext),
148155 .inputs = NULL,
149156 .outputs = avfilter_asrc_anullsrc_outputs,
157+ .activate = activate,
150158 .priv_class = &anullsrc_class,
151159 };

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