From patchwork Mon Feb 26 22:34:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46554 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp1650838pzb; Mon, 26 Feb 2024 14:32:51 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXAIYslRAw9X9FBhfPB6A3vJHZ2JAL7+HoMJFRlkgTbw5veMs4KSweFAChiYNs1FTy+4jkgX8n1NuohmznJR/izIFRtUJEVoi81mg== X-Google-Smtp-Source: AGHT+IH2Iu+jbNeNop8wP1kl8yDFqHzCTejqqprQYAB7enY1lDMwC2bE9i9U/+Z2v52bYrEeJ4To X-Received: by 2002:aa7:d155:0:b0:566:16e4:b6b3 with SMTP id r21-20020aa7d155000000b0056616e4b6b3mr1554700edo.36.1708986770808; Mon, 26 Feb 2024 14:32:50 -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 t18-20020a50ab52000000b00565dfaca96asi135647edc.604.2024.02.26.14.32.50; Mon, 26 Feb 2024 14:32:50 -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=p9f0fjIu; 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 9237D68C984; Tue, 27 Feb 2024 00:32:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2081.outbound.protection.outlook.com [40.92.74.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FF8968BF78 for ; Tue, 27 Feb 2024 00:32:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eYg/Txn499j3Bqr7cm1N5sB0Kdaygg9HgdvvuKgnlc3JBaJZzmSR3xPcA/renHzpH96k5E/v4Dgg/qqQLnaMWKaoPgT52mNDp3LneEramCKkJQ4P32yOVAr4avmTOBJG4pcPiQqj382I+FoWQI6s/vg7tHNmr8ihqAXpsT2a0XJjbtmkpff1AlEDH5JHH2llkTqE7i9DqImek/hW7ooNHS+dU5qXAHHU3GP3vhs7B52ZE6RubV8U5MhNzpMYDnB8vOZ6tAvRetRwZC6SY0xkSPq20XbVoVnqNDsIcwEX9ZQh3bnkWAcvQFF0NTDFGsO7qjQl7DIcLQ6x9E33zKoHjQ== 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=eoKpsUdNcbTlrvJkc6tgPSzpK8BIxxPKMz/XHgcxoK4=; b=ZYSAZCUAQiKQHfrFBQO3h8cLTRJBq02+B4qYnTtDmWgkUd+0k4siCKoejI3N1mWHhjd0t8GT96Djh4dIU8+20hMcviJbKyStmQNZTVlnrO6DmK/r4FMF9b9MYdlMgIt9VqBlwaXt12z+LYmIb5bYWjor2yaGKxTi1ISUjKQBDSIC+CvPEvQH404Z6GXScARnfDIkN86DJG+EvNuSlgAlMxfFvz4ZTrcLEoWAsESQd8dmSjkppH6ERHUPir8q41pK/ngDivOyel/Fsb3T59+7nxBD3p/9yzsbkaFEsQpOxgEW7ozW26S6vihntpIqX7qUpevjnP+hR72P1Ls3vhEi3w== 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=eoKpsUdNcbTlrvJkc6tgPSzpK8BIxxPKMz/XHgcxoK4=; b=p9f0fjIupMO/Nr+lo3kqYgdWJXkKCxT27s2wv6EfbXGK+OSGGgcHt8f2BUK9PHZDjlQ29kdNtO+6SX/eFFAunJX4eFO+YiRus4xckRquuSjO0Lmw7psKGq3UZ8ttb9PL9hJuNFTo960293LFhDwSU3Bt0d5ygA74h5SBw3S1R4IRSCjTvEs2qaV3uWmLzUdlpmBffDuTPOT7WA1msGTffu673cr0zYx2dXSOpiSFhfo/cuQ/xvfkqlIrUZkY1C2GLl/nIn4EN4BusaxQNGUNUPItR/biPkT8YdYQprX6MWw1KCpDTqUZkLFk8n+J5CLYog+jKl9hklwWq9oDYBxYyw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0293.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:328::13) 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 22:32:39 +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 22:32:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Feb 2024 23:34:33 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [u1LENYkSoek36JpGQp4vfxuuUO698Jj9emYyJPs3M98=] X-ClientProxiedBy: FR3P281CA0097.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240226223433.652717-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0293:EE_ X-MS-Office365-Filtering-Correlation-Id: c417d03b-a920-43b3-b9a1-08dc371ad6f4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gCJUfGIi7qbFKZJPMYOgtipyVw06F5rwlJN6qbSb9YTTozaygUqP999h09BVUiaRQVVxZuuTQdHqorrRY7yxeOdCQVu9twKM/4IgSx9VCRHRT1jPj/Vfoo3uibDfs2HqVfNcWoZJKRTLf4ICuJz4QC4QOVt3IIq9hgs9mglIDnNC97sWmClbdi3n1OZar144d/6XWeOPuV+dqfykpOx4G+pA8PoC6yHsoaphGnwLnnV3SGJ7sqE236QYMRaBRIKyIDlfXfaROh5xNcEPXxP8sPWgPPo3s4kzUtZdboja7vhCsrgs2faKoyUvwrljWYngy15n9JDaS64jlYBuNWu+d2alBTIhMPMyZcM5dDAzVs6l87vsKhrHiOH0tlsffRo7JI7qTz0I2I9X4HkD5EkQg/HI3r55fF0VBw6NgjM70xdHe2/Ggttk1m5E8IdREBhKaj6ci40s4RdfgMq2o6f2mRei1oD0qwbaWzXXknn/98nGB9wqDkfgKBZZ5UrtRQhrKAtG3m5H+8/3DhD4foNnbgaBWT4NXPpwDre/rZS56kZ5eBnTJcjFsoAzyf7oqqBI//wjIhSniTTwg6bv5dAY45vojHr3CKwqtgrZD0RoekHQ0IZ7lAjXz/rM2MYVfhuy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HVIF+AmJnr4tZOM/2FjJUxHnThSknv0eASJjbgrox0RZKbT6BTs6z11piU4NwdfVeQ0E7810wlCUUvc06RuSUJp0f8rYb3WGqNRQrUcQFOuUXLDX/f+CAW+9z0vdT3LP8zZBCSoGui35ywyZPvLk+wue0/aqa1KoIguC5nqgw1kTYmuXAKSq2C5fHbPZ6XtN7HL+xf+BQJY5TNMDgBnFF0M9nu5sGMb2bff0XYgvKcPbT8eoERTXaDHkJZd1zoQ3Ps5M4I1WclR6bg/38NxHijadY4pZDunuF5l4Ev/4jkCUaSg+DD3m3r47zJOMUZOHc5Ppuqc50hnEVqcCr63NMteT9b7B6nENnuiIqBUrjEREbkkHgWiLeKrSNUiRrNxXRO8f6x8Nl6hxC57Af0K4o3zm5LecKCSEyihSqFEJ3PND0BUk39vlEX+Tc9JRxafUnE0UtcilBa27l+fz0pMJT0X90nSxC9WKsggBYqzhvruGVVF4hMfj5wsEjomPf6KXbG1dfsPwYJj9IxUL910rb//erwky9w6qSjTto+kwh9RIm0Tw1Z/3GPIZ9m9nUaOrhePfOSsdu3DJcuMhQbyKCCMJDSg/UdqSgJoTjnbM19aQMjqX/VD2qr6rwcdoPm0raId9SwJNyP2hwx6w0kgSvsWEw35JnjL8u5zicsIYi/YSuWfQelKE0Har7dQ8qyr72n7BodVTx+nTTHF1lAHP8ytTpojSDfZkqPVIQHIvxoWwVWZpBgozK3geotqUgIV+TkwehNspQl9wDs5Dr7x5qZVeNGksFkNiZ3NAypbqRLcGbxD2hKRUyonwnCqIAvFEUhNrx6VrNqZbFpF5d8aeEuxDTd2NnTH+YWTGyv+Hq2uH4tbPfkcGqXo/ztKPXkiMnnHzkuuXSd4zsBFxpqEmdtWx9ec+G/4rl+ZDWOIoZVqM4N8nVGAyzW2IspwoSP7NV+eNIx2wOKSyHh8hA/Rya7qxA6z5AjRmfWhry48KVLV+ZZOJ7szLu6fxws8IqT9XafKikeHkyzSI8dMbGsLsNIKKB2qrMIDGBSR8pPo2h6ip26LRnpWsRJCwlHD+KT67isZ+qgtLWS+9bfnkN3/bkvsmq0zlO97p38diy881hybqTBKjohTYCgmbhg3DCq5f/bicxLGssRkb5y777L0LJ/UUbEchc1qdU1yAspT9j6Rx5LzOkLz9+A2GhwKWWOeGrQSJ+JDn3yX51B6D+IqJl+HATJjuB5n23JxaU6VVgd/yJlQz/KrWov+Yo2bpVrY4CQDSIR0CO8ntrj9WbQQlcw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c417d03b-a920-43b3-b9a1-08dc371ad6f4 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 22:32:39.6325 (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: AM8P250MB0293 Subject: [FFmpeg-devel] [PATCH] avcodec/intrax8: Fix assert 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: v12pQ9yKkj6Z Commit 900ce6f8c3526f27173057bb955f54f4f4f41246 replaced IntraX8Context.ac_vlc by IntraX8Context.ac_vlc_table, but forgot to update an av_assert2()*. cf7ed01938a4d8b2ccd28f1fadacd79103e54eed then replaced this with a check for j_ac_vlc[mode], but this makes no sense as j_ac_vlc is of type const VLCElem [2][2][8][]. Worse yet, mode can be up to three and then j_ac_vlc[mode] is undefined behaviour. This happened during the wmv8-x8intra FATE test. *: Since 84f16bb5e68dc47eca4dc96b3391c58471cd7328 config.h was no longer auto-included in avassert.h and this disabled av_assert1() and av_assert2() in files where config.h has not been included before the inclusion of avassert.h. Signed-off-by: Andreas Rheinhardt --- libavcodec/intrax8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index b6aacb170a..948391599f 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -103,7 +103,7 @@ static inline void x8_select_ac_table(IntraX8Context *const w, int mode) table_index = get_bits(w->gb, 3); // 2 modes use same tables w->j_ac_vlc_table[mode] = j_ac_vlc[w->quant < 13][mode >> 1][table_index]; - av_assert2(j_ac_vlc[mode]); + av_assert2(w->j_ac_vlc_table[mode]); } static inline int x8_get_orient_vlc(IntraX8Context *w)