From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 31C324E4B3 for ; Wed, 11 Jun 2025 01:54:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id AE37368BEBF; Wed, 11 Jun 2025 04:54:41 +0300 (EEST) Received: from mail-vs1-f49.google.com (mail-vs1-f49.google.com [209.85.217.49]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 73AAE68BCB0 for ; Wed, 11 Jun 2025 04:54:35 +0300 (EEST) Received: by mail-vs1-f49.google.com with SMTP id ada2fe7eead31-4e7ba9726a9so158722137.3 for ; Tue, 10 Jun 2025 18:54:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749606873; x=1750211673; 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=enfLVp9Bkuj2zr2DoLPj+8tWHDlpTRJ1anh3cmo426w=; b=dhT068CJAKejWGROcRxQ7xyO4pEsvMxQ3MobQQUfMPB313AULn0HW0x77IZuRAO3G2 HptfDPcy8rxF+e7isovzpvI0JqEovEUL9ktAIdkab3ioW6B7+QN8BuyA095lJbm/LsFr VH5z1Pfj++PyapVG7qGcgyVJ90CkXQY8AT4gDdTWnjpyY4dZ34c3tlzNE5lHSgkJdFiN 7Ie9ODOyg0J9HBBpG9PRzsltVd3q+dueWMFVy1K9NMTWl1lNEqOwyu9b8o8rdTBVKkIc DvBY1s2ZSqONaGNWD553G4Y6VqxTF/Wu4FEKG+5Q3bA6LddBv81IkEQFw70jXpqgize8 M5KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749606873; x=1750211673; 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=enfLVp9Bkuj2zr2DoLPj+8tWHDlpTRJ1anh3cmo426w=; b=qaieiILSuWXdXm7SVWNpiS2Ju/vMffInAA+uKnUIyUzQEOVJN6GomTghn6Z9ZoZma6 ATLkDzTIfGwKZOmAIUBDoz4YJT8+hfPNwkSHNAIIaSVhlO2bHKds2rzGpzOl1ugWVIwR uK2HSwXsamzOqKzjGkIMjzTi6V+r+Img7TZALz861Wsg0WE7c8bur7NbWrS7yulpTfE/ I/wX1gz60MIYnRl3BO5wK1g4TcUwXrHblqG+Nz2CVBFRIFpH5URc0+FYLSaLfF1MdCS7 ZiqR/6BJ3QJcURZUgDfrhfkoao6f6d8GuAV6HnHiRMaIJNGVMBbG+CEkA1WforrzShYH NYqg== X-Gm-Message-State: AOJu0YxsoVjuNtafaQ+di7Pge/QOWeHXehUlO9Fq+mMMb6vmlRJ83TVE JjTs/Ai53qDCW+hEZ6E8xmD87YlCDyHENxVRdS1ORYjNNmxKShbXoaWnu+LZmg== X-Gm-Gg: ASbGnctkMoG1N+6usvPhmJi332GPmVc1jqKmlrek6VDJS+6OiVDRecsDthryID3jEeP LjrFKYGBedQyW7hr5vhnG+yZEYmULl6nBcAcr6jitkHpNQfEEa9qBTNw+d+wuhHRzRmLd+FEzt6 4hrGU8F/F8J5PTWPGlBfac+VTiFrz0W7QU1e/ViV35pJnJ4z9MywTPTeZK5J3mMW6RfNbXYHdZi INiTo57gcMJaYMgDbJar0DVKTddDyA6poK6LFCBv2zXxmFcNrqKwKqDlYYiNWFD7tLGks3tWKlu dA4+ehLwwvdF/Y+nxUPAhzwdmb+f3lpc+2hQgMekSrViIvlccPMZAnY9sVqEzps+UMBg/lO8Had dCu8= X-Google-Smtp-Source: AGHT+IFVrEa4aXNSAAixOr8qHGZAdTtx2PkNSNZMDWzBHIEBcgWgBjy9NBz8w77dVyJ9atZFAjWG2Q== X-Received: by 2002:a05:6102:8099:b0:4e2:a235:2483 with SMTP id ada2fe7eead31-4e7bafd8a74mr1743056137.19.1749606873452; Tue, 10 Jun 2025 18:54:33 -0700 (PDT) Received: from localhost.localdomain ([2800:2121:b000:82e:4125:db3:37dc:a9ca]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-87eeaf6e05bsm2151838241.28.2025.06.10.18.54.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 18:54:32 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Jun 2025 22:54:13 -0300 Message-ID: <20250611015415.19575-1-jamrial@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avutil/aes_ctr: rename AES_BLOCK_SIZE to FF_AES_BLOCK_SIZE 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is in preparation for the following commit, to prevent redefinitions from namespace collisions. Signed-off-by: James Almer --- libavutil/aes_ctr.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavutil/aes_ctr.c b/libavutil/aes_ctr.c index 63dcb20d3a..76333ede33 100644 --- a/libavutil/aes_ctr.c +++ b/libavutil/aes_ctr.c @@ -29,11 +29,11 @@ #include "mem.h" #include "random_seed.h" -#define AES_BLOCK_SIZE (16) +#define FF_AES_BLOCK_SIZE (16) typedef struct AVAESCTR { - DECLARE_ALIGNED(8, uint8_t, counter)[AES_BLOCK_SIZE]; - DECLARE_ALIGNED(8, uint8_t, encrypted_counter)[AES_BLOCK_SIZE]; + DECLARE_ALIGNED(8, uint8_t, counter)[FF_AES_BLOCK_SIZE]; + DECLARE_ALIGNED(8, uint8_t, encrypted_counter)[FF_AES_BLOCK_SIZE]; AVAES aes; } AVAESCTR; @@ -96,19 +96,19 @@ void av_aes_ctr_increment_iv(struct AVAESCTR *a) void av_aes_ctr_crypt(struct AVAESCTR *a, uint8_t *dst, const uint8_t *src, int count) { - while (count >= AES_BLOCK_SIZE) { + while (count >= FF_AES_BLOCK_SIZE) { av_aes_crypt(&a->aes, a->encrypted_counter, a->counter, 1, NULL, 0); av_aes_ctr_increment_be64(a->counter + 8); #if HAVE_FAST_64BIT - for (int len = 0; len < AES_BLOCK_SIZE; len += 8) + for (int len = 0; len < FF_AES_BLOCK_SIZE; len += 8) AV_WN64(&dst[len], AV_RN64(&src[len]) ^ AV_RN64A(&a->encrypted_counter[len])); #else - for (int len = 0; len < AES_BLOCK_SIZE; len += 4) + for (int len = 0; len < FF_AES_BLOCK_SIZE; len += 4) AV_WN32(&dst[len], AV_RN32(&src[len]) ^ AV_RN32A(&a->encrypted_counter[len])); #endif - dst += AES_BLOCK_SIZE; - src += AES_BLOCK_SIZE; - count -= AES_BLOCK_SIZE; + dst += FF_AES_BLOCK_SIZE; + src += FF_AES_BLOCK_SIZE; + count -= FF_AES_BLOCK_SIZE; } if (count > 0) { -- 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".