From 5c8ffbaa7fe7ccba78ffe056d943910400af9508 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 6 Mar 2013 04:56:33 +0100 Subject: [PATCH] qdm2: simplify arithmetic coder tables generation Someone should rename the variables, theres nothing random in there Signed-off-by: Michael Niedermayer --- libavcodec/qdm2_tablegen.h | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/libavcodec/qdm2_tablegen.h b/libavcodec/qdm2_tablegen.h index a90682f43c..13ec9beb62 100644 --- a/libavcodec/qdm2_tablegen.h +++ b/libavcodec/qdm2_tablegen.h @@ -54,8 +54,7 @@ static av_cold void softclip_table_init(void) { // random generated table static av_cold void rnd_table_init(void) { int i,j; - uint32_t ldw,hdw; - uint64_t tmp64_1; + uint32_t ldw; uint64_t random_seed = 0; float delta = 1.0 / 16384.0; for(i = 0; i < 4096 ;i++) { @@ -67,22 +66,18 @@ static av_cold void rnd_table_init(void) { random_seed = 81; ldw = i; for (j = 0; j < 5 ;j++) { - random_dequant_index[i][j] = (uint8_t)((ldw / random_seed) & 0xFF); - ldw = (uint32_t)ldw % (uint32_t)random_seed; - tmp64_1 = (random_seed * 0x55555556); - hdw = (uint32_t)(tmp64_1 >> 32); - random_seed = (uint64_t)(hdw + (ldw >> 31)); + random_dequant_index[i][j] = ldw / random_seed; + ldw %= random_seed; + random_seed /= 3; } } for (i = 0; i < 128 ;i++) { random_seed = 25; ldw = i; for (j = 0; j < 3 ;j++) { - random_dequant_type24[i][j] = (uint8_t)((ldw / random_seed) & 0xFF); - ldw = (uint32_t)ldw % (uint32_t)random_seed; - tmp64_1 = (random_seed * 0x66666667); - hdw = (uint32_t)(tmp64_1 >> 33); - random_seed = hdw + (ldw >> 31); + random_dequant_type24[i][j] = ldw / random_seed; + ldw %= random_seed; + random_seed /= 5; } } }