RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil/half2float: move non-inline init code out of header

This commit is contained in:
Timo Rothenpieler 2022-08-10 01:53:10 +02:00
parent f3fb528cd5
commit 6dc79f1d04
11 changed files with 166 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/Makefile
View File

@ -337,8 +337,8 @@ OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o
OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o
OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o
OBJS-$(CONFIG_EVRC_DECODER) += evrcdec.o acelp_vectors.o lsp.o
OBJS-$(CONFIG_EXR_DECODER) += exr.o exrdsp.o
OBJS-$(CONFIG_EXR_ENCODER) += exrenc.o
OBJS-$(CONFIG_EXR_DECODER) += exr.o exrdsp.o half2float.o
OBJS-$(CONFIG_EXR_ENCODER) += exrenc.o float2half.o
OBJS-$(CONFIG_FASTAUDIO_DECODER) += fastaudio.o
OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o
OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1.o
@ -570,8 +570,8 @@ OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o
OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o
OBJS-$(CONFIG_PGX_DECODER) += pgxdec.o
OBJS-$(CONFIG_PHM_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PHM_ENCODER) += pnmenc.o
OBJS-$(CONFIG_PHM_DECODER) += pnmdec.o pnm.o half2float.o
OBJS-$(CONFIG_PHM_ENCODER) += pnmenc.o float2half.o
OBJS-$(CONFIG_PHOTOCD_DECODER) += photocd.o
OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o
OBJS-$(CONFIG_PIXLET_DECODER) += pixlet.o

2
libavcodec/exr.c
View File

@ -2208,7 +2208,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
float one_gamma = 1.0f / s->gamma;
avpriv_trc_function trc_func = NULL;
init_half2float_tables(&s->h2f_tables);
ff_init_half2float_tables(&s->h2f_tables);
s->avctx = avctx;

2
libavcodec/exrenc.c
View File

@ -94,7 +94,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
{
EXRContext *s = avctx->priv_data;
init_float2half_tables(&s->f2h_tables);
ff_init_float2half_tables(&s->f2h_tables);
switch (avctx->pix_fmt) {
case AV_PIX_FMT_GBRPF32:

19
libavcodec/float2half.c Normal file
View File

@ -0,0 +1,19 @@
/*
* 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.c"

19
libavcodec/half2float.c Normal file
View File

@ -0,0 +1,19 @@
/*
* 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.c"

2
libavcodec/pnmdec.c
View File

@ -477,7 +477,7 @@ static av_cold int phm_dec_init(AVCodecContext *avctx)
{
PNMContext *s = avctx->priv_data;
init_half2float_tables(&s->h2f_tables);
ff_init_half2float_tables(&s->h2f_tables);
return 0;
}

2
libavcodec/pnmenc.c
View File

@ -294,7 +294,7 @@ static av_cold int phm_enc_init(AVCodecContext *avctx)
{
PHMEncContext *s = avctx->priv_data;
init_float2half_tables(&s->f2h_tables);
ff_init_float2half_tables(&s->f2h_tables);
return 0;
}

53
libavutil/float2half.c Normal file
View File

@ -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;
}
}
}

36
libavutil/float2half.h
View File

@ -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;
void ff_init_float2half_tables(Float2HalfTables *t);
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;
}
}
}
static uint16_t float2half(uint32_t f, const Float2HalfTables *t)
static inline uint16_t float2half(uint32_t f, const Float2HalfTables *t)
{
uint16_t h;

63
libavutil/half2float.c Normal file
View File

@ -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;
}

46
libavutil/half2float.h
View File

@ -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
void ff_init_half2float_tables(Half2FloatTables *t);
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;
}
static uint32_t half2float(uint16_t h, const Half2FloatTables *t)
static inline uint32_t half2float(uint16_t h, const Half2FloatTables *t)
{
uint32_t f;