From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A51F14F21D for ; Mon, 16 Jun 2025 22:45:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3A94A68CEFC; Tue, 17 Jun 2025 01:44:23 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 55AF868CC70 for ; Tue, 17 Jun 2025 01:44:19 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 8BF4FED982; Tue, 17 Jun 2025 00:41:25 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4BAncfRrzy4d; Tue, 17 Jun 2025 00:41:23 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 426DDED96E; Tue, 17 Jun 2025 00:41:23 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Jun 2025 00:43:55 +0200 Message-ID: <20250616224404.16142-5-cus@passwd.hu> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250616224404.16142-1-cus@passwd.hu> References: <20250616224404.16142-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] avfilter/af_aresample: merge request_frame into activate function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marton Balint Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: No functional change. Signed-off-by: Marton Balint --- 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(); -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".