From patchwork Mon Dec 13 23:40:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32465 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6140946iog; Mon, 13 Dec 2021 15:43:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJz3dErbC63s3SmsPR0zSmszUnegLHrGhdlD7Nn6fN0nb84Js5rviQMsTL192qloe8BJNygW X-Received: by 2002:a17:906:5d0b:: with SMTP id g11mr1724008ejt.295.1639438981370; Mon, 13 Dec 2021 15:43:01 -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 v14si16899946ejb.775.2021.12.13.15.43.00; Mon, 13 Dec 2021 15:43:01 -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=WkmacAs9; 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 7270068B0DC; Tue, 14 Dec 2021 01:40:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2017.outbound.protection.outlook.com [40.92.21.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAAF368B0CC for ; Tue, 14 Dec 2021 01:40:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g6qBhH9a6WidfGqPEu2AMxYPWzDrBD3TO01NNBR0p6swe7zKR6A0VY6SnUdGwylj1+XMnscRp2RNrDB2HIMk7gTY6cVYLxd1G57nS869rfZpDDXYFr5dLX+VlzSwYBbxfOGxXqlEbHZFaUTqMOjICnzIpi9gaSHB0pQ6VmwaZhPtlEU3c0iWA0Fbuq7PnO64mkxAou2CDwwEU8axYg7yuQ71puoNurO7KPepH4R079u6rUSPqwXVGHS7uQc1sxCv3/2tLkOzR1xuNKz7pK1MQ9uw/lLI66YpppSfWLWhyUGkIYLapyKhAD8+NkeHGRfve6eAzFQsZdRNn8cSOaHMfA== 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=fEeJ9n/vni4rwgGreqCYF/i3BxHnbEvN9Io9sCZwX5t6ZQd9YHQWZy3JtIlXMHQx3NJBq79YQHiH6W/v4jBqcXKCvXKoeIV3tCoInDhxtHoDstNaEy/SPh2l7du7MwJiAuU8HTH8FfSv8Lbb3LtjkkGNa08P/Ekd4lKwPPyMSB6U4iK0hWL2lZVncApPjvsiiwdqxEPslGcUXCODk9WljJ6y5N1ljRV2EvWVms240oQHz0F439SmzEPdopA8FAUl99YMVf0gNL/OSwE7J9zOVDNQqXSMeLnGt++PzuwnvrqQDlGJvf3fKcKwMTnAVM6DEo23TssKQwWKgYbskqiGPw== 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=WkmacAs9+MIoSiFSDERIaW8nJ71u/PaaUIZuZz+nR6IuF4LmnjbG+zZ0cJ0+81I7Lj2vE/hPaNe7cSOOmA7o7QQqAnoBDDW5IDen5eBnWIGd+UBVyKMyIXuTLkEKsNLyWzdltDTe5k4wCGD3xhAAlEEeqP8htq5guvpSAUdO2A+JxXfSl49VC1+tVTELsGMCHLqndqKO81+0mMIQWbAY5KCGTdMYaSDz2/S1FjBjHIl2y9PsyJKaRJcZYCupvjDq4fdfXeqz6ihHKOZwFZTDoX9CX2nrWFHixFn/UEaOLDo7uKM7bhheFfzrOfKG4HW9wMhZzSCm0wa6HJqnd9Joiw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0397.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Mon, 13 Dec 2021 23:40:47 +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.018; Mon, 13 Dec 2021 23:40:47 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v24 14/21] avfilter/avfilter: Fix hardcoded input index Thread-Index: AQHX8HrahOc7nZaVYkOfuwQA25ORvg== Date: Mon, 13 Dec 2021 23:40:47 +0000 Message-ID: References: <1ef42eb01b3627bbad539abd46206f320bb39697.1639438462.git.softworkz@hotmail.com> <4148d77a82d4b7e229fc81ce9bc1bc06904533f1.1639438462.git.softworkz@hotmail.com> <2ac798924ee984010d2e85f00bc992d9aa106171.1639438462.git.softworkz@hotmail.com> <300ea7188b331ca5e00dd7e04c03df8aba2a99c0.1639438462.git.softworkz@hotmail.com> <9474726b26f0d3e8f353d07caed2fbd33cdf473a.1639438462.git.softworkz@hotmail.com> <424522c96b5cdf6b03faa6bdceb1d25449463429.1639438462.git.softworkz@hotmail.com> <90caff245055005e6a4a890b3665da55aa853b31.1639438462.git.softworkz@hotmail.com> <0ebcf3ed2adb02d3ffb243a499b434c3bdd976a7.1639438462.git.softworkz@hotmail.com> In-Reply-To: <0ebcf3ed2adb02d3ffb243a499b434c3bdd976a7.1639438462.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: [PBYevoWgBWKc1DptY0BG800W+BZf2D6R] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3e69a9d9-8550-453a-d6bd-08d9be91fd11 x-ms-traffictypediagnostic: DM8P223MB0397:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: RydOkS7sq4GStVaaMSkWsYGRCBppK6Mm6YQbmfS+btdG+WE0SIMsl3GIWVgH8owMQFbByfy+9ZfImLp5BxZT4lDQ9L+6bz2M/zuAHWFyoQ5JQh5uE5QPc0UQ4auEmYNoNlTRmFGBoZJEOo7B+GAh2FiEcJjA3hWUhvK+c7LZy3AdAd9k3gGbMLN0FrduXEUTsLJ98blJKVd7h0JK+sENVLnJRWiU/Qj3TrmpuG5Xw3TMnPcAXHpGx6+/rBVKlghMITkQGMBb3zp31VtA8DuQIf1uN9Eaieqh9vHnbFfC/SgKjd84X6HSOOKUTPWxHAh2EfTZXpoSbIFmnVkehwvzdZD/TI1Oc0aJ65Ncr3Tlnr3FcQmCsLNBBB5EEvsH0S4tfN1rQRWAu/HnT2JQNUCSyZONKfmXwhPrUsA7mwYrw6fpOWnufdYO2gn9URGamQYN90MhTs1uYmAMlQWU0aUUbhGK7TVdkRNqIB6sPiA6oXLDy6kznnobNx1/UNb/9Pp35E9D1JlERZI7ZJbEjHhawRlJgbNsn4qw3ZuHzo0uCpeNsRsK+C0povvFj9cy/q6kqgqDFD76W3id/JZZLI6xxg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?LwUzx4TW8d4HjuVjD03NxpDoIYfs?= =?utf-8?q?wn7fkndtwuTSqKgK14ckUB2U3AUGu/TtwKRdzXJU6UcqlK3FyyzjMegA6XdehbIOt?= =?utf-8?q?sLFLs4mG+y+ssyDSEs1iqHTKDM/kfYz+lNm0seSIZ6sXXmVhyyjDtXWCebmKXXC4C?= =?utf-8?q?FmVa75NNPe3P+eM6xzs6mXRMiEi18KzCkJfm8VFzPT3AYe29kU6e3ixqb2unpDdrI?= =?utf-8?q?L3hHW2Uh4YBlgYRvWBZEDtEOg4Qs0OmkItY3aQ4Ura+8jEmwkPBENJSkD+Aed1pj1?= =?utf-8?q?ZoIz6ciZ2uwNAmjxpYQelQk1O4yEmDhGXkxvpiAnkdDzjGw6zGQATv/mIRpPkjbK/?= =?utf-8?q?XOOlhtnx7FfXiw2SX4XG89wPy4OJqqdGM8h8lxokh0RQRp2kcLqbLtW70FZS+AO3n?= =?utf-8?q?SrKuqFHaTfXDII/qtxTq42VhNbsjyV2xD0ArtBrLOxPUoqXnhNPRwsN7a80rgpC/C?= =?utf-8?q?OCGNQ2tIZmwe+h5Ro5p//Acu2fm65e7K9BIZOlfjmR8gCfffzyJyLGDChxZ6RQcJP?= =?utf-8?q?d9eMfPhGIS+Dpi2rXM0jpFwuYRpjq/uOZkA+fuX6qCt7rUWg2/vee9Mn4ZV9o7upV?= =?utf-8?q?noXZPWTMmmgHWyVHzlBf2rTKFoD5TVQxF1g8Z8b3Ek1lb2H8ng5FwQsB5hLAHklo3?= =?utf-8?q?66rB7f7kczWe0bDQ9qudzTiR+GkqdlSbVTlrPKpZFAVIiFD5NIH80LH1uUIAN00YR?= =?utf-8?q?mqM0itFX65gXFZtShkCbtA6zu9m9qUfsgIGyaeVkqYeyQolex7O4pjeFzgDygl/9Q?= =?utf-8?q?pFaLtsxyKFf5f/zjG5xVRQQyCXbezgkNT06fhTUagNoHQtkd2YUhcqcORX+ZP1Hpv?= =?utf-8?q?7cli/3Rz0yKL058s+78muRq3enxDV5X8zm/3GfpFZ6K0xfby7L8ut4q1hq7oSwILC?= =?utf-8?q?0s4x40FntImLFiwhAAcX3wnnEBdqLM2CLSaR+2zpUoog=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: 3e69a9d9-8550-453a-d6bd-08d9be91fd11 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Dec 2021 23:40:47.4617 (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: DM8P223MB0397 Subject: [FFmpeg-devel] [PATCH v24 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: fg8L7cZtI762 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;