Commit 40756c17 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge init_rootpow2table and init_pow2table.

Originally committed as revision 13364 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c2c3dedf
...@@ -185,18 +185,11 @@ static void dump_short_table(short* table, int size, int delimiter) { ...@@ -185,18 +185,11 @@ static void dump_short_table(short* table, int size, int delimiter) {
/* table generator */ /* table generator */
static void init_pow2table(COOKContext *q){ static void init_pow2table(COOKContext *q){
int i; int i;
q->rootpow2tab[63] =
q->pow2tab[63] = 1.0; q->pow2tab[63] = 1.0;
for (i=1 ; i<64 ; i++){ for (i=1 ; i<64 ; i++){
q->pow2tab[63+i]=(float)((uint64_t)1<<i); q->pow2tab[63+i]=(float)((uint64_t)1<<i);
q->pow2tab[63-i]=1.0/(float)((uint64_t)1<<i); q->pow2tab[63-i]=1.0/(float)((uint64_t)1<<i);
}
}
/* table generator */
static void init_rootpow2table(COOKContext *q){
int i;
q->rootpow2tab[63] = 1.0;
for (i=1 ; i<64 ; i++){
q->rootpow2tab[63+i]=sqrt((float)((uint64_t)1<<i)); q->rootpow2tab[63+i]=sqrt((float)((uint64_t)1<<i));
q->rootpow2tab[63-i]=sqrt(1.0/(float)((uint64_t)1<<i)); q->rootpow2tab[63-i]=sqrt(1.0/(float)((uint64_t)1<<i));
} }
...@@ -1124,7 +1117,6 @@ static int cook_decode_init(AVCodecContext *avctx) ...@@ -1124,7 +1117,6 @@ static int cook_decode_init(AVCodecContext *avctx)
q->numvector_size = (1 << q->log2_numvector_size); q->numvector_size = (1 << q->log2_numvector_size);
/* Generate tables */ /* Generate tables */
init_rootpow2table(q);
init_pow2table(q); init_pow2table(q);
init_gain_table(q); init_gain_table(q);
init_cplscales_table(q); init_cplscales_table(q);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment