From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 27 Apr 2012 10:23:40 +0000 (+0200)
Subject: swr-test: simplify prng code
X-Git-Tag: android-x86-4.4-r1~12172
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dcfc12e86acbacbf50ee87d8e66ec44584d119f4;p=android-x86%2Fexternal-ffmpeg.git

swr-test: simplify prng code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libswresample/swresample_test.c b/libswresample/swresample_test.c
index d475e56528..ddba2d5c20 100644
--- a/libswresample/swresample_test.c
+++ b/libswresample/swresample_test.c
@@ -145,10 +145,11 @@ static void audiogen(void *data, enum AVSampleFormat sample_fmt,
     double tabf1[SWR_CH_MAX];
     double tabf2[SWR_CH_MAX];
     double taba[SWR_CH_MAX];
-    unsigned static seed;
+    unsigned static rnd;
 
 #define PUT_SAMPLE set(data, ch, k, channels, sample_fmt, v);
-#define dbl_rand(x) ((seed = seed * 1664525 + 1013904223)*2.0 / (double)UINT_MAX - 1)
+#define uint_rand(x) (x = x * 1664525 + 1013904223)
+#define dbl_rand(x) (uint_rand(x)*2.0 / (double)UINT_MAX - 1)
     k = 0;
 
     /* 1 second of single freq sinus at 1000 Hz */
@@ -187,8 +188,8 @@ static void audiogen(void *data, enum AVSampleFormat sample_fmt,
     /* 1 second of unrelated ramps for each channel */
     for (ch = 0; ch < channels; ch++) {
         taba[ch]  = 0;
-        tabf1[ch] = 100 + (seed = seed * 1664525 + 1013904223) % 5000;
-        tabf2[ch] = 100 + (seed = seed * 1664525 + 1013904223) % 5000;
+        tabf1[ch] = 100 + uint_rand(rnd) % 5000;
+        tabf2[ch] = 100 + uint_rand(rnd) % 5000;
     }
     for (i = 0; i < 1 * sample_rate && k < nb_samples; i++, k++) {
         for (ch = 0; ch < channels; ch++) {