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 646284BFFF
for <ffmpegdev@gitmailbox.com>; Tue, 1 Apr 2025 15:17:15 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E7E2687D3D;
Tue, 1 Apr 2025 18:17:00 +0300 (EEST)
Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com
[209.85.214.181])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB2EB687D16
for <ffmpeg-devel@ffmpeg.org>; Tue, 1 Apr 2025 18:16:53 +0300 (EEST)
Received: by mail-pl1-f181.google.com with SMTP id
d9443c01a7336-22928d629faso71960085ad.3
for <ffmpeg-devel@ffmpeg.org>; Tue, 01 Apr 2025 08:16:53 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1743520611; x=1744125411; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=fmcYsaj9cYlb/oYKnaWfGISFWEH/Vua8RmsS8mjZ2bs=;
b=F+0FmZ2f3ia103dFOGchd4RLlWcTeKumwnf9i2BRVvDaKxBIUj/3qj74rXa15FKHD8
gyr7TNQqChaIw5Ojp5nScpb2hVDpZ5vkWThzMR1478lSdoWpa9Qi0D8vzT7B03yd6poX
TDzitAtenU+NP0X7tNh1F340vat7hy7h1nN+Oua/72s2cLqrjd6B6xoKJtxJZp76Z/pW
nrwCR+MSl3f6jOPxhb2cqaOz6G3e+OJIIVh+f0p6t9oO16+UeG9YY4L2Vqj6aHOE2Q/S
QCF3E7W9r7HFjb/32NuktmqCRIUdeHtVV/Wq2+MJKt86z/8oXUeXjwMsnK7jCymSa5tV
lerw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743520611; x=1744125411;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=fmcYsaj9cYlb/oYKnaWfGISFWEH/Vua8RmsS8mjZ2bs=;
b=bSsBgnaN+EtpgmQgWjNOWRjn9rHi/uY4/f96GUrf30twT1VEemI65iQDuuhg4Pw2Z8
K5iGgCxmyyAAexXG+OCTfYsePQVdhvzdzP9GhxnroB8JD06nE1aNiiAY/QZuYaiXw4R/
8tesSmQXXauXRr7j3a6AiUgFSucxOTylAjhKALA1ibQ/kc1QdBrFk7dt6GARl9YGIsdp
6LwXM2p4u6hKfDXGnXMQiWk/XXmx36htrG7+a06lfaIf/aRknTyf3Cz3QtcT9nnNil6Z
0/z6Xw0Y3TKMS/on0vD+Ip/ulitjSanAPHc9DCKaSF+m3m1FO1cegzmZNk828ij3XTLf
OR/g==
X-Gm-Message-State: AOJu0YxClHC4b65VBae9Xf4T1lRsKFTN5xj84rrRs8HUBouPRvKPT3iP
WbucGw4Sx3dvJbrhI2Sda1HS79an7LRIBOT9rjYhsx3gVya2b5FjYpaZ7A==
X-Gm-Gg: ASbGnctBGm+b1UlzHFDNvJMeJ39i82iOafjpzKSbhN9Z0yXGEUbYKBJXBwqlCE6vHrW
qrLKDsbqDpyWYFuluPXClXpZOje8etbwMRB4rtRoMon4xrHhcb7rZY3GJ2gtiGtEz7fcIqEulfC
uLoxzx0JnIjZNtkLcQ3etIXNlGEzXX776UcqrhGma7+bWmeeVxHevvGvhCgRRWirxKrEdpI+uoK
LRIOClcP1D6t/SmADoAhpTfGq4J7wcdTWwg0JO4bZKuvliH65Z6H4s+adbYEiOvAs1gTOzMbxAM
70a+785ON+MPcPsEz2F7lUo7TYwtivJV4wkzthB3VB42GuIbwvC4UMZyJ5pl7dv1
X-Google-Smtp-Source: AGHT+IHCZTQVzGf1rGhXUmMvgofaNsr06pFvF33bzNEM2cHyPbHbAlXjCno01tKjf54NUIZwJ7NYhA==
X-Received: by 2002:a17:902:ecc3:b0:224:826:277f with SMTP id
d9443c01a7336-2292f9db08fmr203082465ad.33.1743520610963;
Tue, 01 Apr 2025 08:16:50 -0700 (PDT)
Received: from localhost.localdomain ([2800:2121:b000:82e:6c84:2143:301b:3529])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-2295aacc9f1sm18443325ad.89.2025.04.01.08.16.49
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 01 Apr 2025 08:16:50 -0700 (PDT)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 1 Apr 2025 12:16:36 -0300
Message-ID: <20250401151637.2021-2-jamrial@gmail.com>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250401151637.2021-1-jamrial@gmail.com>
References: <20250401151637.2021-1-jamrial@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 2/2] avutil/aes_ctr: simplify incrementing
the counter
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/20250401151637.2021-2-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_ctr.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/libavutil/aes_ctr.c b/libavutil/aes_ctr.c
index d720aa6aaf..63dcb20d3a 100644
--- a/libavutil/aes_ctr.c
+++ b/libavutil/aes_ctr.c
@@ -32,7 +32,7 @@
#define AES_BLOCK_SIZE (16)
typedef struct AVAESCTR {
- uint8_t counter[AES_BLOCK_SIZE];
+ DECLARE_ALIGNED(8, uint8_t, counter)[AES_BLOCK_SIZE];
DECLARE_ALIGNED(8, uint8_t, encrypted_counter)[AES_BLOCK_SIZE];
AVAES aes;
} AVAESCTR;
@@ -82,16 +82,10 @@ void av_aes_ctr_free(struct AVAESCTR *a)
av_free(a);
}
-static void av_aes_ctr_increment_be64(uint8_t* counter)
+static inline void av_aes_ctr_increment_be64(uint8_t* counter)
{
- uint8_t* cur_pos;
-
- for (cur_pos = counter + 7; cur_pos >= counter; cur_pos--) {
- (*cur_pos)++;
- if (*cur_pos != 0) {
- break;
- }
- }
+ uint64_t c = AV_RB64A(counter) + 1;
+ AV_WB64A(counter, c);
}
void av_aes_ctr_increment_iv(struct AVAESCTR *a)
--
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".