From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 71FF94BF4B
for <ffmpegdev@gitmailbox.com>; Mon, 7 Apr 2025 00:00:33 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF2F1687D5A;
Mon, 7 Apr 2025 03:00:29 +0300 (EEST)
Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com
[209.85.214.175])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55C8A687D10
for <ffmpeg-devel@ffmpeg.org>; Mon, 7 Apr 2025 03:00:23 +0300 (EEST)
Received: by mail-pl1-f175.google.com with SMTP id
d9443c01a7336-227d6b530d8so30382465ad.3
for <ffmpeg-devel@ffmpeg.org>; Sun, 06 Apr 2025 17:00:23 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1743984020; x=1744588820; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=vGZ9I4LuZGH85i+t1RPbLgaVKn9zZkq/lekAvhzTds8=;
b=jYGxACGlaUAau1oaMxS7iGRkBsaARoRm6kFgfi8kMYnyn22NluJWfIYA2A+OuhKrap
m0jhfi6F+yYxKDpaxQ1sY5AJWnUc7Z5FCgXYiNAa3+z4CWbG0nufIwDvHuv0YZikMa2M
r4OaZBFvt2Z2+d3YZv7YphuNQI7NeLhQCOM6nsZFmDMqvZdeiWmMuw8S6nFpsH5ThrMP
sjQUh7yroxzc1hLv+aWpp7VGIyKerdriOAZyUIwsnAO61Y0RGlQJYmoiGd9MGWPlalaS
GZhaVIoX60sRBW6o6RyCneaqnywIL2XY5CqYLnGrfwkbP7eYv/HeOYnBRDOuy0pyNZgq
hsPw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743984020; x=1744588820;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=vGZ9I4LuZGH85i+t1RPbLgaVKn9zZkq/lekAvhzTds8=;
b=DqJj4L6TQLZIbmAOUiW7sohHuEGZQK4z9kKoRgOpIh/3jXPubZplzxa6k3pR17oVrl
/JIMeW2OglFqRyis8gnnHDv8YkFaGbIgzPqGC+8thY69jRfmggC8G4Z/k+hJi5orURL8
XuS4MjsWXfkTcXGnEFJiAm0LeqhYjn2ASkIl/LrEBDbld3gpGrgd4p37I8miF+5CzcrK
sQl5USM4GMqqdQiDcAN1fb8grxZAAWxt/W3EAORvVTZOnbspQLecZnxLSoVsSdqn/103
68vZwn/XbnL0dPWpl6DwVXMSyeJobiEnopYPIulTtj7OOaOeJ6MTVscRfHZmXQHWUXdT
k/9w==
X-Gm-Message-State: AOJu0Ywx4s+eMndoOttgcXrHJeGEocMaUmyEawwTH+mUb5lWw9C9vMnv
RbwtJSiOxCHTEp7eDdcHp75hUGD1kt53dCByDta/BmhgB6jlgYES8kLZ0A==
X-Gm-Gg: ASbGncvVHwpxWDFSMpmbdISRr3HGvQKMmGLqkLN2bsnH+tFcea1TzawEGSuGuuWkY+a
xE89xVt/ufi7ZGf5w0qlgKNFum6UCa7mPdqoYAA+3MbsAb+e5x/8C0SWuYhoqh1nVkX/i/v+mBN
DwxOqdul/WLzeqQOFBk6vMGiPWh3DhehZKoPGnFRFJLpKedSwfgWfFzzIp6lgYfXch7utwVhVTt
zCR3TuQWbdBmk5HwX37O3GP5Jt0IBJ34tERZLjtnA8CDt4YYeku+e6jUfhp8yCjEyLgOSnJu+Kv
ntuxI2gIQSNOIt2+nvak71W+SBtRTfvznvH56DKJ/LqNvJHLKCT07lhPLN+SPM5m
X-Google-Smtp-Source: AGHT+IHgb7oRz0pBT5R0tSdPtUMCvaULyMxXEX5qIxpwahlMhE5I9e2ZOvb6pT6/CoaAA/OWbRnfLw==
X-Received: by 2002:a17:903:18d:b0:225:abd2:5e4b with SMTP id
d9443c01a7336-22a8a05e84fmr143784675ad.16.1743984020364;
Sun, 06 Apr 2025 17:00:20 -0700 (PDT)
Received: from localhost.localdomain ([2800:2121:b000:82e:f53e:1123:a702:5158])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-2297865e413sm68701215ad.123.2025.04.06.17.00.19
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 06 Apr 2025 17:00:19 -0700 (PDT)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Sun, 6 Apr 2025 21:00:04 -0300
Message-ID: <20250407000004.7306-1-jamrial@gmail.com>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] avutil/aes: use pthread_once to fill the
static tables
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250407000004.7306-1-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavutil/aes.c | 53 ++++++++++++++++++++++++++++---------------------
1 file changed, 30 insertions(+), 23 deletions(-)
diff --git a/libavutil/aes.c b/libavutil/aes.c
index 1f4cceb700..5f31412149 100644
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -29,6 +29,7 @@
#include "intreadwrite.h"
#include "macros.h"
#include "mem.h"
+#include "thread.h"
const int av_aes_size= sizeof(AVAES);
@@ -197,6 +198,34 @@ static void init_multbl2(uint32_t tbl[][256], const int c[4],
}
}
+static AVOnce aes_static_init = AV_ONCE_INIT;
+
+static void aes_init_static(void)
+{
+ uint8_t log8[256];
+ uint8_t alog8[512];
+ int i, j = 1;
+
+ for (i = 0; i < 255; i++) {
+ alog8[i] = alog8[i + 255] = j;
+ log8[j] = i;
+ j ^= j + j;
+ if (j > 255)
+ j ^= 0x11B;
+ }
+ for (i = 0; i < 256; i++) {
+ j = i ? alog8[255 - log8[i]] : 0;
+ j ^= (j << 1) ^ (j << 2) ^ (j << 3) ^ (j << 4);
+ j = (j ^ (j >> 8) ^ 99) & 255;
+ inv_sbox[j] = i;
+ sbox[i] = j;
+ }
+ init_multbl2(dec_multbl, (const int[4]) { 0xe, 0x9, 0xd, 0xb },
+ log8, alog8, inv_sbox);
+ init_multbl2(enc_multbl, (const int[4]) { 0x2, 0x1, 0x1, 0x3 },
+ log8, alog8, sbox);
+}
+
// this is based on the reference AES code by Paulo Barreto and Vincent Rijmen
int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt)
{
@@ -204,34 +233,12 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt)
uint8_t tk[8][4];
int KC = key_bits >> 5;
int rounds = KC + 6;
- uint8_t log8[256];
- uint8_t alog8[512];
a->crypt = decrypt ? aes_decrypt : aes_encrypt;
if (ARCH_X86)
ff_init_aes_x86(a, decrypt);
- if (!enc_multbl[FF_ARRAY_ELEMS(enc_multbl) - 1][FF_ARRAY_ELEMS(enc_multbl[0]) - 1]) {
- j = 1;
- for (i = 0; i < 255; i++) {
- alog8[i] = alog8[i + 255] = j;
- log8[j] = i;
- j ^= j + j;
- if (j > 255)
- j ^= 0x11B;
- }
- for (i = 0; i < 256; i++) {
- j = i ? alog8[255 - log8[i]] : 0;
- j ^= (j << 1) ^ (j << 2) ^ (j << 3) ^ (j << 4);
- j = (j ^ (j >> 8) ^ 99) & 255;
- inv_sbox[j] = i;
- sbox[i] = j;
- }
- init_multbl2(dec_multbl, (const int[4]) { 0xe, 0x9, 0xd, 0xb },
- log8, alog8, inv_sbox);
- init_multbl2(enc_multbl, (const int[4]) { 0x2, 0x1, 0x1, 0x3 },
- log8, alog8, sbox);
- }
+ ff_thread_once(&aes_static_init, aes_init_static);
if (key_bits != 128 && key_bits != 192 && key_bits != 256)
return AVERROR(EINVAL);
--
2.49.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".