From patchwork Tue Jan 2 02:28:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45450 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp6480004pzh; Mon, 1 Jan 2024 18:28:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IF6ffA2eI7U600WF7/yrQrZmGzevsdLDstyBBmWftxfpb6Fa0YpZ4QOgvmqVPzNu0AM/SzB X-Received: by 2002:a17:907:789:b0:a27:7701:f16 with SMTP id xd9-20020a170907078900b00a2777010f16mr7091151ejb.7.1704162538924; Mon, 01 Jan 2024 18:28:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704162538; cv=none; d=google.com; s=arc-20160816; b=qLA2m5pbpwWA4gjZUNlk9e9ZpDASdba4Vx3OQ78S4uK6hUHv0JCEARBkB3iaw9FmIj 1yechDUQLHKS3ETrHVqYM6RfP6j4Vlk3v6pL7Wne7fALrIAMRaylOmuLiDhvP+PhBAz4 uD0m0NA0MvVkczQ5ZZCDDb53/WBBB9hWSMHOtCEyRj7QuzhGuoAYEio6fXzaTRK3/Z6g FOKZ2sqWUroI/uCwPhqfc5HwvHFOubCoNJo0/og+IArUo1zZLqh6J4FJDoZmytgU99Mo TXUSbDZ24VxqRO09J65GwdcV4yOw3Ipq5wUdEkaBGNXKH3CfTpS/T1ITEFT2BqqOcgiK x1tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=yygCk7x0cAy84JNeKtk10RelMT68asJatMTsaTw6f04=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=q+EvrNjW4NTkY+NdVPkbSy9lInwGORm7FOWqsUYVWAv1HbhtVTWImNhlkgJfK7QMKH jtyj7xo2JKFjdV92sTWAJcnYyeJY/KLO54e8o+u5A9PyLzfT6sflsy3fB9cy49fN5Vok kIbKLb4F651ZY7nQxd4RkGXFmKOKIGpFrpMRz5zwiTgYTIagammfuujnrEzM/wVUlE6F Q6HTwJ6Gr05F4494IgD6GbwggTnCrrO9+BmFDOS3kmm8WkyrNWyLCnCHqmEhS5rvV1Sd mvDCCUo8aJ0xL6235dQxXc9VVIg6N/iZb/0swEwL0SKggnaT+ftZuol6OrHHYiJ5b31J Pp9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=EC+MW9JM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v4-20020a170906564400b00a26e16f51besi7091276ejr.711.2024.01.01.18.28.57; Mon, 01 Jan 2024 18:28:58 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=EC+MW9JM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EAA9F68BD5A; Tue, 2 Jan 2024 04:28:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6AC0D68BD5A for ; Tue, 2 Jan 2024 04:28:47 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 75E75C0004 for ; Tue, 2 Jan 2024 02:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1704162526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Qck0HJ/RNnqU7kaCJCTr08CeyVo8rhaLNsI7XCITGj4=; b=EC+MW9JMJytG4vxL9n7h0l1wqbu3QFxLDCoYEBO3Vrd9IXh99K8iH+4cS7N+qR2WYq8A2n eDSj88UrMfdMH13NxqnPJi1FOvpzCXJGAEbMX3P9XfXCXpiSJ3bSw4CNT3Tg/J6bo+ouFZ iRjX1gjRHVB48U4oJv8EDIF638s+PptawjYHl32QHANZ0a6Q59KKQFjyNEYrLGQCU2WnG9 nSGTbtkjiJuyDnaxP9RKIsPlZmnmmprGE6s/7tw+c6zefiNnKpJDIckVzRTaCC6NJvPSdA 8H1+hIQHsBfSQMzYWIR5oIUfzGWyTzOywYXkcfrpGyznkPwBe5/jRBlLLeVj1g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 2 Jan 2024 03:28:45 +0100 Message-Id: <20240102022845.9916-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avutil/eval: Use integer for random() state 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uhzw3SHOBhVf rounding the 64bit integer state to double between each iteration causes a reduction in quality of the random number generator. For example its period drops from 2^64 to around 200 million Signed-off-by: Michael Niedermayer --- libavutil/eval.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libavutil/eval.c b/libavutil/eval.c index bad9e4ecb8d..89c61ba4bf5 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -55,6 +55,7 @@ typedef struct Parser { void *log_ctx; #define VARS 10 double *var; + uint64_t *var_uint64; } Parser; static const AVClass eval_class = { @@ -173,6 +174,7 @@ struct AVExpr { } a; struct AVExpr *param[3]; double *var; + uint64_t *var_uint64; }; static double etime(double v) @@ -230,9 +232,10 @@ static double eval_expr(Parser *p, AVExpr *e) } case e_random:{ int idx= av_clip(eval_expr(p, e->param[0]), 0, VARS-1); - uint64_t r= isnan(p->var[idx]) ? 0 : p->var[idx]; + uint64_t r= p->var_uint64[idx] ? p->var_uint64[idx] : (isnan(p->var[idx]) ? 0 : p->var[idx]); r= r*1664525+1013904223; p->var[idx]= r; + p->var_uint64[idx]= r; return e->value * (r * (1.0/UINT64_MAX)); } case e_while: { @@ -319,7 +322,11 @@ static double eval_expr(Parser *p, AVExpr *e) case e_div: return e->value * (d2 ? (d / d2) : d * INFINITY); case e_add: return e->value * (d + d2); case e_last:return e->value * d2; - case e_st : return e->value * (p->var[av_clip(d, 0, VARS-1)]= d2); + case e_st : { + int index = av_clip(d, 0, VARS-1); + p->var_uint64[index] = 0; + return e->value * (p->var[index]= d2); + } case e_hypot:return e->value * hypot(d, d2); case e_atan2:return e->value * atan2(d, d2); case e_bitand: return isnan(d) || isnan(d2) ? NAN : e->value * ((long int)d & (long int)d2); @@ -339,6 +346,7 @@ void av_expr_free(AVExpr *e) av_expr_free(e->param[1]); av_expr_free(e->param[2]); av_freep(&e->var); + av_freep(&e->var_uint64); av_freep(&e); } @@ -724,7 +732,8 @@ int av_expr_parse(AVExpr **expr, const char *s, goto end; } e->var= av_mallocz(sizeof(double) *VARS); - if (!e->var) { + e->var_uint64= av_mallocz(sizeof(uint64_t) *VARS); + if (!e->var || !e->var_uint64) { ret = AVERROR(ENOMEM); goto end; } @@ -766,6 +775,7 @@ double av_expr_eval(AVExpr *e, const double *const_values, void *opaque) { Parser p = { 0 }; p.var= e->var; + p.var_uint64= e->var_uint64; p.const_values = const_values; p.opaque = opaque;