From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id C30394C163 for ; Wed, 5 Feb 2025 22:18:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3084368B9C9; Thu, 6 Feb 2025 00:18:23 +0200 (EET) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3705C68B528 for ; Thu, 6 Feb 2025 00:18:16 +0200 (EET) Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-30036310158so2406121fa.0 for ; Wed, 05 Feb 2025 14:18:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1738793894; x=1739398694; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=udNWygE0mxWWiz3FVy2EuFBsQW2kSm5NaDldCY8Jz+s=; b=xGxNx0Ugcgw2OQDFMh9CpwsbKVryAjT4JLitfTtzCb9q6xT7MwOTwxYAKaT/BS0XqO JGZz/RU45qp/0eewZ10hs/eq4aoN9/AU/H46I8J+zDMCBXO/DlukAOMS4c2WEpw+mdln TbbkzxgG3z9W/WijOvQvoQde+ek/Muf6VnTboIdu4bTdFhJTqoeisuOtbxiabbc6jPzG EE6MEyMgzEv0342LSEjvdTwjzKPbxjNGALEO0BPUG4S6pBZa2/0MeiKV01VoYGkUHXEb omSDrApumbiiPjXwLOiq+L5/yzfYOPPONMJNcl9o7/Pz4amsv48SNG9wv7mU4ClWwtMw jKCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738793894; x=1739398694; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=udNWygE0mxWWiz3FVy2EuFBsQW2kSm5NaDldCY8Jz+s=; b=aFeOOln2wgtXlYnMF4413qI7CAUyoxnUDMYGqkDWeVvBpckk4ZVpTakqxbVMrzuXYL GcNQC0rDNxoPQcQ79p9hCkP4aoOpbNH8+ChyYiXlIXlMnBZCkBCYWcHKOptpuy6YOJ0+ 1S3pmSZcBUNcGrAvtx/9pUDdX/zBqYOEi3SD6h/rAO9YKKrIIcvjzBzGHZkDnCSrCc6p AQypU0+Kp6FLZlTeDkmLjdPMcdgqXfLiDc7OXMk82qHvlkIKBnNHZvTaVfg5tUQgJZSQ OBI/vNue2TNXtklZ3nAGDqbAv5FpjlUvdbypBh8b5r5txZ2yAwmqWzHZS/0+w8EB6B7D hvqQ== X-Gm-Message-State: AOJu0YxJQ0QHCeBiq1y5joIo0IfdjFakxCtZXqk6MZ40mox0K2Fwscd5 ORiWfQEq0gvpDDFvIDOHaRegUx12ZWXaVaIHSDhDzAOIqWiLrSM4reqxxINtkR9WFWMBQLCitFi 3LA== X-Gm-Gg: ASbGnctdnxA+Q490t5nWm8LxkXq6Vf628n6fvBQh0LG7xTUCuRDmKlqyz1/s+tXTL+F L6XDyVzF30Bj2r54M234CY48QXfqIJU+zn+f2ruz7O/epekzbfA8ShbM6xSbMsxZyjSGtVyXhd+ nUalksYk6vo3gtxanvM/p5DoWnHigvb3srUUY9sKNBwPkzbwiHj8aT/hrpVhvonLCKOkX7X9e24 52zjPAcTObt+ysKJMyZlTJbPQyKHNlVmf/xsAiFVC1TcpyVIcjY5+evyd98pJnv1v1a/Mg/Db8x 4SNsr2ho+ux2Jd0zR7yI/i/iap+KkJymypVvRlglRnWbGRQ= X-Google-Smtp-Source: AGHT+IF5pFRJLsFSslJPMUKPtkP8ytCy9mGwj8mFLdISDPyaW9T2hIhfpllknM4RAhOhI1D6UjulLg== X-Received: by 2002:a2e:a407:0:b0:300:2a48:fb65 with SMTP id 38308e7fff4ca-307cf341604mr14881441fa.18.1738793894237; Wed, 05 Feb 2025 14:18:14 -0800 (PST) Received: from localhost (dsl-tkubng21-50de30-198.dhcp.inet.fi. [80.222.48.198]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-307a309b4cdsm22108501fa.58.2025.02.05.14.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 14:18:13 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Feb 2025 00:18:08 +0200 Message-ID: <20250205221813.4110398-1-martin@martin.st> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] random_seed: Reorder if clauses for gathering entropy 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: michael@niedermayer.cc 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: Make it easier to add more cases. This should be a pure refactoring, with no functional changes. --- libavutil/random_seed.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index 8a4e4f1fc0..ca084b40da 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -98,17 +98,20 @@ static uint32_t get_generic_seed(void) for (;;) { clock_t t = clock(); - if (last_t + 2*last_td + (CLOCKS_PER_SEC > 1000) >= t) { - last_td = t - last_t; - buffer[i & 511] = 1664525*buffer[i & 511] + 1013904223 + (last_td % 3294638521U); + int incremented_i = 0; + int cur_td = t - last_t; + if (last_t + 2*last_td + (CLOCKS_PER_SEC > 1000) < t) { + buffer[++i & 511] += cur_td % 3294638521U; + incremented_i = 1; } else { - last_td = t - last_t; - buffer[++i & 511] += last_td % 3294638521U; - if ((t - init_t) >= CLOCKS_PER_SEC>>5) - if (last_i && i - last_i > 4 || i - last_i > 64 || TEST && i - last_i > 8) - break; + buffer[i & 511] = 1664525*buffer[i & 511] + 1013904223 + (cur_td % 3294638521U); + } + if (incremented_i && (t - init_t) >= CLOCKS_PER_SEC>>5) { + if (last_i && i - last_i > 4 || i - last_i > 64 || TEST && i - last_i > 8) + break; } last_t = t; + last_td = cur_td; if (!init_t) init_t = t; } -- 2.43.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".