History

avfilter/asrc_anullsrc: make number of output samples match duration

Paul B Mahol committed 6 years ago

Commit 0a17a481 parent aa8935b1 file · +13 −3Browse files

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

Unified · Split

libavfilter/asrc_anullsrc.c+13−3
@@ -93,19 +93,28 @@ static int query_formats(AVFilterContext *ctx) · 92 unmodified lines
9393 return ff_set_common_channel_layouts(ctx, ff_make_format64_list(chlayouts));
9494 }
9595
96+static av_cold int config_props(AVFilterLink *outlink)
97+{
98+ ANullContext *null = outlink->src->priv;
99+
100+ if (null->duration >= 0)
101+ null->duration = av_rescale(null->duration, null->sample_rate, AV_TIME_BASE);
102+
103+ return 0;
104+}
105+
96106 static int activate(AVFilterContext *ctx)
97107 {
98108 ANullContext *null = ctx->priv;
99109 AVFilterLink *outlink = ctx->outputs[0];
100110
101− if (null->duration >= 0 &&
102− av_rescale_q(null->pts, outlink->time_base, AV_TIME_BASE_Q) >= null->duration) {
111+ if (null->duration >= 0 && null->pts >= null->duration) {
103112 ff_outlink_set_status(outlink, AVERROR_EOF, null->pts);
104113 return 0;
105114 }
106115
107116 if (ff_outlink_frame_wanted(outlink)) {
108− AVFrame *samplesref = ff_get_audio_buffer(outlink, null->nb_samples);
117+ AVFrame *samplesref = ff_get_audio_buffer(outlink, null->duration >= 0 ? FFMIN(null->nb_samples, null->duration - null->pts) : null->nb_samples);
109118 int ret;
110119
111120 if (!samplesref)
@@ -128,6 +137,7 @@ static const AVFilterPad avfilter_asrc_anullsrc_outputs[] = { · 16 unmodified lines
128137 {
129138 .name = "default",
130139 .type = AVMEDIA_TYPE_AUDIO,
140+ .config_props = config_props,
131141 },
132142 { NULL }
133143 };

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