ffmpeg | branch: master | Marton Balint <c...@passwd.hu> | Mon Jun 16 22:24:36 2025 +0200| [ffcdd2cdc1cf0e8eb1516b070600f465f1ab0934] | committer: Marton Balint
avfilter/af_aresample: merge request_frame into activate function No functional change. Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffcdd2cdc1cf0e8eb1516b070600f465f1ab0934 --- libavfilter/af_aresample.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index 58e09906e0..703fb7c92d 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -302,14 +302,26 @@ static int flush_frame(AVFilterLink *outlink, int final, AVFrame **outsamplesref return 0; } -static int request_frame(AVFilterLink *outlink) +static int activate(AVFilterContext *ctx) { - AVFilterContext *ctx = outlink->src; AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; AResampleContext *aresample = ctx->priv; int ret = 0, status; int64_t pts; + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + + if (!aresample->eof && ff_inlink_queued_frames(inlink)) { + AVFrame *frame = NULL; + + ret = ff_inlink_consume_frame(inlink, &frame); + if (ret < 0) + return ret; + if (ret > 0) + return filter_frame(inlink, frame); + } + // First try to get data from the internal buffers if (aresample->more_data) { AVFrame *outsamplesref; @@ -346,28 +358,6 @@ static int request_frame(AVFilterLink *outlink) return 0; } -static int activate(AVFilterContext *ctx) -{ - AResampleContext *aresample = ctx->priv; - AVFilterLink *inlink = ctx->inputs[0]; - AVFilterLink *outlink = ctx->outputs[0]; - - FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - - if (!aresample->eof && ff_inlink_queued_frames(inlink)) { - AVFrame *frame = NULL; - int ret; - - ret = ff_inlink_consume_frame(inlink, &frame); - if (ret < 0) - return ret; - if (ret > 0) - return filter_frame(inlink, frame); - } - - return request_frame(outlink); -} - static const AVClass *resample_child_class_iterate(void **iter) { const AVClass *c = *iter ? NULL : swr_get_class(); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
