From patchwork Sun Dec 5 19:41:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32019 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3629520iog; Sun, 5 Dec 2021 11:44:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJwsGsyA3khea/MFgblMWt1Nnvw+WwRuPgRqF3GjcCWi+J72KrbzJlYsDhdZJcE8+qxf7s37 X-Received: by 2002:a50:8d47:: with SMTP id t7mr45547127edt.14.1638733447980; Sun, 05 Dec 2021 11:44:07 -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 hq17si16771461ejc.499.2021.12.05.11.44.07; Sun, 05 Dec 2021 11:44:07 -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=gL9ZIau6; 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 8763468AFE2; Sun, 5 Dec 2021 21:42:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (unknown [40.92.23.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75AD668AFAA for ; Sun, 5 Dec 2021 21:41:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aLhx2mUtCsaVnTtS1bIhhvjXTcwOGnqSl/DN3OrrzVlxgdyQ4UJKeIU5d0Aj0YMhhQWRBHge2h8hyTRjO50I9B600OY6ON2sT11XvXOa+SaPP6GzggfMEFQgWNN56j0JUX3mUQl8uf7imHOyST8RDRp86kCZK2kuQpthpVng7yvAz37BNHwgd5PMTPiiU3AreUB3hwkXKwqQefHw/ylQivmQgveSWaDT+qxJQeTbbIjr3b6onJapHVbpv+gRrHes8jNlWIM/zInkqjdr+fDtOtTBH53LpXeQlxTaceN4b9+nqfc7R6iAWf6TpoYRnDooEJZwonhu1myc3f1knWK5Mg== 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=jFd3WDXD38DFVjhF8hVIpetzScL9CQW10W2b/L6ohCgVVyCKHlKBiYwiwngsaGSnbhEDZkodHo7Eq7TtWeadiWL36K4nOiM3Wwa7h1lLIui6h38cVqt24jSJxVyNOe44YnjfLzmvAmOMu4PbBl3/F3aRwYFqGbcfUf8doqooYcwY4Cf5QyDY8d4C3i+iJMbHOX8al4W1nWo1Ks3nCsr78ILy7g+NHgs7m8TQ581KHRSKUMtD2TKr5+0sCcce3h5pmQM+Ou8yacWVdpIS2y+FR+1NCUwSfTtR3kILzSzN9O/5u2l4gwyjX5+kSz8i7z1LlZDr639c0CWfzGBA3t1BeA== 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=gL9ZIau66p9do8+Xdyx2Yjs2EE7DN05Ke/BHX+n13i00TycXLx6c/i7jFr9Bm7mznzPWPHw8tZa3INVdQ/2RCVfDeGUlGqaLPsJ1UB9+mk3kigo9Ur6e+UOnCq2KEXnmkurONCJ9gnz4BSDKSVaE1tVECBFP7IiVlw3g+xc408smqKbtDt+xnzcbA8wVMi1WsgIr49lDvUUTIXOFCCBxmJfyROSxEk/LeAKHL8wMoTKxaFUnVujJBNMMWdol86YVz5hVdqHFYah+kcLTTw6YCXpNEYIPk5iSFi+SvDVzFU2YA1AtmnpOYympZokpZKbNsb2Jg9srfhDlSgLiOp1cmQ== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0320.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Sun, 5 Dec 2021 19:41:53 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%8]) with mapi id 15.20.4755.021; Sun, 5 Dec 2021 19:41:53 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v21 14/20] avfilter/avfilter: Fix hardcoded input index Thread-Index: AQHX6hAnp89SO92B2kmW6IWrCBYspg== Date: Sun, 5 Dec 2021 19:41:53 +0000 Message-ID: References: <1bdaf4de8cf369e4a28e7a5d8be2870ea5e34b39.1638733198.git.softworkz@hotmail.com> <9fdc2f3e9bedd2ade341e81095496866d786488b.1638733198.git.softworkz@hotmail.com> <9189c7c58671e4d611b5a7f44c9db4b37416088c.1638733198.git.softworkz@hotmail.com> <3ce4c329dfd8718fb86f61ee73b044f1a3285486.1638733198.git.softworkz@hotmail.com> <8e26ae0f796a7c9be3aa94740b68a7fa9400dafc.1638733198.git.softworkz@hotmail.com> <7cd2de4f62b2e30ce670cfe421afa1171ad23594.1638733198.git.softworkz@hotmail.com> <602d3c490440d703afd815714e183e62367e3e3e.1638733198.git.softworkz@hotmail.com> <65fed074109cab2b1dc123b0f37e85890dea528b.1638733198.git.softworkz@hotmail.com> <72b7410d291e8356649700eaaef61b30a526db3d.1638733198.git.softworkz@hotmail.com> <99dc80c1b7f60adefdb1812c0fda7ca2b49b3524.1638733198.git.softworkz@hotmail.com> <0fbd116020f0accff90e78704527a90b38b4da9c.1638733198.git.softworkz@hotmail.com> In-Reply-To: <0fbd116020f0accff90e78704527a90b38b4da9c.1638733198.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [Kc7yIDukZhB5jDJvDyZ5uLnckCTjJbyLHK/esuubfgrzk2AbRKGPiDK2sSQcjmxw] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 06847c0d-d020-44ce-b56a-08d9b8274a0f x-ms-traffictypediagnostic: DM8P223MB0320: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Os2sQ6vAxfRXthCVWRfVHVghdvb/b/L7fOiE5TkLfyYA5WArjWdBL+9B9jDZb2+xkeDYCrr1kh7JdNw8sQ0tSGq3SF6Bj08KZbC7fxFdD9tlugaYkPK3iv6Axu1YzvYlOfIHe1oBNPl82yvUet/fUqYBlWVoMqm0CQjMEc1F8y6veBGHjXenV0FkhoTJI5Pc3hBclLVLb4KdHv4AU+b0EnesSZEp/2SCygyW41okjxxsN/mpEcYoXfIWiOeB0gNGkhhit47iOOfyREjYGpSrgEWXTQHR+Qr0hZiMTEgds/+AUvxfP4gIKMxi1etIUq0s8VMyI/+hzLzlYa+1eX9k398WP3xyu3UyL+Em0aM3ukcovvI9bub9KrDvlzP3m5rXb8lBkHdSBuQ788uIiCUd3AJKpi45vajiSNtUQ7rO3HQxp/6xlCwNO6Q7Xg+4Fs06aRUf1KyapcSVTScL8Yn+XFc6AjPyYEYVtQUtKX37++dq738mgViULFjGrb6sFQtZn3hjX4FI1Fn6Xn5ITluVAbP6Itj8gebqHuPG+wT7CSjpdCxhxF6beGV/tZKLKrfnKTP1P+b6PN/uCB/xSbwqBw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?UqBXZhhKf5v1D2OqQHhoMCL633OC?= =?utf-8?q?94Mmpe6CkkEOKqELLkplcoA/aqNJzPPG0Ffa5b0mwfg/WDKz4Z5CeR7Tslj0CSaCe?= =?utf-8?q?HrAa4lMWgzgjm+WdQZdjk5Joi8koEpCxI67rBlWFoz53WT6VQ2ClQnVRJQYCJt/8Q?= =?utf-8?q?xvrk2SenbjMXpe25FZUizf2oEnzEDCJ6bcNtafCzr3zxqyB0m3FDdAEUulHb54oIO?= =?utf-8?q?LDOAD8/jj56RUIz9EM0ir3J9P8PHbMkDib4onbd4cdlZCEBzJanunoXPXur1PnKLs?= =?utf-8?q?yF6F61VRTvEzjL2aprNbm6AVzSYdVWyw0ZiT2W3QTtjz3Npge+Qll6R+C49ZH9f1D?= =?utf-8?q?Fmfc4v8IuMEirJgwkkIkvIuCfa+CH/HP5WaH+x5CgeToCs2mhzLg/OPiUh/3hJo9j?= =?utf-8?q?7dtNmmRC9ItllQd3cuU6GPqvX9czeGoy2+a/aQJH+dLJM+sH5zalnC5Xa9xI4Zp9p?= =?utf-8?q?JfT8txBEg1GZiMZSUkNf8/xflD7NkG9wDiKM7MSCTp2u0iJR3BLxMpVNdZIYkMqcj?= =?utf-8?q?NAKHFyXjpmK/rEzKGrqyvofsML4fr1JfjH72GHxUryrGhaeA2H+Qrgea1lvrztQeA?= =?utf-8?q?BpfQ/2JFxIbadVam6TbKYjB52UTxKGstteU5eJTTYZVtR5DMD+J5ljcleGyFiZDEd?= =?utf-8?q?grAsmkQQDDE2zQPnt687xMdBJXbUFHsDhoTYSIXRIUdbDz9whbJy2QWdeY+N3hSBT?= =?utf-8?q?7Qo08O7wfXnPLZoN1mY9dGMUUNc0uRxx+5U1NP2faRurW4KyWeWfURWxulCqMLafG?= =?utf-8?q?ZnC/GcIjtvKknbIB2yNc8Q1WxX3KLDxVI4271UJNYSXf5X/3eOvdOpn0AW0rh8+A0?= =?utf-8?q?lfzhfFhIFgjX/2xB9r3Ef1DyJTT/3Q/1arb0AILw/4RF+hD0+xcvncb9PAKEJt6jD?= =?utf-8?q?9ogdat/4AsDD9iNkAMPl5ddbttoBJF/oqHrh861EulX5AXWzzsRn2Ly0hRl06Xkqj?= =?utf-8?q?5GyNxcA+FsdtYgqK8NYbkCH1metfnpFSbo3o0DXPBaA=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: 06847c0d-d020-44ce-b56a-08d9b8274a0f X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2021 19:41:53.5255 (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: DM8P223MB0320 Subject: [FFmpeg-devel] [PATCH v21 14/20] 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: 3viIY0FYEnFT 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;