# HG changeset patch
# User vitor
# Date 1236534192 0
# Node ID aa459306ee5943c036e9f7ce1e95ad681677d14a
# Parent  4e91d96dd0452c9d856236c51324267901e2b4e9
Use FLG pseudo-random number generator in RoQ and ELBG

diff -r 4e91d96dd045 -r aa459306ee59 elbg.c
--- a/elbg.c	Sun Mar 08 16:37:57 2009 +0000
+++ b/elbg.c	Sun Mar 08 17:43:12 2009 +0000
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#include "libavutil/random.h"
+#include "libavutil/lfg.h"
 #include "elbg.h"
 #include "avcodec.h"
 
@@ -52,7 +52,7 @@
     int *utility_inc;
     int *nearest_cb;
     int *points;
-    AVRandomState *rand_state;
+    AVLFG *rand_state;
 } elbg_data;
 
 static inline int distance_limited(int *a, int *b, int dim, int limit)
@@ -105,7 +105,7 @@
 {
     int i=0;
     /* Using linear search, do binary if it ever turns to be speed critical */
-    int r = av_random(elbg->rand_state)%(elbg->utility_inc[elbg->numCB-1]-1) + 1;
+    int r = av_lfg_get(elbg->rand_state)%(elbg->utility_inc[elbg->numCB-1]-1) + 1;
     while (elbg->utility_inc[i] < r)
         i++;
 
@@ -318,7 +318,7 @@
 
 void ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
                   int numCB, int max_steps, int *closest_cb,
-                  AVRandomState *rand_state)
+                  AVLFG *rand_state)
 {
     int i, k;
 
@@ -345,7 +345,7 @@
 
 void ff_do_elbg(int *points, int dim, int numpoints, int *codebook,
                 int numCB, int max_steps, int *closest_cb,
-                AVRandomState *rand_state)
+                AVLFG *rand_state)
 {
     int dist;
     elbg_data elbg_d;
diff -r 4e91d96dd045 -r aa459306ee59 elbg.h
--- a/elbg.h	Sun Mar 08 16:37:57 2009 +0000
+++ b/elbg.h	Sun Mar 08 17:43:12 2009 +0000
@@ -39,7 +39,7 @@
  */
 void ff_do_elbg(int *points, int dim, int numpoints, int *codebook,
                 int numCB, int num_steps, int *closest_cb,
-                AVRandomState *rand_state);
+                AVLFG *rand_state);
 
 /**
  * Initialize the **codebook vector for the elbg algorithm. If you have already
@@ -50,6 +50,6 @@
  */
 void ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
                   int numCB, int num_steps, int *closest_cb,
-                  AVRandomState *rand_state);
+                  AVLFG *rand_state);
 
 #endif /* AVCODEC_ELBG_H */
diff -r 4e91d96dd045 -r aa459306ee59 roqvideo.h
--- a/roqvideo.h	Sun Mar 08 16:37:57 2009 +0000
+++ b/roqvideo.h	Sun Mar 08 17:43:12 2009 +0000
@@ -22,7 +22,7 @@
 #ifndef AVCODEC_ROQVIDEO_H
 #define AVCODEC_ROQVIDEO_H
 
-#include "libavutil/random.h"
+#include "libavutil/lfg.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
@@ -58,7 +58,7 @@
     int width, height;
 
     /* Encoder only data */
-    AVRandomState randctx;
+    AVLFG randctx;
     uint64_t lambda;
 
     motion_vect *this_motion4;
diff -r 4e91d96dd045 -r aa459306ee59 roqvideoenc.c
--- a/roqvideoenc.c	Sun Mar 08 16:37:57 2009 +0000
+++ b/roqvideoenc.c	Sun Mar 08 17:43:12 2009 +0000
@@ -929,7 +929,7 @@
 {
     RoqContext *enc = avctx->priv_data;
 
-    av_random_init(&enc->randctx, 1);
+    av_lfg_init(&enc->randctx, 1);
 
     enc->framesSinceKeyframe = 0;
     if ((avctx->width & 0xf) || (avctx->height & 0xf)) {