From patchwork Sat Jun 25 09:57:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp825785pzh; Sat, 25 Jun 2022 02:59:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vPzyUT9dSQXhs94ABhlmLhQuwooSx85VFctFUYqRP4FovbMCagm1kvCQ41yfnI75bco9d2 X-Received: by 2002:a17:907:1b0d:b0:6ff:22a1:d58a with SMTP id mp13-20020a1709071b0d00b006ff22a1d58amr3178635ejc.293.1656151188053; Sat, 25 Jun 2022 02:59:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656151188; cv=none; d=google.com; s=arc-20160816; b=PVhgtmdoKLv1cj1n2vKkv7MBvJ4jCVfQh+wJMt9Gc7IoleZZpSEBieH2yEX1J5An/u 3zneKuZstbg7HT4zbQ761bLNJreL32lGXamLow2eOwsX4ss1/vWDYl+r27MFTLojd2Wo 6vWVEPeLKMq8Ki5d2xkGThj0Opo1D15OX66PBReMTUJom9oZ3pHlqe3Jirix8k4H/X/2 tQBAMy1e5W/pPr903uTT3MEtjDlI2g5F8cQvEoWa3a927+EVrlm60slIYGV8OPpRQzKq vV9WsHIIcGZIP+mnquN93DMtE+DST+zbW7dpg1HzN0pXfEGLj5LkOqMQWx5PndUn+E+v T2Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=UtqzexoT4Ezmtfi57f7x4tIuzPiZzyGh8hkddPuZOVE=; b=0CNwFvggm+5c4j3bpdJyRoyY5AmZJPRrOhbGF6kpSlfeNVFaq3v2MFe/ut8SPeok30 WFLHoMVyY4JB3B5fNdQFw7MemTaLCXwNBVT/HxwDayoZHpgnLdp3i4Cg22mjCv0QZLCB 0PYShkUryQ0+dNp0iZQGn/tHmpiMPA3xozpGVg6RNGhyYuPdR5FTTws3AbyzcfYS4JGE ZiYUEpH2B9k0pBYhLLZq3GfcNcPXmmMrjuf8JjXHFXSKDTy89ZoNX7WEfVz8wGAmIc5/ 25LM42emYeIpdR/QFC87yvm72/CC5ilQMNH3VZlrbrQaZtm15J8HRVYdSbYAOsLDx47T NNrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QdmF5rJm; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nb28-20020a1709071c9c00b00707e0e3cd7csi5689853ejc.359.2022.06.25.02.59.47; Sat, 25 Jun 2022 02:59:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QdmF5rJm; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A3B0D68B851; Sat, 25 Jun 2022 12:58:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C687B68B3D1 for ; Sat, 25 Jun 2022 12:58:15 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id cv13so4875993pjb.4 for ; Sat, 25 Jun 2022 02:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=HvaSrUNkdYU7ZKtqQZac5tap7Ome60MMPRJc94yc6OY=; b=QdmF5rJmD/vSjecr+pBdFnhO+/MrdpffGMJquvzPr7li/5aROkh8BcMV3RhcHIXh3n sxAKYQ5Z/6TKQEs51yQW5LSu6eWxtJG2ODKBY5XxTxBZ/crEXHPhMsaUERVh4snhBlat VFaSaRtOY9SnpEu5Zn834+b5EpwyE/+/E51LlZLKahulnR887NLbREbsh7Nl3+X4NJu0 Nk2IRKGbgzPt54nbJ6sRTxYCvyMrfVp5QBP1WAWnqmK9HRczYMXlHWvrw8AhoKHFrnkF ZFU2xkHbcUihvksIU9Oi1F36C9eeFOHHUdHMarvIHtVOfIOgSAAEiQkg3xcsNNluCq8K NuWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=HvaSrUNkdYU7ZKtqQZac5tap7Ome60MMPRJc94yc6OY=; b=eRZE/Aj0PhFGtW8NGequ0UaRKqWBreOYC2Ix6a7M4JLe7PAihBbg1FTh7GFmPOV16Z 5uj3IYI2SQQihJ3Nij5rtAPo4QoVP8V5f5z+ro/4IB4LMdlWvJ89RTjcf9CWwBqHoukk ZrBmmdXmTqFPVQhA6EINETooiv810dx2z5jUJYRzhq6ikrwMmBbpew+xjsHep4Ws+8Eh BMsPpQIvwWtxzUj1nVE/qcOxyg6FR6tqH7rzQserQGuDncxgExqlazy7lHv6zs7ehiMY VO++MmTA2auxpPTU6QpSeWQuOa8/+cMD0ySW+ogaQs/uyQgWUMVF+3cxWxWkGZh7uMLf oFyA== X-Gm-Message-State: AJIora8VFaPYICrxka8v2iFfHrYvJYXO54FMkcXBZjwlss8RpKmOC92k r7T+2mgP1cPqW07y8Nsrma+1F3+9MfVRMw== X-Received: by 2002:a17:90b:c82:b0:1ec:b80a:676 with SMTP id o2-20020a17090b0c8200b001ecb80a0676mr9049954pjz.45.1656151094210; Sat, 25 Jun 2022 02:58:14 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id h9-20020a170902f70900b001663cf001besm3268890plo.174.2022.06.25.02.58.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Jun 2022 02:58:13 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <36cab55ff2da9a7c3d801f2c0198a1c02804ed7a.1656151077.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sat, 25 Jun 2022 09:57:43 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 11/25] avfilter/avfilter: Fix hardcoded input index 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: Michael Niedermayer , softworkz , Andriy Gelman , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4Qqpef3/P1mc From: softworkz This fix targets (rare) cases where multiple input pads have a .filter_frame function. ff_request_frame_to_filter needs to call ff_request_frame with the correct input pad instead of the hardcoded first one. Signed-off-by: softworkz --- libavfilter/avfilter.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 30745f41cb..6cbfc54a85 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -443,7 +443,7 @@ static int64_t guess_status_pts(AVFilterContext *ctx, int status, AVRational lin return AV_NOPTS_VALUE; } -static int ff_request_frame_to_filter(AVFilterLink *link) +static int ff_request_frame_to_filter(AVFilterLink *link, int input_index) { int ret = -1; @@ -452,8 +452,8 @@ static int ff_request_frame_to_filter(AVFilterLink *link) link->frame_blocked_in = 1; if (link->srcpad->request_frame) ret = link->srcpad->request_frame(link); - else if (link->src->inputs[0]) - ret = ff_request_frame(link->src->inputs[0]); + else if (link->src->inputs[input_index]) + ret = ff_request_frame(link->src->inputs[input_index]); if (ret < 0) { if (ret != AVERROR(EAGAIN) && ret != link->status_in) ff_avfilter_link_set_in_status(link, ret, guess_status_pts(link->src, ret, link->time_base)); @@ -1153,6 +1153,14 @@ static int forward_status_change(AVFilterContext *filter, AVFilterLink *in) { unsigned out = 0, progress = 0; int ret; + int input_index = 0; + + for (int i = 0; i < in->dst->nb_inputs; i++) { + if (&in->dst->input_pads[i] == in->dstpad) { + input_index = i; + break; + } + } av_assert0(!in->status_out); if (!filter->nb_outputs) { @@ -1162,7 +1170,7 @@ static int forward_status_change(AVFilterContext *filter, AVFilterLink *in) while (!in->status_out) { if (!filter->outputs[out]->status_in) { progress++; - ret = ff_request_frame_to_filter(filter->outputs[out]); + ret = ff_request_frame_to_filter(filter->outputs[out], input_index); if (ret < 0) return ret; } @@ -1199,7 +1207,7 @@ static int ff_filter_activate_default(AVFilterContext *filter) for (i = 0; i < filter->nb_outputs; i++) { if (filter->outputs[i]->frame_wanted_out && !filter->outputs[i]->frame_blocked_in) { - return ff_request_frame_to_filter(filter->outputs[i]); + return ff_request_frame_to_filter(filter->outputs[i], 0); } } return FFERROR_NOT_READY;