From patchwork Thu Sep 7 01:05:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43629 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp298339pzh; Wed, 6 Sep 2023 18:08:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IED6uYcKewhZxG6srso4/G6ZJ+/NH3WFYjE2fQVskqBXCEqTiKWpe4nz60O5uxnEuuyszVP X-Received: by 2002:a05:6512:4020:b0:4fd:d92e:31ca with SMTP id br32-20020a056512402000b004fdd92e31camr4313425lfb.36.1694048890820; Wed, 06 Sep 2023 18:08:10 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k25-20020aa7d8d9000000b00523cb27ebdesi10275965eds.237.2023.09.06.18.08.02; Wed, 06 Sep 2023 18:08:10 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=esGlYyEh; 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C614168C8DA; Thu, 7 Sep 2023 04:06:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2052.outbound.protection.outlook.com [40.92.75.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4887168C8C9 for ; Thu, 7 Sep 2023 04:06:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ox73NffjSSGg2In078brfejrKkSBoKgg4mcdLViM0mxNoh80Szs1PccxTkh8DlMEFEINlco/J4na9wzrMU2SwCq1n0m9deqcUDT0hDJMq+es+X+HDrQxHi7Cti/Z71sKfQ65QAgcMHuHv7RNtT/PzIpfQFdCWiwcTVPKvWdgkxvW37KqdkQtfxTy/gtdC04mJ0Zn3/oW9JtUTGMqY/E1oKPG43jAeK0NHyETLCDqx803+6FMrwrzu74tQdEyiHpmH6wEvg7Xs9kAlZjWR4ypnOHxlhnUpG7jS2wGtnqouO4STtTpXfQMtnN6B3P8zOytsqPe7PAsO9HaX3edi0cfJA== 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=S7uuW4Zei7skhjGnO01OLOYuL1WQPBT+a+6cklwecS8=; b=O6+Me6PJlkfkPSyTNdpn2X+X/2i7OWaGo2DxAwLugmSzEgihhj9gsKjevSs+c90DytbKVizERPsLq08rkedsuN9k8QaIJemlXZqoLRUEQcPAq9yTZ4UC5TpGQgOAh58dRYWsL2JJuxOhAVdoRowziyLkIBVFc3ygBvoQZDFApiW38xmGW4O1cMuhNflZzZM/mquVcFIkJtOx+7Ga+Y22mlvSjk1Y7xVN4LACFBcN29akyywl0h75Zo/rZqN8qKjvquDiSmu0mblwDHLRd3tidM/E7JI5UJ7wwurkQwBLfT/sarlh1lXFsGNl/OpBiUUX8dZ3ncabeKiX6cJeJEEp1g== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S7uuW4Zei7skhjGnO01OLOYuL1WQPBT+a+6cklwecS8=; b=esGlYyEhn/sgP97QJYPTO0D57craAHfwPnn2UAG7GvMSigSpXv3OJ+evQolV0oL3f0GfMrhVHysQ0kGSxx44pK/msozdLwnxMPcW3WfOLbR75KvtSDtMAThf3wi8CBx78Qnch/c0ihB+bSaDy8KxmagUg68C7Obd+U5N9+TxGz/ZKESGag4hYzNYIhaHWIAW3mHFc8FLU3AFGGmTDvJYSSv45KSoxcvHOL575X5rN4LqK0CCG0GM2zYfRzjvtDxfzdV85X41y4WOubKzh67cAre/YspruaZJIEtGVbUD22e2AeMrPFGJYMBjGa4hMSHFi5KsZIdUVyYInS7AGV+RHA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0336.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 01:06:18 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.034; Thu, 7 Sep 2023 01:06:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 03:05:38 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nrTT9RqL02DdOs7A5rbYvufHNAclkEMU] X-ClientProxiedBy: ZR0P278CA0096.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230907010538.488975-21-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0336:EE_ X-MS-Office365-Filtering-Correlation-Id: 284e79ef-b314-450d-fcd2-08dbaf3ea488 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zojW2oigbFhCDuMQuS2493LtKHgqZHInc55b7O2BWW0uXOq9Zvic5C6q4jbr2FBDHB0HC1nZm1iVYBgr7oIdlwitN81Fa73aSiDRTZ505LcIuDYF7XvfDSc63GkQVauJIVjMe3l2XV0SWAK7kYlqGcntvnpAL6l4oauhvTK5G+cvx+Jn0IH1goVm2tE3FNG68rxv3MoEsxuI2i0WUfp07WO0SYuQxD2z0BZ7MhIekVM4VkwFusq0Oa9eDRce5xdCW/TDaYWC60jKo4y6VpEMiBsp0+7kKGHwHT14LnFGBS0kxA2r3FLwpbkxSmGuv//KJJ3dX8t5CwQB7JUpVtb/F3+2+XhujvaM9mrwvJztaISkw1TXeS43UITVjQau9LFykB7iRaBfKTaevZcTfbk1I3AdhZjAWfOixKXVSRTe+8BLGGo8rcN8LgVcziTdO7pWGjgu9ptGuqpd0LGp3k6S2DIqr6YJqIiqm55CI75FXyWy8QOqH6P2SAZBWtaChqF/VHjjp8qB7ob0b72sR/tFr+HPyfJzdrUadQo05K4Qnzxo5Ewq4Kj5yUS7mEhcqBV69WUyFGeDlIDdjWzhG4pd+M699VCmAQiqf0oI21/HwV7d0DXXzw2B/06aO4gR9Hxo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OHK4vFgYm0xNRKlvM5pVnloY4UF+RrOZuAbiKn2AsDSauv8Y4DK3wWPoorT0q0Npqz2nLZluvC1dC6rRzxMMagUX+QyrPg4WPHCJm9h/ffybFrGxbaDwGQJDkGu0CDkt0Qr8khmbHbv+4E4JEeuUUBEaIT/gEkUBvy+47Nkesp8uPvhlFoemS9TMv8wgfoR4CqlcnRYTkG3PMncsGSYntPoIxS56irCpcKQsFxle2yydC9ZDDcmG1I8JRAzCrKxTjC1z11R+8hm3+YKoLk5Xp59SCDQRCFy+T/UAX3JwOVTL5sCGSOyLZf5RjzqUdHmoxlWQORgCdKv0L5JCXfMUooJGOEXSDlf3QisoFcmHVwz4/+TRaSrWUBK4wFIPNcs2R94pc/DTS0nYRAlE0odRoYIIwOuHlS1CBRLCetvMF/lLg0SRyjHLMqN7lfElW51xbVXHdrW7Or521EkOvRojkh8fPTmvqDLSJiW2IFvCXPvk6pRdJgGga+K/YBFtQjqFIIyeqozEt53EiaUlMrl6kZ4mmEMw3ak3PEDZsFlV7YTDAM3+CK9ZTufjbgsjZOugVXWuYgkJZ1+PvjZ/X8xVsbeiH/87BP4LiPj/ZbfwdiN82f94z2Sd3n2yBSUQVdbpPOe3KmTPasjVThRtZFst+yPyFCEOLO/R+PJnWGWJP/1e7t/GhPzKGZivpah/ilc2kc+KlvP8PtEIu6bnoBWN/sMN+g/eAYBvhn0M92G6CiMpXGqycJ5KBAmQooB46Mc/WsosTNceta26/P2BHwetAwgmy+VhaZKc/AGruesTI5+8YAKZDo/wX5tYd7YWWFT2JdeIEZ2haQb5Sa3pL5SuGhaEMlxuSI7aAGuH421KK8jxVpz02hDn/JpTGjCaG29G6KNQCIYuyprNjKnXzbaxppqhYU60G5gMTxbuMyMyk976Gd4niV1lFui3CYxisDbOnNRFmHAEzPRhFWgguKuNSAVKiKBYpx6vLGcILy8SSFXInpnERquO3m9P2EtnH9aVI1Gs+Ml3FSjsV8q6j1XHUXvUyzDa2mnW6swT0FuTBhCxg5eKnac7cYkNImdGV5/LohqRO/antCpyXimdICQPZBNZjeFsOlYE5B1fngbxCLhnNul11CjuYDGWHJiQ+VVxYlFlfn4h4+zc68XZDZ8ZDE5vCZ6veMdyrGULK82ecCiJQwx51URihiQxd4NDQEWU1i3+Ps4Jd+RNdXoqodEM99GjgBg07yGxLZ2F/tT+tu9Amo2Lgy+A1NYOwDm70Hr3 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 284e79ef-b314-450d-fcd2-08dbaf3ea488 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 01:06:18.8335 (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: DU2P250MB0336 Subject: [FFmpeg-devel] [PATCH v2 22/22] avfilter/vf_framepack: Use dedicated pointer for access 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: x5lR03VYEL9I Improves readability. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_framepack.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libavfilter/vf_framepack.c b/libavfilter/vf_framepack.c index cbfcf1e036..3b915ddddf 100644 --- a/libavfilter/vf_framepack.c +++ b/libavfilter/vf_framepack.c @@ -233,19 +233,20 @@ static void horizontal_frame_pack(AVFilterLink *outlink, } } else { for (i = 0; i < 2; i++) { + const AVFrame *const input_view = s->input_views[i]; const int psize = 1 + (s->depth > 8); uint8_t *dst[4]; - int sub_w = psize * s->input_views[i]->width >> s->pix_desc->log2_chroma_w; + int sub_w = psize * input_view->width >> s->pix_desc->log2_chroma_w; - dst[0] = out->data[0] + i * s->input_views[i]->width * psize; + dst[0] = out->data[0] + i * input_view->width * psize; dst[1] = out->data[1] + i * sub_w; dst[2] = out->data[2] + i * sub_w; av_image_copy2(dst, out->linesize, - s->input_views[i]->data, s->input_views[i]->linesize, - s->input_views[i]->format, - s->input_views[i]->width, - s->input_views[i]->height); + input_view->data, input_view->linesize, + input_view->format, + input_view->width, + input_view->height); } } } @@ -259,12 +260,13 @@ static void vertical_frame_pack(AVFilterLink *outlink, int i; for (i = 0; i < 2; i++) { + const AVFrame *const input_view = s->input_views[i]; uint8_t *dst[4]; int linesizes[4]; - int sub_h = s->input_views[i]->height >> s->pix_desc->log2_chroma_h; + int sub_h = input_view->height >> s->pix_desc->log2_chroma_h; dst[0] = out->data[0] + i * out->linesize[0] * - (interleaved + s->input_views[i]->height * (1 - interleaved)); + (interleaved + input_view->height * (1 - interleaved)); dst[1] = out->data[1] + i * out->linesize[1] * (interleaved + sub_h * (1 - interleaved)); dst[2] = out->data[2] + i * out->linesize[2] * @@ -278,10 +280,10 @@ static void vertical_frame_pack(AVFilterLink *outlink, interleaved * out->linesize[2]; av_image_copy2(dst, linesizes, - s->input_views[i]->data, s->input_views[i]->linesize, - s->input_views[i]->format, - s->input_views[i]->width, - s->input_views[i]->height); + input_view->data, input_view->linesize, + input_view->format, + input_view->width, + input_view->height); } }