From patchwork Fri May 24 08:04:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49200 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1572767vqf; Fri, 24 May 2024 01:37:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXFmynTsi8vo0pmgLbq9QvfW6DbXIqeQdNlpMuAfy8woDMl6ZxOGPSF+yeEqI1mQzHobF5xDKRyR8Q1mlw6QqtncqZXWKZ3x4n7ng== X-Google-Smtp-Source: AGHT+IFr2mBKL61wmpiE1CZTzs0p4bR9P5+jfncphf9eMy9NkvCFa++z302G7JulF7ZQ9JyjHKmK X-Received: by 2002:a17:906:7043:b0:a59:ba18:2fb9 with SMTP id a640c23a62f3a-a6264179fa9mr97870966b.12.1716539826985; Fri, 24 May 2024 01:37:06 -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 a640c23a62f3a-a626cc6268asi56600366b.488.2024.05.24.01.37.06; Fri, 24 May 2024 01:37:06 -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=O5kuMsuf; 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 974AA68D521; Fri, 24 May 2024 11:37:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2048.outbound.protection.outlook.com [40.92.64.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E68068D4A6 for ; Fri, 24 May 2024 11:36:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZmhMUrKklfvFOHK1aUOsoKkPjVM12bGv5IpVb8dG/9OSJ0zbuMmM97GTz2eL5ndxAdl9i0yLwdGuhdP2LgT5Iyd4vmvWiFkjEFAq2RVjWrRIZioj6Q5NV16MvzAJer/23CAoV6l4qsfvPV05dQtA5X2kYLdyqWoAkh0CfjNTSHhqK4+oOSpPIAZqGw4wEygvpicG0f08vfaqR79O6sIBhjgOL1gwctO5XCIMo2jCzWUgWscesUepR4GjRPdiHXgxhC6xqiZRJsepIpwWIsSAgohklb/jsJ/takTSlwPPNeNlpPIYf2Y6EW2P93ZJGH2zm/3Y1Jkyw5ilAuGibuh2pQ== 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=1pQXnYwt5mbFPbvcOrec++89hcW6dGR3IuCCmHHg430=; b=P2CyeZggZW6k4bikMdVnkYPRM0clEfAToxI5JTU6Lj3+BUkiPFXOOhzkqGD9KI+GJw0AkA7HbyxIAuGwHaAS8nIzJ1PXpTYDaRWFPtMst5s0jqPizqYOfopXw/DtUAe8jiskNPNpQnPSTuheoZBffcEIl+7IsstlujM8UFh0yh6D7vyE29YK3tO9Q04sQkuUW/fH+FjcWw+OWTESX2RPtRrzJXwY1ImDXV2bHE5lEDZMXNse3F9I7HKhEL2oBYHHjIQPoWWghLSz3oCljiOrFW80DbhiJXPwv71tM4ebFmlpJNlcgYlb+B7i0KZ0v4vxZb0jTX7diKJI9QYtSiAGOQ== 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=1pQXnYwt5mbFPbvcOrec++89hcW6dGR3IuCCmHHg430=; b=O5kuMsufQQYzzN/mLp10fAzAkVu8xdL7b/2akWd/+nfF5rljf7buW5wA5FSDChuEg/CcG705FvfJjQc4L/qM/UGgWFmBT0K7sM29ePE+5W8ediBe18bZI6PZsKLAF3r7++KPBqbvFdLuTJkmidWBWeV6C/f6uXPnV9FiFnS320FJNZOaZ46ualzHo6K3yKB8gRm4xYlaQ88kvVEoCU11tLU2Rr35HtERF9yyR+26hu4Ck+PFXUaMOcZXU+nhdcES0MZ3CKd1GhsuRwsgSz6MFvxukd+Ox68RleLA2p5Pf/pN8/kUv8KnvnjTsH8g5NQFy6E1Hx/XajoYRR7JTDwWmQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0359.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 08:04:48 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Fri, 24 May 2024 08:04:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2024 10:04:18 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [Sx7g7/hZx6nTfsrfjM97rWcZ9TwZwGUDaIdquI2OfPA=] X-ClientProxiedBy: ZR0P278CA0178.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::22) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240524080421.493471-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0359:EE_ X-MS-Office365-Filtering-Correlation-Id: fc7d4bbb-aabb-4c15-0958-08dc7bc82e32 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: fr469R6Fg+avVfdmGoVp7Zlp10h5YfRU7UOc9R662fBMjXMoGiMj/RFW2uNfbMkL+N0c9/g4odF1mPXT44vEUjLkENEEfn8tS61ki/9q5K5XA3f3AXcKz526L8Y3QKHzbnd8IJYMOEoqPSbx2RegMHpOBmT76AU7x3WJYLpy/lJOxD0rK7hat5/vSbxMU8yXgNKzLmEga1MtM7VaTuHEDNw9MDWApNbneHsuu48j2mlmdnY0X2X26BKSITQMeyViPHdyoctdVpJB+gDAJOtexReTPyMsdGIhYCPK+jacRl8Hi9EDtSq3nOLJ/pIxHkySVsRoEKoraPuW7dgI35PPby6E7yOs96h8sW7iLr2oGqRenzECd2iugwnL74tr79l1xj5NBPyr3uD/TeZNvX5pQJJDm5YM/mePVAeu1L2mjwOC/qgyzwHPJ8qp8xjZr/EsCAcpjjFjV7Qbj4tWDF9HDE7qGjr4DnMqEEAuiRHJpZoHciGtoha6rTwLsSwFw6QRLqf0c52FDJ02Q2W0qgMjGhLUCdn8+GHOo6YcmTNpH7KBji57KTRbf0EjpcC4ULcHsO4FgNOVMgalYjLQigShCazFCUk+1tgVOQpjnvZRWpvBS2hXOocmvxIRs7jKWmQY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yMpAtOt1By5QbRqkKlmV2RDwjw6OdYZgdMg/Ckz6HUHlVMC/rqSaC2E0o3Eiul5b7ULMkcYL2JN7EZtPyoBTP5xiLOOYr3qfYLoj3nzxr8IWX1PCau/z80FX0+vtL2H/PFhX0rvfL6gGqPOl2VxANr1gWftMJlXsLjNMI1umH1Uu/10VCLKbZwiUAGwtiGexo3N6wFLgyVSl3hVeqpYZDIO/jD8wD6J0qPeNpuUz19NcKzTmoyi1rXBNAUan9I+swrgxPKoEzuzKqSG+0N6TRnv6+VvoCpre3nqE9Zp7lxg2tkVYlZybcz9URYdDtVK0toAIWeQixQxJMxKEjKpVNzCgTyZN2KH7YHShRsPLbKKQwroE50Dc07fTEdvA89Cu+fwrJ11I3Ix1IYWTlPAunjtPA+HcFPQNFMyb/0OVxbdXoss4XmUfYHQ3Ug7eXXqAEP65qJA/keAwTECsrbdARt5qFxtWVHJnLHcBFHZX3lfZ/+8sozCAMpWkB3yEwUYlwcKwD5hg0zQ5fxoeo+sAgGE/u1b/krlFYYZ2cMaKt5PpbIdtOoI67z46NNduN+ggVQ8tDQws6sUghsCyCiev3X4aPuD6cWSZE8evUfU1fxbypPGHe2KXpJY7nNhqa+os4uYn3/zj4H5qWlALi4S65G4gWT//+xHRvaQFSaveQhaxzuxi2QCw/LUBAtMFDd+0CLEzFJaz9q5UeQ8oXu8lgVWy/335lFoI7K3HxE6iK8d0jmixlgkdTKD2aV2GgadvzB+ZIfNjIng4hgmAbv4JP/dZGxWtNhJ4lZIsdqwqEcALv9vSID3OQMLcQiXjSWMsgYXJBG6QMJQxeqR8nWQwUM/5AmdqXSPkiyACHmJMQN/0/PvYm/+fDPCPLvBura1ShCn151qQeOo29E4AE4vb3x7cIl06RZSYvjAojtRRsou3mmSi/qlhcsUniUCL0eF6BbOpvwJ/Pga9O5zrEuqNY4L2j3Z/0dL2TjUv/vvm0JshGPH5nbavdUGoWOzb8aCvQFNzMpNrpv+lquvgC1hMnRVFChgGzNW1lCGJDNQlmzWRURbSpJSZgOVx8LN53eooFZyLMwCw+cRJNhJXoV2y11qIS9cAD1Z/yBqP6mtuANdhPx4aw8I4STG6ilWwwq0Mnf4A3lvmIFYuFnrQdwb4qTpeba/bPYsRqXZZcs+Z0pZwfNU7moghayEMp+lFGUS8+7fLBgARisqQYT36+T02auPDmiM+pbPLudxgXaI6HEmM5FnzabClEthdN3Jypi6IhykANy1jcUfsG+x0Ym5ggA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc7d4bbb-aabb-4c15-0958-08dc7bc82e32 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 08:04:48.1002 (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: AM8P250MB0359 Subject: [FFmpeg-devel] [PATCH 1/4] avfilter/vf_signalstats: Use 64bit for processing histogram 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: nDNHRkXNGjbk The result might not fit into 32bit if an image has gigantic dimensions and one of the planes has a dominant value (particularly so if said value is big). Fixes Coverity issues #1598399, #1598401, #1598402, #1598403, #1598404. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_signalstats.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c index 50c9df4298..78a23bb705 100644 --- a/libavfilter/vf_signalstats.c +++ b/libavfilter/vf_signalstats.c @@ -721,10 +721,10 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) if (histv[fil]) maxv = fil; if (histsat[fil]) maxsat = fil; - toty += histy[fil] * fil; - totu += histu[fil] * fil; - totv += histv[fil] * fil; - totsat += histsat[fil] * fil; + toty += (uint64_t)histy[fil] * fil; + totu += (uint64_t)histu[fil] * fil; + totv += (uint64_t)histv[fil] * fil; + totsat += (uint64_t)histsat[fil] * fil; accy += histy[fil]; accu += histu[fil]; @@ -745,7 +745,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) maxhue = histhue[0]; medhue = -1; for (fil = 0; fil < 360; fil++) { - tothue += histhue[fil] * fil; + tothue += (uint64_t)histhue[fil] * fil; acchue += histhue[fil]; if (medhue == -1 && acchue > s->cfs / 2)