From patchwork Sun Dec 5 16:23:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3442106iog; Sun, 5 Dec 2021 08:26:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxKqlT8GFFEsTkht3N7cRBLM5/GjKeacBeHsEIGULigAqtPTk4FYmvbtnCOhzDXAEYZv1g X-Received: by 2002:a05:6402:d73:: with SMTP id ec51mr45647320edb.175.1638721588590; Sun, 05 Dec 2021 08:26:28 -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 h18si18226342edb.191.2021.12.05.08.26.28; Sun, 05 Dec 2021 08:26:28 -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=epbT0x1X; 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 0890A68AF40; Sun, 5 Dec 2021 18:24:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (unknown [40.92.18.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B832868AF21 for ; Sun, 5 Dec 2021 18:23:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nimL/ZdiNTPAP0Uawxloecn7tvFhZEsmgP/p9BTlmruLHrWz1/vjkV5qHIirY+wTI8TABrnCcZq9MTDKVvTbAipYIjlWVNtJOFCP/lJA2dh7sNkuYJxI707bXn5KekYimQh/DUonZCDEQ9BiJ/9SMRHyXyXcXaVq5vSPDzK8saFy1pH6R6VxMcLmegO6mOPiBQdf2904raWS4haSJwBGjZwuU6i12cq2YeiFlWI8iIYms2F0d2KHjOHMV+hySHEb2DiTT5sFacCeippl6uFi7l5230aQGfb3Rz3/c5+Vkk6eV204kvIwGGCUz8EaZlnLj5xZPZPel5/4MwsSt0/ylA== 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=M+1wGmb/zGBedXobG6pcSpp1EVrhY3nFlQUgZS3EwkMtGu1KgyUdcluQuoPv9GfEEZB/EwUogcYYvcY8Og0usa3T6TR8hT8fbv1CYQK8FF5GBK1hCR9jZ2ZE2n0nREPNsvvNhN/c2S6lx/55yTTHt+eXgJ9yUux4XiKhB/V0PruS9hcNNALxRwfUDAA3MxHeVLeB+hJtMD+fb97tHk8fbsvGKaBIqsPsL43h042F7mGSRqkxCltbllF/ThHvVihYMdqcmZPN+kBi2Wb7aZ92CjlrswDxZepHrKbzhtgx29CWkJlQfeX3XL0A8xOBFowQvp5VzosEZewhwXEJ6Iyoeg== 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=epbT0x1XzntWbboM70ZYD2+f2dXERBIzk4rX6TlS+W9fG20nOtC4TvE4AZGOLUTfwq7p4LUETTEzeeA8DCN9bLjSflf4Grr2sHR3mKoqP10OAEh8+cdG4TYNv5ATdQIgcecsxCBTFgX9ucukHJTTVpZl5N19BNiA4rSKnWC60VMB/KqozRWxYHKaCRJjrxvTWtu4SBaY+Y90NukIwVrLbPRjZs8GgxJGKGhTKoKY7+77rNVJ1MQHcH0FZkrtZhuHhbsjPjMGem5iRRrEskKt4u5gectRCQs5vGLEO8XdKS4GqSiUO2jgKfcdiycPTIDIhP9DXmJfH5vfnlS4k9Rvkg== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0333.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::8) 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 16:23:57 +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 16:23:57 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v20 14/20] avfilter/avfilter: Fix hardcoded input index Thread-Index: AQHX6fSAHW3CA4mWbEqFBv9y9uQXMQ== Date: Sun, 5 Dec 2021 16:23:57 +0000 Message-ID: References: <7795dfe8ba792c0f4f7f8a543d4df8adf8d8189e.1638721292.git.softworkz@hotmail.com> <4cb24bff6e1107e2275b0d28cf798b014aee3b55.1638721292.git.softworkz@hotmail.com> <221f403df00a60f61f31b8984fb5a822ac31c77d.1638721292.git.softworkz@hotmail.com> <0059b39b262fe3ecb9f149e0d3d220af4f7d20e7.1638721292.git.softworkz@hotmail.com> <4be446fae9fe1bc0869612df10e26702325fac21.1638721292.git.softworkz@hotmail.com> <0d63fa05d21ef666ac72d9ccc1d961d2d9d15778.1638721292.git.softworkz@hotmail.com> <895141dfc659514fff95a9ba296b97892be65574.1638721292.git.softworkz@hotmail.com> <0e8afb196758bdb76df2d1504448c40fe39e3601.1638721292.git.softworkz@hotmail.com> <826332f2ba8309189b82a171706a9de68e2ee9c9.1638721292.git.softworkz@hotmail.com> In-Reply-To: <826332f2ba8309189b82a171706a9de68e2ee9c9.1638721292.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: [eyYbmX2o8TRRsFfTGB9TsnDzhAeWlIRdDgK2A/ktJ+ySRB+E5rNVcSrtD9Rc3e3o] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6025c118-b523-4577-fc46-08d9b80ba33a x-ms-traffictypediagnostic: DM8P223MB0333: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PnkZIwBgAVSg+5SdxEEscBvScO8Frapjz921UQZA/Ws28nlB6lgSVoxGjpeFJ9KrNvR4g4+/C721LGDXYpwohx3s9BKOtYZ7Rxu5ucmdhjLucYuTxGmFw2RwPYx0fsRCIh4i/lcu2abMCGphBup9Vemm/BiYWiJvQZ+9OiijXL8eRmSoWTlKz2xvRkAn1QDCDTN+964lReY/7aGd6VoeB8Rx7hnZvxWHdftvEj1BpLzYX9mS/dAbJ7iSeuiWN1fg9jUBLWhsdlmWUMDM6cFCiC2EVoms3V9Iw5ciEwI2bOrH69hU7nJlUmfoh/EtvXAtFD8Veta9X9RTU78BS7Gf8R8G1TBl7PAUvUUYPUmRHVBYHE65gYZ4ZbQnBYy31sZZbl/UybaDuiiKtZyXSgPgxcrLQ/SCtq0TLrmRPwC9kMBWN1P6auf4nqzrXZAtm3VRQDFBRS0j4BSuB8/xUcGACC4sUlqFGl1XRJotj990kJ2DqlN1RG64sIMgx9QXWt5M1LmnPU/xWi3sq3tCx3Wir6mCvNB3fU1nVPGYxRA+05sRUtTjY4CeOuFykCnjLk42E1+OacT6+mXE6Aux3CN5lw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?VvPTLfe1vAvW8G9MSkRtAckuNGkh?= =?utf-8?q?dtDpihIZ5jF00Xu06WVuuM0HrBn73p8/nPm30jhmyfvX0GGPEnUCSzt7H7WFFsbmr?= =?utf-8?q?dxYPZj4hXbqj+QkoWWu+dgbm4BdnHfyzoQVnbFGFtWXJTg2AsAq4vn7JMbuzRwh3a?= =?utf-8?q?Dj5lK3MSU6SMZzJKzO8jDIh7DafGjSQFwlslJJfvud36tK7AhwAsDsFI1iWFS6umE?= =?utf-8?q?VmA4SxIJsCpuLKOPi1Toefg1otn0cjFh1MgAWscQl5J5wn0d8ad7JmkznV92ZZTJd?= =?utf-8?q?/0t2W+Jy4TgRn7QEZUji8CxWg2Rn3QRQ4TtYbEpGt4e7suqFzfEJJOxMl/lHYJcZc?= =?utf-8?q?qxSGj6256Yex+UzUW0UGmR0xU4t8uy/hb9FcPX/i3ZyAV34/MWAl8CiPGBkRk58oE?= =?utf-8?q?J/9inHzKzbWVCv6FbpuPNGifuT/yS0TR72QZW2WGUq4hXVTB83KJuRMWfV36O99Ox?= =?utf-8?q?raop0hjkROfQTihSSvnuECEKMdcUmkL37geQOoqbTBLXdR4mwHy5EabqId0/tugGv?= =?utf-8?q?wXCGNKKJwY/zDWYUiyR3B8H3cPamKAP6gHVHY2Hb/YdqspMBBVarCUlUK6g63IcOH?= =?utf-8?q?PNx9/2BjtRws6PFpkfkuh9UuHPdLhI3f/a3zDBmr9HTMB9zuLtpZW8+LGRYA+t8c+?= =?utf-8?q?TFDvNlPuTiNB8nXQhLfNm9k0eYKqohve94XzI73F1cEVybrM+pWZRUFdbVWaga5qY?= =?utf-8?q?vBpl4hakkEYh0JikeLQ6HXmgWHmRYNSl2lL47+dKr+A7ToaivgNw+u1Aj4ZxIURNG?= =?utf-8?q?Oi7F1Ae8docKSgFNA3HIoQ2RDN3oGX8f217liXAj94iZe0+uO/r/UA/SVX6ZxZKJN?= =?utf-8?q?dqO24b0c4P0cmT7P5SkWXfhHPX2zIV1jl1CXsWNyYttPXsykQ8VIb+eRasQOj4ohX?= =?utf-8?q?jVFwumJdyAjgLEZ+UEKC5hAqNUmtpXor3t/GKmGI7LStPWdAaR3ApWLibdXL3IFi5?= =?utf-8?q?kje80tl9AGsCXor57uzKNIC9aF90KSGScPqOYW7frmw=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: 6025c118-b523-4577-fc46-08d9b80ba33a X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2021 16:23:57.1821 (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: DM8P223MB0333 Subject: [FFmpeg-devel] [PATCH v20 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: wEoMRD4xJfGd 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;