tablegen: Don't use cbrtf in host tools

You cannot count on them being present on all systems, and you
cannot include libm.h in a host tool, so just hard code baseline
implementations.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
pull/39/head
Derek Buitenhuis 12 years ago
parent 884fd4d259
commit bc31a7a3b6
  1. 3
      libavcodec/cbrt_tablegen.h
  2. 6
      libavcodec/mpegaudio_tablegen.h

@ -36,12 +36,13 @@ static void cbrt_tableinit(void)
{ {
if (!cbrt_tab[(1<<13) - 1]) { if (!cbrt_tab[(1<<13) - 1]) {
int i; int i;
/* cbrtf() isn't available on all systems, so we use powf(). */
for (i = 0; i < 1<<13; i++) { for (i = 0; i < 1<<13; i++) {
union { union {
float f; float f;
uint32_t i; uint32_t i;
} f; } f;
f.f = cbrtf(i) * i; f.f = powf(i, 1.0 / 3.0) * i;
cbrt_tab[i] = f.i; cbrt_tab[i] = f.i;
} }
} }

@ -47,7 +47,8 @@ static void mpegaudio_tableinit(void)
double value = i / 4; double value = i / 4;
double f, fm; double f, fm;
int e, m; int e, m;
f = value * cbrtf(value) * pow(2, (i & 3) * 0.25); /* cbrtf() isn't available on all systems, so we use powf(). */
f = value * powf(value, 1.0 / 3.0) * pow(2, (i & 3) * 0.25);
fm = frexp(f, &e); fm = frexp(f, &e);
m = (uint32_t)(fm * (1LL << 31) + 0.5); m = (uint32_t)(fm * (1LL << 31) + 0.5);
e += FRAC_BITS - 31 + 5 - 100; e += FRAC_BITS - 31 + 5 - 100;
@ -58,7 +59,8 @@ static void mpegaudio_tableinit(void)
} }
for (exponent = 0; exponent < 512; exponent++) { for (exponent = 0; exponent < 512; exponent++) {
for (value = 0; value < 16; value++) { for (value = 0; value < 16; value++) {
double f = (double)value * cbrtf(value) * pow(2, (exponent - 400) * 0.25 + FRAC_BITS + 5); /* cbrtf() isn't available on all systems, so we use powf(). */
double f = (double)value * powf(value, 1.0 / 3.0) * pow(2, (exponent - 400) * 0.25 + FRAC_BITS + 5);
expval_table_fixed[exponent][value] = llrint(f); expval_table_fixed[exponent][value] = llrint(f);
expval_table_float[exponent][value] = f; expval_table_float[exponent][value] = f;
} }

Loading…
Cancel
Save