Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -93,19 +93,28 @@ static int query_formats(AVFilterContext *ctx) · 92 unmodified lines | |||
| 93 | return ff_set_common_channel_layouts(ctx, ff_make_format64_list(chlayouts)); | 93 | return ff_set_common_channel_layouts(ctx, ff_make_format64_list(chlayouts)); |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 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 | |||
| 96 | static int activate(AVFilterContext *ctx) | 106 | static int activate(AVFilterContext *ctx) |
| 97 | { | 107 | { |
| 98 | ANullContext *null = ctx->priv; | 108 | ANullContext *null = ctx->priv; |
| 99 | AVFilterLink *outlink = ctx->outputs[0]; | 109 | AVFilterLink *outlink = ctx->outputs[0]; |
| 100 | 110 | ||
| 101 | if (null->duration >= 0 && | 111 | if (null->duration >= 0 && null->pts >= null->duration) { |
| 102 | av_rescale_q(null->pts, outlink->time_base, AV_TIME_BASE_Q) >= null->duration) { | ||
| 103 | ff_outlink_set_status(outlink, AVERROR_EOF, null->pts); | 112 | ff_outlink_set_status(outlink, AVERROR_EOF, null->pts); |
| 104 | return 0; | 113 | return 0; |
| 105 | } | 114 | } |
| 106 | 115 | ||
| 107 | if (ff_outlink_frame_wanted(outlink)) { | 116 | 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); |
| 109 | int ret; | 118 | int ret; |
| 110 | 119 | ||
| 111 | if (!samplesref) | 120 | if (!samplesref) |
| @@ -128,6 +137,7 @@ static const AVFilterPad avfilter_asrc_anullsrc_outputs[] = { · 16 unmodified lines | |||
| 128 | { | 137 | { |
| 129 | .name = "default", | 138 | .name = "default", |
| 130 | .type = AVMEDIA_TYPE_AUDIO, | 139 | .type = AVMEDIA_TYPE_AUDIO, |
| 140 | .config_props = config_props, | ||
| 131 | }, | 141 | }, |
| 132 | { NULL } | 142 | { NULL } |
| 133 | }; | 143 | }; |