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 027DB4CC4B for ; Wed, 12 Feb 2025 09:30:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 506C168BEF8; Wed, 12 Feb 2025 11:30:01 +0200 (EET) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B099B689D43 for ; Wed, 12 Feb 2025 11:29:54 +0200 (EET) Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-308edbc368cso31721351fa.1 for ; Wed, 12 Feb 2025 01:29:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1739352594; x=1739957394; 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=oTOb+zttDWQUP8Cp29pRFPNg37e5mmzvj3SmhLoSV0o1LDawz0mDzigjmd7iE1sS/o P+wK8qmCNOW1r/SelpyKUTT/K1bR8/tud8SXmMRoeZpLqtapybQzox65yO6b4UsLyRO7 KDC+BXRX4SWK8yEuKJnGV1En+SklX89ejL/C5uhWIK5tr181FaYZ30jTZ3/JxXSYHTDn i8LIM8WdK0aMTssVVvfYn8d9rk3hZ3I47xVCd4IOhtKqXRo1XIIBNS8zWqI3RY7HgQFF fmfXwytmDBGowJL6on0Bx+6/u1WrNDSYz60IAS/a0aut9MMuiP3y2cqWFABSzAYeeLMB oW7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739352594; x=1739957394; 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=qDlJDEn3JA0GTFdD3JDoslkvxDswyq1WbJJAd1ZM9KVhPrC0O5hV/xvSzqMuMVgyQE OWCS12YEUIDnJ88qzprCmqa7ZH3hN+flEpVadQLVFL5vCFrM+tlbxa68Zdla0UK6myq8 mCgD5e4dHCz1Hwc6Wyn14zxfJBrQ5bGdV3qPnyBwuAfPalNZx/4f2ltQoiqp/PfoNW3V QTDB2QsRP0voKmAY+wLTqE4TczjSDRxhZNBqFe/ovKcIzi+jtA1F9ZdlfqZiexVavGQJ +0JjWhacxzbu61Gt8EllD7W2HO19mHvH8Yus7JiMO8EiIoI0a2oZrc+3cB1OWjTv9ZFR 9AWg== X-Gm-Message-State: AOJu0Yxuc+x40dOosljF1tSlfUlePG9GT2bvMDAIImq+zjClBI/Ad0M2 r32IODWyTsDobaj/Kil7dheprAbXJmzhmjfZfjdqYxMaD7uyjJp+WYbaNaYs3NZDi2zXZb9O7rq Hkg== X-Gm-Gg: ASbGncufS8LIRjdNkx1rIzjCwW/vSTZdXG/UDsWtcQqVWlnX3rhDooe5fkynpQNzEKS AiNFRMVNeTqCqs3JF30tYrAUL8M0odsxCgTGTXRrCMLzOuYir741ZHhr2hVjeY5LgdfjR0JkjPo OfFY6blO65jlIlRnEwfN+DgU7j7J8UWLKussd/1QjR/4qfNnPL2gCQ1cA5yNisjlsFmiWI17t3Z VXGCJRhUliYWDs0dv/0rExigUDId0oLvI1+gxEfPHbkIfmXoCaxckg89UzFEUq/WX1y3ZLdueCX i+56CplMKKLSCg45DArBOb+tY7aeUXDv+RRSwfaed9OueQg= X-Google-Smtp-Source: AGHT+IGFxkNcfFhc1LqYgaw/ML6UahJiokL0OE/ktzOSnPy1MRAK2q7xr3qPz/kqQgDBXE/hnd9hRQ== X-Received: by 2002:a05:651c:1a0c:b0:308:f01f:1836 with SMTP id 38308e7fff4ca-30905091ab1mr5911831fa.27.1739352593678; Wed, 12 Feb 2025 01:29:53 -0800 (PST) Received: from localhost (dsl-tkubng21-50de30-198.dhcp.inet.fi. [80.222.48.198]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-308e5775081sm11970211fa.49.2025.02.12.01.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 01:29:53 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Feb 2025 11:29:48 +0200 Message-ID: <20250212092953.2760237-1-martin@martin.st> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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 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".