diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2016-03-12 19:08:21 +0100 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2016-03-13 18:15:57 +0100 |
| commit | 7c93f2c0b940e07c2a1fd0fb8f7ffc94dcfdb1aa (patch) | |
| tree | 5e3ae0a4203931fe1af970ebcb1115f1dd2ab452 /libavcodec/cbrt_tablegen.h | |
| parent | 0c33ceda91dd646414a2e0ec832bada5acb6b762 (diff) | |
| download | ffmpeg-7c93f2c0b940e07c2a1fd0fb8f7ffc94dcfdb1aa.tar.gz | |
Move cbrt tables to separate cbrt_data(_fixed).c files.
Allows sharing and reusing the data between different files.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavcodec/cbrt_tablegen.h')
| -rw-r--r-- | libavcodec/cbrt_tablegen.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/libavcodec/cbrt_tablegen.h b/libavcodec/cbrt_tablegen.h index 21e4b9a117..9af18d8ab5 100644 --- a/libavcodec/cbrt_tablegen.h +++ b/libavcodec/cbrt_tablegen.h @@ -35,21 +35,12 @@ #define CBRT(x) av_float2int((float)(x)) #endif -#if CONFIG_HARDCODED_TABLES -#if USE_FIXED -#define cbrt_tableinit_fixed() -#include "libavcodec/cbrt_fixed_tables.h" -#else -#define cbrt_tableinit() -#include "libavcodec/cbrt_tables.h" -#endif -#else -static uint32_t cbrt_tab[1 << 13]; +uint32_t AAC_RENAME(ff_cbrt_tab)[1 << 13]; -static av_cold void AAC_RENAME(cbrt_tableinit)(void) +av_cold void AAC_RENAME(ff_cbrt_tableinit)(void) { static double cbrt_tab_dbl[1 << 13]; - if (!cbrt_tab[(1<<13) - 1]) { + if (!AAC_RENAME(ff_cbrt_tab)[(1<<13) - 1]) { int i, j, k; double cbrt_val; @@ -75,9 +66,8 @@ static av_cold void AAC_RENAME(cbrt_tableinit)(void) } for (i = 0; i < 1<<13; i++) - cbrt_tab[i] = CBRT(cbrt_tab_dbl[i]); + AAC_RENAME(ff_cbrt_tab)[i] = CBRT(cbrt_tab_dbl[i]); } } -#endif /* CONFIG_HARDCODED_TABLES */ #endif /* AVCODEC_CBRT_TABLEGEN_H */ |