From patchwork Mon Feb 26 23:50:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46559 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp1679352pzb; Mon, 26 Feb 2024 15:48:37 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV4/QZheyjecUPGGeAPTOaZ8yBeZLoHL/nGkO164bs/ycOIOBJNSQCdxYEUXO9AogxYeAsnpWXZdccrebZw+M/h6qPJFyuAYXoTew== X-Google-Smtp-Source: AGHT+IGzTbIjNz8YXljvRWZOX8KjzKO/4kTLSrYjQpkSfjZoHTaI2BX51XnDT+7XMvJ+asmxx1RT X-Received: by 2002:a05:651c:231d:b0:2d2:4108:72a with SMTP id bi29-20020a05651c231d00b002d24108072amr4529439ljb.12.1708991316772; Mon, 26 Feb 2024 15:48:36 -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 x29-20020a50d61d000000b005642ee620fasi193265edi.114.2024.02.26.15.48.36; Mon, 26 Feb 2024 15:48:36 -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=@outlook.com header.s=selector1 header.b=n969OxXA; 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 24F8868CA21; Tue, 27 Feb 2024 01:48:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2092.outbound.protection.outlook.com [40.92.90.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A41068C5EC for ; Tue, 27 Feb 2024 01:48:25 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e+1pZ2/JQ3K1J30Y9IgzDZ9bZdqWJ8H58B+IHy+Gpr1wAE8WsGz/ibckkSKhVnI2MFGo8qKVLE8ZCmwtcMJmOaIL1CTuqzPq1HKE/AQR4/WowHL49uLPLlD12Qyo+bozxu49vX1+CwyEZHMG9pB0C8FK9z/ZNWlceyD/U/y5/tDXxvoh8KfqM/XEo5FnLz+M8u2Om1YS+Afel/iY5gKsGZsFKwSBun126zCT9o0LxAdNkVnTH7P2CLMWAJboco0JN5QM6tke3jv0h5ZovZgOWYTgmY75uTDKYIYXEcNRVJXu2avAV/3fSjaexSusk7Og1lxm6S3Yld5JiFvGIBBSNQ== 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=Xob2/bpaPObRAZawptrQ5r/HpOgflgqpIMxs2r6ibVg=; b=BZIx0dsFLRmVTmcMRV00YumvMgrfUT6/vtURbwrXY5tsF0GDo+0KInBolJ5DgQxwqUUinhBLFlqtYT2zW6+azN89U0VJCI7ireJk5GO79+/zEWmM9wrFD+YAmsDEJttGRAjnpmYI/zJU45vJVZS2FfBOUTxxl0zweCLpJC8fWWOmZ9DMtpHAqr87Vs1flGs4tBm5kMILRUTT0gmp03SE78QNSx59DCuIu2WywRbwD/BJUK6tZY3FX+LVGfCiUPVsn/QWA9s7QEf+0DrRFYL8Tp1BVKr7mq5t8Sz80lsFikidtZiwbn7ysKzbGTjeF/8X1KPvvHJYIG6gx6S1QHHEPw== 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=Xob2/bpaPObRAZawptrQ5r/HpOgflgqpIMxs2r6ibVg=; b=n969OxXAT9/6GXBaJHTJc7wGzrv4dEBsfSOCS8MUGzJqP9BnMYtpyEng+9FDcOmsjFfldxD0qPGjih9FyDQ5ExtaILkEge0XlWsA04LQSKRvc2TX8leV0zwFQtjhOzGbyiypNVT9evUrQTsxmuu0vKv9GEyoNSz3xRMbh0svxVt0LfHxKg17tsrPWJ3tUqpQXF20yvYzogiiWY151FRcEOmqOOkIgiZ1OHGHw7Ar2Qd8upSL6Pnwcc9el4SAYk2C/Sg89dh1pTiIyb1x8rEVxJ84UQP9u+3yBlGvDSOn/34HClzM58L3RxEJvG5LiO3OWKgTemAAiJijK6GlhzrHIA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0025.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.34; Mon, 26 Feb 2024 23:48:24 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Mon, 26 Feb 2024 23:48:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Feb 2024 00:50:17 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [NGQAzYCAr+DCBQKM2AijWsubifW+xre6WV90x6DgXng=] X-ClientProxiedBy: ZR2P278CA0024.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240226235017.1294266-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0025:EE_ X-MS-Office365-Filtering-Correlation-Id: 46d98e38-d09c-4c2e-7328-08dc37256ba0 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnoQWGgFdnk/XrL0kWZR7YPnCTJwQdiqSwnOlN1aIbdEJhMPXmmFj6gdKVOkVCaogakIYWWFD8FQxh6ItYh0+U1Fniil4FhD5FagHR2dPPc6dDCeA+PEuASjSUXl57O6w9rW95JHOFJJOUsOt6gFDKXnLcg3ZAl4Cr1zSXVEqVMZ9zy29t9mB2swTIlqBalbPkxFr4oBO5gSKsWE6ygz7WO+hAt6XYxHHfqpucpgOE6/ap0iyzzCcilXuNMXH2OGZ24+suznGWRdrWTkNaZJNARTiLEnbgFq295BZBDtPuZUw/8hoOUUsbYkM/C93AQucksHiHX+hwEZK+A610JDuep5hRIfuBbLuxzgk+QQ5Id0qYXuJr1L0Q2GISyAW29pI79gFbM+dFCJ3ZkvLkmuAm+E7oPfGTvGEbOzdbJiumUCrPmzfp3y7J/XebattfaFOB2VWvH/Erw48usYu8zCkZl4nqdSFMnhtVHbID8jm8FMgdEj1nPQrKVhiD6fMakqnhddukxakPqTfQsXF+8vrrhwMvGUATpofNYezJTshXTplhPggGqHLfRYn/mtIB1qAnQdAmAewpl/hllPxxS8lC+4WOr8HXmA4DQGwkXLasVh09397aw1dE+Ggk/3w0emsKPCykg4/qM7hupqefjyb9wstkGAm+6lirD5TOBZnGFxo8MRFOKvPz9pXvUaTlAUN+TQcDMDQ5q+IFbWYUOU2JV00+H3Yx3Kqi2Yr4kc9wfWOTGa8nI/OXdRW1V/qP3eQoQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r50BTJobP7LtzLWZhGY6TdEMeGsDzF8dpfxfGRZv3kKQdoroJbTCgSVh5xyc1VzGNeyaKKt6TCsy20bx5aICphOxL0XTNz9DWtRsaMNHYbOlv22J9ag6cq9lgqtV6QtatqYoidx3pJ2ta3U88jHAlNdcm3RldEhaIy+7xD8B1YJfNXcOT9kzIjfryDZqh//kDprNIc5KfZjmIc1tFpIB/MyWS5nJnUemWvcX9UMuznEzfWAApT1/9LJv1K6AuyRDE+V/k4orQjBbEDA3weWCrxsMINDfvhtFFYxESqFqvsvKzJWfV0bgRZ+QVw0NpFFvst7I9jWxpXOuYYzj24MnFcWheNUCrDDF4BxKb03K0DJfkwVoRlwDh2lzgcTcdATTMHq5uW+IeXP/8mRH5f0748fFdMhmhj0WgWhPkd8CIfCSR7PVGadZX18E59bRPEGrfH1lVw3QWWndAudfvcLXJZzlInFrqS/uocxVFsxAAD1ff6O0o9cnupqdDS0X/KPBSv1IjTyL/9F8V9wNxHyeNOTcKo7Bg3csIuvQAWlUjx1GLaANEerHZ8u7pSen5oXQ/MYod41ifpMidWEMdNNOLC7AMgUNeujCQTAj8h/LO9/WmrnHceHPH3PjNszrXgDX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yj5JzI01fYovaNgQAs+W9FlQiCNCLwaoRMb2qmtmq/x6Z9zz4bAQk2CBmGidDlmFKcD6CImMGfCy3jrzYTuIcUaH7OWlr7AjQGo/3+rX0u8B+oieiCmO80TxocaNNS2OR6cQFZWCqoxdXF7fBH8SvzZCMQ97OUnOo7yI1w+aYbrL89pjY1hL5yNQoqyXNkQ/is8RINh5RNiMNtsS5yn1SFw6zeA94Mo9bflnTIVqQb6r5BH94N52mknvVAhLWwUcVam1GD6ba8DVzJojYr5frr0uEd6YCI31Qq3UXhd737exrL3OWOnut/1L1KjKeM3XjL1s9SmIUCud32buB99kGawSbgrmvRmWciDLJ7VAjZDeZfjR0i50ymXICseTWa/lAO2FuQJfz5hU/Uz7e2xA1e9eFts48gMOwdcMpcvOJG9nC1Jinnt0YyGiqh4Yp+vp3NH749zQCFs/HECeTEkwTvwIWus4qrq0AeYTuBjl1tQUt5mpTjyABVs+cE2yMsrrAhesDJYIvTAbipYrnyB8i2MKfgutnElvfCDG8Bc066jbnRPLzUuSnJ3MLGR/5wMhE6T98usFnvCw0qvdSMaIR1pfuXBhm5bBr5DOJ5a/bcYDzpPF5XjDY2aGimPTWV93W2gXwyAeCcabazi2g1yLxFIiqnmef1COohSq4z0ZbnmWinFQGh3dk5GzN5xfUal7SguqluI0ZwSS/xKYu9VO8Qttgg+burGHq8rWMcccup5Pt2aJZlvKjjeR6RZT0wrQaHtqlKoAcWG+/0xsex6LVE68HoIG0iqp6Uw+BE8ikPuQaChG41EFYFGyMk2EH6x80CrcY5uDN0o439YuIqUu7GBXCz5EXId7TBB66N6HxZsDZaunF7hx/vAiaITu4VrlKB6WOzhTth/5FOnJ2y89OM2XJ03uNzvx6Fy27JSXZ5nOzbUHDM7+ycNkVHmDLoiT/gPHGMXyEnRVjGLGDlOyjdnqJFj+wC2vNBHyEYglAfDfhxQ2HZD3FJX5yzG5aKEMJg6wGb5CliyPk4jopcQsBoOTXQkc3j+WJm30k+C39rFnt0ECvB8M8r4jldphzykLLNJq8Qkg7g/NsibI63zvWA3FvHCKL7ANmfj1XSXsr6tTKyBqqvdXZd5eVFZVa0z+/Gy81czk+HUVb0UJya/3ExK1p4ki7AuhiAGgupnqL3TlDaZpUJXaz0+zir48A+8JnJdFdwhAOiLpjRqWElFzFdpnkFPUlHcfNhmfRFk0K0ojj31aT98QTGjRgJ13UXVA0WavuqpJuy0MTGycWWgW6A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46d98e38-d09c-4c2e-7328-08dc37256ba0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 23:48:24.0724 (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: DU2P250MB0025 Subject: [FFmpeg-devel] [PATCH] avcodec/dxvenc: Use proper alignment, write endian-independent output 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: L5UyBfCiBpYi Fixes the dxv3enc-dxt1 FATE test with UBSan. Signed-off-by: Andreas Rheinhardt --- I have not actually tested whether the output is actually wrong on BE systems. Would be nice if someone could. libavcodec/dxvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c index 1ce2b1d014..3f28fb696a 100644 --- a/libavcodec/dxvenc.c +++ b/libavcodec/dxvenc.c @@ -149,7 +149,7 @@ typedef struct DXVEncContext { } else { \ op = 0; \ } \ - *value |= (op << (state * 2)); \ + AV_WL32(value, AV_RL32(value) | (op << (state * 2))); \ state++; \ } while (0) @@ -157,7 +157,7 @@ static int dxv_compress_dxt1(AVCodecContext *avctx) { DXVEncContext *ctx = avctx->priv_data; PutByteContext *pbc = &ctx->pbc; - uint32_t *value; + void *value; uint32_t color, lut, idx, color_idx, lut_idx, prev_pos, state = 16, pos = 2, op = 0; ht_init(ctx->color_lookback_ht);