[FFmpeg-cvslog] r17881 - in trunk/libavcodec: elbg.c elbg.h roqvideo.h roqvideoenc.c

[vitor]

Author: vitor
Date: Sun Mar  8 18:43:12 2009
New Revision: 17881

Log:
Use FLG pseudo-random number generator in RoQ and ELBG

Modified:
   trunk/libavcodec/elbg.c
   trunk/libavcodec/elbg.h
   trunk/libavcodec/roqvideo.h
   trunk/libavcodec/roqvideoenc.c

Modified: trunk/libavcodec/elbg.c
==============================================================================
--- trunk/libavcodec/elbg.c	Sun Mar  8 17:37:57 2009	(r17880)
+++ trunk/libavcodec/elbg.c	Sun Mar  8 18:43:12 2009	(r17881)
@@ -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 @@ typedef struct{
     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 @@ static int get_high_utility_cell(elbg_da
 {
     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 @@ static void do_shiftings(elbg_data *elbg
 
 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_init_elbg(int *points, int dim, 
 
 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;

Modified: trunk/libavcodec/elbg.h
==============================================================================
--- trunk/libavcodec/elbg.h	Sun Mar  8 17:37:57 2009	(r17880)
+++ trunk/libavcodec/elbg.h	Sun Mar  8 18:43:12 2009	(r17881)
@@ -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_do_elbg(int *points, int dim, in
  */
 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 */

Modified: trunk/libavcodec/roqvideo.h
==============================================================================
--- trunk/libavcodec/roqvideo.h	Sun Mar  8 17:37:57 2009	(r17880)
+++ trunk/libavcodec/roqvideo.h	Sun Mar  8 18:43:12 2009	(r17881)
@@ -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 @@ typedef struct RoqContext {
     int width, height;
 
     /* Encoder only data */
-    AVRandomState randctx;
+    AVLFG randctx;
     uint64_t lambda;
 
     motion_vect *this_motion4;

Modified: trunk/libavcodec/roqvideoenc.c
==============================================================================
--- trunk/libavcodec/roqvideoenc.c	Sun Mar  8 17:37:57 2009	(r17880)
+++ trunk/libavcodec/roqvideoenc.c	Sun Mar  8 18:43:12 2009	(r17881)
@@ -929,7 +929,7 @@ static int roq_encode_init(AVCodecContex
 {
     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)) {