From patchwork Fri Dec 3 19:31:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31939 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1098924iog; Fri, 3 Dec 2021 11:33:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwrTxUWfL0dICZpW3yaeQlJPWEKO+Llb01h2vRo6Dbm7+P1AAOwC9qEzYjGfwAHBQrg63JE X-Received: by 2002:a17:906:cb82:: with SMTP id mf2mr25945582ejb.266.1638560033262; Fri, 03 Dec 2021 11:33:53 -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 b13si4461357edv.490.2021.12.03.11.33.52; Fri, 03 Dec 2021 11:33:53 -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="p2Rtkpf/"; 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 AD6B368AF12; Fri, 3 Dec 2021 21:31:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2012.outbound.protection.outlook.com [40.92.19.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52C9068AE80 for ; Fri, 3 Dec 2021 21:31:31 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bn2GXLLrRgEZXUNSF3XW5X+42jRMFgBRbKVbMIftM4OTQ+H5zq6ciQMr3f6xRF1lbM10zlZmAYV5Om1E1EpS4tq4pkROL559SVvEld76zeNwlue4ewRzFeMJ1mVWTPW3wsnvIngWAl+aHBRANaRIC0rNVUK9ZgXACbUAzUj5zxmrJdgTjUYbNEugcsSGI51ZEuXu57dRdMLek62qJlkloRsS4mnTU2Foe9TEzLJgPLhDX0fckcK6wWTNnXDxGRuVaYSUCjsv6ov6LpcYEy1/xpHvYc1IRS4yGXf+WZ/GNaK7vJDhosTrsoxlN4dNMy5766+Kkq1lIREGeHBdEQoywQ== 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=Gu3Ztq/iycHdBIqJq6kd2hrjdiPEG2TVXUB+AEGMGn2wqdzJ0iEZdEhSGjZV2G4fh2wF2xxlkkPKTYyDWJl3gBmMKjEWcEM810w7Xch90icj2LpQUkOHzP/1bNV2W5mRh4pKxN3EwD0F8LgI79IxdOJHjIrCKSi34UcZ0RQG+Bu86J+/AcoDrW3EphGPS5mpi866plpIeQJ9GjEYUjZcR6VYsjL6poAFuLvioGjaaP0A9R67uxoF/iLODH8XWIYZKh0Au0RsvGI+rrsH9MsFHj0Qm45UUoZ+28B708pK2+HvC1+KWRP7vW51zD0nVSQ2qjfqWbfJzYGBPbejL+lbkQ== 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=p2Rtkpf/uB20BL9dEOBLUiQ3iTqdGQptxEjU7fj7JQiN5IeaJEln2NUncdCJTWnAS3pbAMGhYCpLM9U38gOsOOihqhD9E5J4EjJkTgk+bH5VfPmO2JrmEJJAdoGGWi5YbrUy77xqAJFGNmvvank5Z5a9+kgWqjvcXvcwp9W0VILdi9jzPwdqXv3/RlcRfI4CP8mwgO4J4PPHs2BAIpFulIameC07h902if4BEU33fSAR6hjbdvWs/jy7SX3UBbAL2QOgg0qDhsV8Lrp0GVI6OaSns/wDyMbt+EK4G5PQjKBqSW5pgtgQ9g+ywnisbvADs9YcDjB4O6M/JR6vZJEwNQ== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0205.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Fri, 3 Dec 2021 19:31:30 +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.016; Fri, 3 Dec 2021 19:31:29 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v19 14/20] avfilter/avfilter: Fix hardcoded input index Thread-Index: AQHX6Hxe+jP4KVOGXUapQF6P1O8tGg== Date: Fri, 3 Dec 2021 19:31:29 +0000 Message-ID: References: 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: [MbCMknxDEOZOu3z/pjHQMlmgvvUijsuK] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: db14dd9d-8c83-42b2-46a1-08d9b693818d x-ms-traffictypediagnostic: DM8P223MB0205: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: LPLbiZyn47U3wSOu7Lx8ZxNAN2xLpJ1bkdTms/gaEbs/8QMYiF7q6Bcs9EUiQ2o4rmv2O4owKVc5VGr8GIehTeXbFexxTJ/a+eIMpbe9axWUPaJQnxJ18ErJQZQWs2eXfuqgz3mIn3g5+aY+DsIMdXUlJu0VGJOx42RfBDXLY94Q6cak8Op6aLikNo2OgmuIo4Q5P4wkYLX9Z7HapiXk8Z9btJ4Nxm5+fm70tAWewgKhwL2wiX6HzyT6sSurWp/k6bhPxlvzeXV27rloI5FHA8MwKzZGqsXB7ysWlI6pV8VX6os6WqXSgI4m3cs2fMz2KCxWIJZ2DmpQCiNVJafhZ/OJkNau5fhWHl+cX5iYtzksZMBqWBJcvG3KwwXRnCTtM1gCwhHwq+pX9YvatMYf8y2acgbCpHlGBiz04k8qoLoA3O5PJnNhvL82vW+7ulnHtUcNp+IMDBlw+3rT/uF7pnNA6JQ3T7u8ZqDvy6pWPrnFBeEaekjsO1ok4Si9AFURkptBhs9eeK2ngGkya39NN8qP6LKIdcZXMJJHVWyVIojDRELcwg8hSEJUsT/XlfQVboJAMJjpudovhWq9x+VMHw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?CSQGi3hcWBXDCEA32S9rZH66sLt4?= =?utf-8?q?nZq4n4zk0/l+OONKOKkFnGAy3oMhYbbVHEbb/mDNqHsESB+xK3R1USNOHt/ZfRFj3?= =?utf-8?q?M+jPEjxqi5GAE4CmJRJZHizurV3JSd6xXeb+Bxx8Usc3mMcbw04UH2gvERyNURBdX?= =?utf-8?q?vYweaODGOaaOgGdPqjLv0RrK6xi6jopcPdwe5/m6UQ+60IJ/Ujz2AvoR0jb5xLLt8?= =?utf-8?q?13Yv4eZ646cUc7H38LjFcWnlXtNa5vG4Ww1VyIfGT0sQo5LwN6eb8OYFhKBFmAvDe?= =?utf-8?q?1/gb8quA7URenkjhKQZh3ywEOdftEMsdS53DTvKignxxAKnSO+o9ysF/sYETB3Q9k?= =?utf-8?q?k5d3oAulqGmqrNdX41SynxvwNuceYHqcIIhScyBWkY5ADW0YqUxAj9aJidXXenu+o?= =?utf-8?q?N3scNncClUhuXCYcEsL76D/gvu4OY6IW9unzt6TrZGajOmmw2JF9Ze2OmRszzGAU1?= =?utf-8?q?WJu1CX+Ud6F020Y7cvpnmcaZmx2BHVnZeYMkE6py8EHYxXahyLOkjj6/+9QGQ0Xnu?= =?utf-8?q?37CAvaYhFIXcgxzh0+qa8TU+OAJ+MOH8Mug67zREpzJ1AKRL2Bnbsox8pfo3bK8iH?= =?utf-8?q?dSK9C9UiKgYK3uQSXTwVq61CwN4e0td1milD22692dkAYLqiBTV7dAqslkHeHBIw4?= =?utf-8?q?VX3YpuR0KxAmNueJ8fZGA20wnajN+oNsKFdLM+zdRhy3U3YYFc/buFQCdNyKPA6Zq?= =?utf-8?q?+s3PZ+ix/RWaGOnH0SokRW0qoxeHOfgm0MG/6T1B/ZPrvYaY7u4qeCimCnUJlFJO1?= =?utf-8?q?3TXtn/CWVjSoTV1CVqWSF9gdf8E6tSXQH7Ej3r6r5rpvO6a1CurUcu8vrxIaW2XqC?= =?utf-8?q?QuLDvwbr+HmFiy0ShXE7ekRdyTxTNAlzm3L9Tk+9CLoxlMQJrLS6wot2Cu0xn4WHY?= =?utf-8?q?mJKtaEWIpmyFkxGqJCNl8Hk2CL11ZMxi3g6UJFvYI+qw=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: db14dd9d-8c83-42b2-46a1-08d9b693818d X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Dec 2021 19:31:29.8527 (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: DM8P223MB0205 Subject: [FFmpeg-devel] [PATCH v19 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: wQG1NCu3iOu1 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;