From patchwork Fri Dec 10 21:37:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32279 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2374420iog; Fri, 10 Dec 2021 13:39:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJytNSiYUUjdCe/dsuTh3gjDeKtJzCeS2+viMIWs4nZ40ALzDmAJJZmt7biFDtG3wwTL4mv5 X-Received: by 2002:a05:6402:1849:: with SMTP id v9mr42517511edy.335.1639172394652; Fri, 10 Dec 2021 13:39:54 -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 he37si6326502ejc.529.2021.12.10.13.39.54; Fri, 10 Dec 2021 13:39:54 -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=W14rKF+P; 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 8DE2268AF18; Fri, 10 Dec 2021 23:37:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12olkn2068.outbound.protection.outlook.com [40.92.23.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D4EC068AEC8 for ; Fri, 10 Dec 2021 23:37:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=naONqsZSjjuT6rmM7tpyeUe/ii6YuHvuPzACWV5sgparVgzftld4bo2AoH6iNk6QxE5ZhewpoGjfOCTHpwpJLyHzNPzydVxmQQRpRUMmYdx9oS7bv70lLn8kNA5JgUG3SiKcBrJokk9yLxz9JMCBQVFBWeCCh6/q+ybJ9rngV8DCMYAovtOizY9VrOFVSwX8WvapVt9/TapCxm4h6YVL5L8i4vGGfJFVLYKqWh46Y6QLIQBBcU3FhFGQ0WSSYHXXjy3VJ5+W1jRTM+HLaD0bv5VLxqzjUYl3s0QS552l2QAFARYBAPd8JdQqji5BMJ/jf4SD84Fb3fVJJiwEAuxdsA== 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=ZrCo+ubzvPlkFr8aPuJJpGu7PRHLaaVFeJaq4oYF9HEItugmvlkQuieNseYOjbZsPW8zRiB0hHODAAuZx1S4VuoN6Y2P9zjW8FYNWPS0PfJZFwf6wLDxGCdMLPnuyISj8cFFtqaogJig/iODlGTcX7WXfvF3IIrGOsFAZl14DB18Mac5SvxwcXFLMRiTUG9bcCC1c98UJKyKj6Gr8K9KjwolQpEAWhsoYfwHSBuZ/VwTS4g3u8IoMSnzVf/UueqBpGfv2i7iCyQdX/ZYbarS0YBTPERBfHNVof1JkuIO+gnotpdzL8d+8LDCt3J+ZD7nINy/+dHzFQ24f/9Pi4p1ZA== 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=W14rKF+P6S4yuZLEVoqVqPnd8ppOnfG1vRyaTe36yYu1RTQfbbt0E1P1iKr3SnFUpmSn7WEjIost1fLmQLR/opoYyQ6IVjj3KhNZEns669Pdq1FE8j2/G4GFe0TP+i5Y3dXh5XMoaYnhLNYgFyLi+qtOqr6diavHKch6Y9sdUTrCYKT57n7rpPonv7w0mQ91nfM5+D09VPYVTPGXRkpr0lyavUOoO52ZJUQKEFtdTM4+tYG9hPRKe18Gr1QYoaUrlASaD/NNi0+jWYtTWMUtPrUklKNiIN8w9DLjXeZ9d8Z3MHxeIlc28LhvmqnE5JmVyH47q775EeGfVQ51toTgNw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0191.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Fri, 10 Dec 2021 21:37:50 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%7]) with mapi id 15.20.4778.015; Fri, 10 Dec 2021 21:37:50 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v23 14/21] avfilter/avfilter: Fix hardcoded input index Thread-Index: AQHX7g4tiZ2d9LmtJki1tqjVDMbQ2g== Date: Fri, 10 Dec 2021 21:37:49 +0000 Message-ID: References: <84c6ba3b99bf387e818d59f2161009ead8fb5767.1639172095.git.softworkz@hotmail.com> <0b41271ed30b530c1d55a9b824fc8bbbbd14fe5e.1639172095.git.softworkz@hotmail.com> <9f2875d043147119351f59b6410d718d170574e1.1639172095.git.softworkz@hotmail.com> <62a926e2d86310039653324bdf2a856f09a0fb46.1639172095.git.softworkz@hotmail.com> <75bb9ceffef9e8e2d05ffce8a51c1991d5d3a973.1639172095.git.softworkz@hotmail.com> <554aab35996d92c90ab3b0ecb2c0c6c1278479d6.1639172095.git.softworkz@hotmail.com> <65992926f9356948d7f937ab852f8320b3da4bd9.1639172095.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: [N+TT3NZv42Z6ao4TMtUhdC9ctr2P4EtR] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b0ba1a75-bafd-4995-7b33-08d9bc255085 x-ms-traffictypediagnostic: DM8P223MB0191:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: caWhnt/ZxhBTtvmdUd76oD32ihF/YNBR3qOT8EDeWJM3BDRbbXrejEbQOo3FNXlWw1VBxOqCqoH1PpTefHFFZ3boOMPawYxcdfWvvnzDLYbYT3rK/YQ1d54mvFROJ0YdpE3Wx+TvnzCZxjkvEh8aL2TBGYajLaBwC9Y0meeISlYOYGKaJcWsFSXKzFI2QWOJMZGkYB1gI67rMoiy4anHqWpVOE3P1vkH8M6LNusrKVe1OR+tNaY4jJW+FjYfQ27SrDAvqcJP4p7kAo3d0VJND5IHE15edSSMXMd/vQM5YQ+GaKquT0/MbTqD5n9xf0ktKJDjhSgpCiV43JRDBzepogY4Sw6wjqzeR55GsM32s9H+Zw3ywuF/Olhpwin6XGcSU6bNO0B7Kyx9MCsTNihMNTA8o33/2MXCgc/JzOJBSITKVwBAcpgnLGDkFJLgkpKYjPuA3lqG5AhAScM25YGdRkCIaAR58bsly7IywJGBMfZfr+LdCjdGkWPVZiAGXahqB/fdxFJPaPOhn3h1Y1Rgwun+6EiN8pFh55o0ndWVDywUpfS4ppWe3sYGnf3lCdrFddICsWfwh2NbAwdi3uV4yQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?PkJHHwJPj2m3y2Yt3miO1Y8N73FP?= =?utf-8?q?RjX+nroq71TDFaCgtqxQSl/3z5lT7aIrmEwpvH7BqPjIzWWyAVTsB3weneUzCmgvQ?= =?utf-8?q?TjiVuL9IdCSL/hYHLkq9wDrjTDTxzEzKVv3a//iEL3ffYTEOJD33jveZMa/o0Ayl3?= =?utf-8?q?soPhgyN24Qeub6GGh3U6gPQtJhW3R64ED4a9Ly76yGU4/cXP8pQUnKABFszJAXy8Z?= =?utf-8?q?ZlWSygeNuA7x4Lwub+19Z4/sxUY4ZXaM8kLtQm9JKtSONVH2G064hUrFWEh1Jr2Ai?= =?utf-8?q?6p3muxy8t7conqpLDuI/fEdoTKmasNBGZxF5I91wq9crkwVuBUzg/wl4sRSklG/Gu?= =?utf-8?q?36w4ASeoSdRr/ZUlccfq22PtB9FLjqRZXkWEMHS9zl2RodqhEOX7eTwz8qWRFX9ZO?= =?utf-8?q?9YC2bQlczrTu/wfNR0kUFRPAjZ2RgVYl6VFS/nOt91POMixWj4fzyRJCP0JawAmRX?= =?utf-8?q?yaVP5AvdFhEFCE7E4yYNuYwj9O9gPvaH/dkYTAE0OVshwVvmc2DBg2ue0+jV2gFiF?= =?utf-8?q?E8AN3q2qxPq90cwPF8mRK4Tcjkre7z1I3nqBsxegFHU0FlJLHLChdfMYQQ51ejeCf?= =?utf-8?q?RoujoMGl8SZarJg/ZsdX0VL+jdXRm7A7MjBaj5ICUtuYc7IMaeDQdNymRIfXzi7Bj?= =?utf-8?q?OPwDcaOKo85kF0sN2XjOlmemC9YiIJqs78uq01884ple78Sa7YCI2Erh6mjYHfvE7?= =?utf-8?q?Moj3VPJbeDSVSl6c08+tuXihUt6GE27Ef0l0ah4gSIl9iueFf9Rt9r8rnpftblgBk?= =?utf-8?q?ByNBusAuH7YyFGkyOLbT5LcybHkuDXVA32Di0m6VVnI8mIFHSSEQttJHOHLIrBQs1?= =?utf-8?q?/UruuPO6VLDVjKpayPeTRtgOcPyzucehqrzzv0FWMqjidsL09AzDyIDsRxwDqzFm/?= =?utf-8?q?H69YDbqfDnKhivMGdM8NP9AhS0rsmv5OEwWo3NFap3tw=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.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: b0ba1a75-bafd-4995-7b33-08d9bc255085 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Dec 2021 21:37:49.9516 (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: DM8P223MB0191 Subject: [FFmpeg-devel] [PATCH v23 14/21] 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: aufimgqOgMUh 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;