diff options
Diffstat (limited to 'libavcodec/cbrt_tablegen.h')
| -rw-r--r-- | libavcodec/cbrt_tablegen.h | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/libavcodec/cbrt_tablegen.h b/libavcodec/cbrt_tablegen.h index 60d900a94f..27a3e3ae29 100644 --- a/libavcodec/cbrt_tablegen.h +++ b/libavcodec/cbrt_tablegen.h @@ -3,20 +3,20 @@ * * Copyright (c) 2010 Reimar Döffinger <Reimar.Doeffinger@gmx.de> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,14 +25,27 @@ #include <stdint.h> #include <math.h> +#include "libavutil/attributes.h" +#include "libavcodec/aac_defines.h" + +#if USE_FIXED +#define CBRT(x) (int)floor((x).f * 8192 + 0.5) +#else +#define CBRT(x) x.i +#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]; -static void cbrt_tableinit(void) +static av_cold void AAC_RENAME(cbrt_tableinit)(void) { if (!cbrt_tab[(1<<13) - 1]) { int i; @@ -42,8 +55,8 @@ static void cbrt_tableinit(void) float f; uint32_t i; } f; - f.f = powf(i, 1.0 / 3.0) * i; - cbrt_tab[i] = f.i; + f.f = pow(i, 1.0 / 3.0) * i; + cbrt_tab[i] = CBRT(f); } } } |