Marton Balint:
> Sinks without an activate callback (nullsink, anullsink) could cause
> AVERROR(EAGAIN)-s in avfilter_graph_request_oldest() even when all the filter
> graphs inputs were in EOF state.
>
> Fixes ticket #11624.
> Fixes ticket #10988.
> Fixes ticket #10990.
>
> Signed-off-by: Marton Balint <c...@passwd.hu>
> ---
> libavfilter/avfiltergraph.c | 38 ++++++++++++++++++-------------------
> 1 file changed, 18 insertions(+), 20 deletions(-)
>
> diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
> index 2d6036df74..6f9f46f1ea 100644
> --- a/libavfilter/avfiltergraph.c
> +++ b/libavfilter/avfiltergraph.c
> @@ -1423,12 +1423,26 @@ void ff_avfilter_graph_update_heap(AVFilterGraph
> *graph, FilterLinkInternal *li)
> heap_bubble_down(graphi, li, li->age_index);
> }
>
> +static int process_legacy_sink_output(FilterLinkInternal *oldesti)
Why is considered legacy (instead of being just a different API)?
> +{
> + AVFilterLink *oldest = &oldesti->l.pub;
> + int ret;
> +
> + do {
> + if (oldesti->frame_wanted_out)
> + ret = ff_filter_graph_run_once(oldest->dst->graph);
> + else
> + ret = ff_request_frame(oldest);
> + } while (ret >= 0);
> +
> + return ret;
> +}
> +
> int avfilter_graph_request_oldest(AVFilterGraph *graph)
> {
> FFFilterGraph *graphi = fffiltergraph(graph);
> FilterLinkInternal *oldesti = graphi->sink_links[0];
> AVFilterLink *oldest = &oldesti->l.pub;
> - int64_t frame_count;
> int r;
>
> while (graphi->sink_links_count) {
> @@ -1437,13 +1451,11 @@ int avfilter_graph_request_oldest(AVFilterGraph
> *graph)
> if (fffilter(oldest->dst->filter)->activate) {
> r = av_buffersink_get_frame_flags(oldest->dst, NULL,
> AV_BUFFERSINK_FLAG_PEEK);
> - if (r != AVERROR_EOF)
> - return r;
> } else {
> - r = ff_request_frame(oldest);
> + r = process_legacy_sink_output(oldesti);
> }
> if (r != AVERROR_EOF)
> - break;
> + return r;
> av_log(oldest->dst, AV_LOG_DEBUG, "EOF on sink link %s:%s.\n",
> oldest->dst->name,
> oldest->dstpad->name);
> @@ -1453,21 +1465,7 @@ int avfilter_graph_request_oldest(AVFilterGraph *graph)
> oldesti->age_index);
> oldesti->age_index = -1;
> }
> - if (!graphi->sink_links_count)
> - return AVERROR_EOF;
> - av_assert1(!fffilter(oldest->dst->filter)->activate);
> - av_assert1(oldesti->age_index >= 0);
> - frame_count = oldesti->l.frame_count_out;
> - while (frame_count == oldesti->l.frame_count_out) {
> - r = ff_filter_graph_run_once(graph);
> - if (r == AVERROR(EAGAIN) &&
> - !oldesti->frame_wanted_out && !oldesti->frame_blocked_in &&
> - !oldesti->status_in)
> - (void)ff_request_frame(oldest);
> - else if (r < 0)
> - return r;
> - }
> - return 0;
> + return AVERROR_EOF;
> }
>
> int ff_filter_graph_run_once(AVFilterGraph *graph)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
