[FFmpeg-cvslog] r18078 - trunk/libavcodec/nellymoserdec.c

[banan]

Author: banan
Date: Fri Mar 20 22:15:02 2009
New Revision: 18078

Log:
Get rid of av_random in nellymoserdec.c

Modified:
   trunk/libavcodec/nellymoserdec.c

Modified: trunk/libavcodec/nellymoserdec.c
==============================================================================
--- trunk/libavcodec/nellymoserdec.c	Fri Mar 20 18:23:45 2009	(r18077)
+++ trunk/libavcodec/nellymoserdec.c	Fri Mar 20 22:15:02 2009	(r18078)
@@ -32,7 +32,8 @@
  */
 
 #include "nellymoser.h"
-#include "libavutil/random.h"
+#include "libavutil/lfg.h"
+#include "libavutil/random_seed.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
@@ -44,7 +45,7 @@ typedef struct NellyMoserDecodeContext {
     AVCodecContext* avctx;
     DECLARE_ALIGNED_16(float,float_buf[NELLY_SAMPLES]);
     float           state[128];
-    AVRandomState   random_state;
+    AVLFG           random_state;
     GetBitContext   gb;
     int             add_bias;
     float           scale_bias;
@@ -107,7 +108,7 @@ static void nelly_decode_block(NellyMose
         for (j = 0; j < NELLY_FILL_LEN; j++) {
             if (bits[j] <= 0) {
                 aptr[j] = M_SQRT1_2*pows[j];
-                if (av_random(&s->random_state) & 1)
+                if (av_lfg_get(&s->random_state) & 1)
                     aptr[j] *= -1.0;
             } else {
                 v = get_bits(&s->gb, bits[j]);
@@ -128,7 +129,7 @@ static av_cold int decode_init(AVCodecCo
     NellyMoserDecodeContext *s = avctx->priv_data;
 
     s->avctx = avctx;
-    av_random_init(&s->random_state, 0);
+    av_lfg_init(&s->random_state, ff_random_get_seed());
     ff_mdct_init(&s->imdct_ctx, 8, 1);
 
     dsputil_init(&s->dsp, avctx);