From 6dc79f1d04eb88ec97360c45be4cadc66b7e5780 Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Wed, 10 Aug 2022 01:53:10 +0200 Subject: avutil/half2float: move non-inline init code out of header --- libavutil/float2half.c | 53 ++++++++++++++++++++++++++++++++++++++++++ libavutil/float2half.h | 36 ++--------------------------- libavutil/half2float.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ libavutil/half2float.h | 46 ++---------------------------------- 4 files changed, 120 insertions(+), 78 deletions(-) create mode 100644 libavutil/float2half.c create mode 100644 libavutil/half2float.c (limited to 'libavutil') diff --git a/libavutil/float2half.c b/libavutil/float2half.c new file mode 100644 index 0000000000..c79a3abfa1 --- /dev/null +++ b/libavutil/float2half.c @@ -0,0 +1,53 @@ +/* + * This file is part of FFmpeg. + * + * 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. + * + * 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/float2half.h" + +void ff_init_float2half_tables(Float2HalfTables *t) +{ + for (int i = 0; i < 256; i++) { + int e = i - 127; + + if (e < -24) { // Very small numbers map to zero + t->basetable[i|0x000] = 0x0000; + t->basetable[i|0x100] = 0x8000; + t->shifttable[i|0x000] = 24; + t->shifttable[i|0x100] = 24; + } else if (e < -14) { // Small numbers map to denorms + t->basetable[i|0x000] = (0x0400>>(-e-14)); + t->basetable[i|0x100] = (0x0400>>(-e-14)) | 0x8000; + t->shifttable[i|0x000] = -e-1; + t->shifttable[i|0x100] = -e-1; + } else if (e <= 15) { // Normal numbers just lose precision + t->basetable[i|0x000] = ((e + 15) << 10); + t->basetable[i|0x100] = ((e + 15) << 10) | 0x8000; + t->shifttable[i|0x000] = 13; + t->shifttable[i|0x100] = 13; + } else if (e < 128) { // Large numbers map to Infinity + t->basetable[i|0x000] = 0x7C00; + t->basetable[i|0x100] = 0xFC00; + t->shifttable[i|0x000] = 24; + t->shifttable[i|0x100] = 24; + } else { // Infinity and NaN's stay Infinity and NaN's + t->basetable[i|0x000] = 0x7C00; + t->basetable[i|0x100] = 0xFC00; + t->shifttable[i|0x000] = 13; + t->shifttable[i|0x100] = 13; + } + } +} diff --git a/libavutil/float2half.h b/libavutil/float2half.h index 3548aa1d45..20fdc2a36b 100644 --- a/libavutil/float2half.h +++ b/libavutil/float2half.h @@ -26,41 +26,9 @@ typedef struct Float2HalfTables { uint8_t shifttable[512]; } Float2HalfTables; -static void init_float2half_tables(Float2HalfTables *t) -{ - for (int i = 0; i < 256; i++) { - int e = i - 127; - - if (e < -24) { // Very small numbers map to zero - t->basetable[i|0x000] = 0x0000; - t->basetable[i|0x100] = 0x8000; - t->shifttable[i|0x000] = 24; - t->shifttable[i|0x100] = 24; - } else if (e < -14) { // Small numbers map to denorms - t->basetable[i|0x000] = (0x0400>>(-e-14)); - t->basetable[i|0x100] = (0x0400>>(-e-14)) | 0x8000; - t->shifttable[i|0x000] = -e-1; - t->shifttable[i|0x100] = -e-1; - } else if (e <= 15) { // Normal numbers just lose precision - t->basetable[i|0x000] = ((e + 15) << 10); - t->basetable[i|0x100] = ((e + 15) << 10) | 0x8000; - t->shifttable[i|0x000] = 13; - t->shifttable[i|0x100] = 13; - } else if (e < 128) { // Large numbers map to Infinity - t->basetable[i|0x000] = 0x7C00; - t->basetable[i|0x100] = 0xFC00; - t->shifttable[i|0x000] = 24; - t->shifttable[i|0x100] = 24; - } else { // Infinity and NaN's stay Infinity and NaN's - t->basetable[i|0x000] = 0x7C00; - t->basetable[i|0x100] = 0xFC00; - t->shifttable[i|0x000] = 13; - t->shifttable[i|0x100] = 13; - } - } -} +void ff_init_float2half_tables(Float2HalfTables *t); -static uint16_t float2half(uint32_t f, const Float2HalfTables *t) +static inline uint16_t float2half(uint32_t f, const Float2HalfTables *t) { uint16_t h; diff --git a/libavutil/half2float.c b/libavutil/half2float.c new file mode 100644 index 0000000000..1967126f76 --- /dev/null +++ b/libavutil/half2float.c @@ -0,0 +1,63 @@ +/* + * This file is part of FFmpeg. + * + * 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. + * + * 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/half2float.h" + +static uint32_t convertmantissa(uint32_t i) +{ + int32_t m = i << 13; // Zero pad mantissa bits + int32_t e = 0; // Zero exponent + + while (!(m & 0x00800000)) { // While not normalized + e -= 0x00800000; // Decrement exponent (1<<23) + m <<= 1; // Shift mantissa + } + + m &= ~0x00800000; // Clear leading 1 bit + e += 0x38800000; // Adjust bias ((127-14)<<23) + + return m | e; // Return combined number +} + +void ff_init_half2float_tables(Half2FloatTables *t) +{ + t->mantissatable[0] = 0; + for (int i = 1; i < 1024; i++) + t->mantissatable[i] = convertmantissa(i); + for (int i = 1024; i < 2048; i++) + t->mantissatable[i] = 0x38000000UL + ((i - 1024) << 13UL); + for (int i = 2048; i < 3072; i++) + t->mantissatable[i] = t->mantissatable[i - 1024] | 0x400000UL; + t->mantissatable[2048] = t->mantissatable[1024]; + + t->exponenttable[0] = 0; + for (int i = 1; i < 31; i++) + t->exponenttable[i] = i << 23; + for (int i = 33; i < 63; i++) + t->exponenttable[i] = 0x80000000UL + ((i - 32) << 23UL); + t->exponenttable[31]= 0x47800000UL; + t->exponenttable[32]= 0x80000000UL; + t->exponenttable[63]= 0xC7800000UL; + + t->offsettable[0] = 0; + for (int i = 1; i < 64; i++) + t->offsettable[i] = 1024; + t->offsettable[31] = 2048; + t->offsettable[32] = 0; + t->offsettable[63] = 2048; +} diff --git a/libavutil/half2float.h b/libavutil/half2float.h index 5696567a8c..428a27a19f 100644 --- a/libavutil/half2float.h +++ b/libavutil/half2float.h @@ -27,51 +27,9 @@ typedef struct Half2FloatTables { uint16_t offsettable[64]; } Half2FloatTables; -static uint32_t convertmantissa(uint32_t i) -{ - int32_t m = i << 13; // Zero pad mantissa bits - int32_t e = 0; // Zero exponent - - while (!(m & 0x00800000)) { // While not normalized - e -= 0x00800000; // Decrement exponent (1<<23) - m <<= 1; // Shift mantissa - } - - m &= ~0x00800000; // Clear leading 1 bit - e += 0x38800000; // Adjust bias ((127-14)<<23) - - return m | e; // Return combined number -} - -static void init_half2float_tables(Half2FloatTables *t) -{ - t->mantissatable[0] = 0; - for (int i = 1; i < 1024; i++) - t->mantissatable[i] = convertmantissa(i); - for (int i = 1024; i < 2048; i++) - t->mantissatable[i] = 0x38000000UL + ((i - 1024) << 13UL); - for (int i = 2048; i < 3072; i++) - t->mantissatable[i] = t->mantissatable[i - 1024] | 0x400000UL; - t->mantissatable[2048] = t->mantissatable[1024]; - - t->exponenttable[0] = 0; - for (int i = 1; i < 31; i++) - t->exponenttable[i] = i << 23; - for (int i = 33; i < 63; i++) - t->exponenttable[i] = 0x80000000UL + ((i - 32) << 23UL); - t->exponenttable[31]= 0x47800000UL; - t->exponenttable[32]= 0x80000000UL; - t->exponenttable[63]= 0xC7800000UL; - - t->offsettable[0] = 0; - for (int i = 1; i < 64; i++) - t->offsettable[i] = 1024; - t->offsettable[31] = 2048; - t->offsettable[32] = 0; - t->offsettable[63] = 2048; -} +void ff_init_half2float_tables(Half2FloatTables *t); -static uint32_t half2float(uint16_t h, const Half2FloatTables *t) +static inline uint32_t half2float(uint16_t h, const Half2FloatTables *t) { uint32_t f; -- cgit v1.2.3