From patchwork Mon Nov 29 19:48:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31811 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6643785iob; Mon, 29 Nov 2021 11:50:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwOAGg78XiIP3JyAsRwdUqi533SAINMDy4kSGdOjDT8mHtq/yc+VY1/s0h8mG4Na8XUGx0r X-Received: by 2002:a05:6402:520e:: with SMTP id s14mr76090979edd.213.1638215455527; Mon, 29 Nov 2021 11:50:55 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j2si23054356edv.164.2021.11.29.11.50.55; Mon, 29 Nov 2021 11:50:55 -0800 (PST) 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=@hotmail.com header.s=selector1 header.b=sQtX74m6; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F47468AE8D; Mon, 29 Nov 2021 21:48:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2044.outbound.protection.outlook.com [40.92.40.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1749868AB64 for ; Mon, 29 Nov 2021 21:48:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H+eiiZqQrCKJL3WgF+0BPPcyEZBorLSwgVEVCjJIuWLDqKH1uImElyaDqVHZdtjmB995cUOlT6b3URygpOASRPmsZr+re8VUb7ULwgHENWf9J7e+J3XpcgtPbQcbvBnAjIiKqHu2Q07rnZ8BT/hCOqt4q4Dy1BB130ZBhJv+0HI7zdNzN+8CFvkXKF/cQzAMrruP1VyE4kUFaQOXRNO9tEEmxG3PzngLeCN4BKkM2drtbmgzyMQIwmcLtGnDMXojuZwrZRVqErKEmXIIIvq2icH6ZqzXKUCD7nz0bwWgct/zyfxDe9AmCPS4nAj2qHVyhH4nK4SoRjumhsE0SRDJcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PEr5v4/HVAs6sNUIpVFS6ON8WAePVTYCgWJ0N59LIZQ=; b=YnQuquuN9MQEyEQUa8KJD8j0qpxcACaUzb7AiRrK7cVNLlnTnBMAaa9wfIlHl/fAP15kOe7foAOPGU5MM7UsF4hdPuW6FSRiUVhK0CRGrVwDH4oV+WbgIJARsYSkIwzI6udGHPeSDUeHt9zgtyWqUhpqWF6WwCSCL7Qcft06rMxFAdCCItpmpKly+d3fal3BWUyOAuXnxWi0UF6fMz1AOiHEJKqG9dikmm31gI92Xg6U7OXIRFBXoV/NWdGIDCQg1b+aTGo98sY0o7IdtAfBKP8VtD/UQ5iq3lrwUYKi5Ge+PqAg1XDjQxtsizx4muvanqpkkQdZPHV3oY2e6j/HdA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PEr5v4/HVAs6sNUIpVFS6ON8WAePVTYCgWJ0N59LIZQ=; b=sQtX74m60m14VOutZp5WDWHXU3t/60yLCny358NZrLina++SW86UQqETlmA20uL6b4qpGDcsMLDz4wHn4x7dCgdZdthCqXRk2wZBuP6bm2u6B8PhQ1CUHnd2TFLgl3Go0mOd5mkzdxrp9+4I8eL3UerWtnadosNh0MGZYVO6QtCT8asqAiHWa1HbHOeTpcp9APjHM5qjhK/RQaLyDP7WbW5ibLGIsBoBPKPa9VjEuTgV3nBwM0l5+kwuC2vlUu1Pd9H9oHy8P3+eJioXuBmU2Kd9KRjfFetRi34Od6hkY1WgyF9/uKQkI6bT9pYT8Hdo/6Ij6P+pJ7G994N+y0Psjg== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0077.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Mon, 29 Nov 2021 19:48:34 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.024; Mon, 29 Nov 2021 19:48:34 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v18 13/19] avfilter/avfilter: Fix hardcoded input index Thread-Index: AQHX5VoY3y9ebY0kXkWNYTLTIuzmrQ== Date: Mon, 29 Nov 2021 19:48:34 +0000 Message-ID: References: <01697a451703d7b506c60d75c953dff19bbe05d9.1638214931.git.softworkz@hotmail.com> <3d54150a3bc909d1c4750ed07a00341f5c04ddb5.1638214931.git.softworkz@hotmail.com> <3e076dc07af205e1419f8bda2315bd115c5618cd.1638214931.git.softworkz@hotmail.com> <4c1b6a9fb0adf063c451a696a98fcef84400ddc4.1638214931.git.softworkz@hotmail.com> <1e73fc4f0ef6771376b372f8da0f8012777f714c.1638214931.git.softworkz@hotmail.com> <670883537cc8f8c0204ce1da7b711f3c6d264c99.1638214931.git.softworkz@hotmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [Tl5V6YwbYF4EgVEas5e2tkFscs7AsPoX] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0a1ca6ff-fe88-4482-b8a7-08d9b3713aa6 x-ms-traffictypediagnostic: DM8P223MB0077: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 8eMq9lbsGaMLDvxExE3pNldWBFhypkQ9bi4VA+7OYJMRIDSZMpfQh5H6hZ6g4eo81oqMGFFmbb6SHknf6aIJnylTP3jLN5SNrC6MF4wW5siz2FmcB6DblHdkg8wUwxFIdFJhPlv92sSgIhQakf+snUP2rms7mrjVHfFEBXT6vrnfyGqQhWA9tkPfjJyDBi8xMpLxTK/CU4LL2/VzUb/mvnBzmb5Om2R2zY9hK9oGhyOnLpGgJKJS8oIRE9HVD7kVkVOVBIFN3usblcLU5X2zKpTzx0sXPcMoX47d20IK/sCSnIh47u+rYmME/C/A2gtlaxF61apNWob8873DzsKoO8DVP5M62s6POqPK46wBQiMnTJXz+aa0LJfU6vv5iMMTS7hvpUH0e1kI5Lgwsk/hslVJJSO8Fcax5QwzeWRrdq7yHkLer5b4Ch+fFvi5PjHpmQPocHaJI2eDntTDi9w2jfRuL7XkDVw6OEiJUR1Q/hs/+1c4QbukC4SuF7YMrjoBX2ZfHsWO3CqVIma/IoJwZu0scCVtw8iklKT/SNyrheucUzCLGzvmAieyujX8UUXcteAfLB09nlUJz/mgnjPOlg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: mRo5noDFKghTn9uO3I2GABh2DmMYWECj941tiM6UkrosaPWJmFsSiYUuy5U9lGNaRp4Kb3alJM+ZnZw+h4lxnvsjF1ERzt8ZMY+DfFlw+VkVzfqvmPEz7oJ/v32Z4KDjTeA0SXFenFiXJsHQYLaWuZwaR7lcuqkRP0CeNvUmMtvFNKD9Msfk+cnMNUZ3pfha1q7MdF308GJ217fsUMagH2A89HtrQcTjUzdUIaVdE+xZ0HneZyra/Wb9lKlGIpm6yVttBEVq9Zu8SlkBk7bHbipygU7Wykr+dq3PEkBGNF6oDkNViGpfde3CxO6HTWkY73XVtQY6FTBPmT38gVBzwLVw+zbZ8vM0U9KZ0KoTv6m3P7LmhjpZ0/4LezOxbwJa0AswcDuzE5dpeb+p1U7kQ58u1pD3C4YRRGIRSGnuNJPhGqeGWS0NeS01g4sZ+cFxRPPKxi8ArhVVHKkrwo+6zFMqOykadYqXJ/qWpYMIBLKhG0288DRaa8jGSgdSguFmzzcfdGNSgLOXzpY8f8f736C3AUjykRw5fQ2ehNLDwlk1I7tvj2k4RTAPChtjuacl28K6HlQEl+hpPUU23losBYwKV9/vduSZLoIilgShmaK/J5i7+hl1L0SxgFSF1rgzxBwEBpezAYpd4lTznaR8fB88ida4ZtN++ceKXjeeyflKC0FlJB39+KPlVtxuHbMunudIlRnYuCgMnUVqXVwokA== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 0a1ca6ff-fe88-4482-b8a7-08d9b3713aa6 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2021 19:48:34.5122 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8P223MB0077 Subject: [FFmpeg-devel] [PATCH v18 13/19] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4Yz1h/u+ehpP 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 75d5e86539..aa9aa71f53 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -463,7 +463,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; @@ -472,8 +472,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)); @@ -1172,6 +1172,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) { @@ -1181,7 +1189,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; } @@ -1218,7 +1226,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;