eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-06 07:21:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Making NaN detection more robust to -ffast-math.

Browse source
This commit is contained in:
Jean-Marc Valin 2013-12-09 21:56:21 -05:00
parent 4fda6b0142
commit 15edb78b3e
4 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
celt/arch.h
View file

@ -137,6 +137,22 @@ typedef float celt_sig;
typedef float celt_norm; typedef float celt_norm;
typedef float celt_ener; typedef float celt_ener;
#ifdef FLOAT_APPROX
/* This code should reliably detect NaN/inf even when -ffast-math is used.
Assumes IEEE 754 format. */
static inline int celt_isnan(float x)
{
union {float f; opus_uint32 i;} in;
in.f = x;
return ((in.i>>23)&0xFF)==0xFF && (in.i&0x007FFFFF)!=0;
}
#else
#ifdef __FAST_MATH__
#error Cannot build libopus with -ffast-math unless FLOAT_APPROX is defined. This could result in crashes on extreme (e.g. NaN) input
#endif
#define celt_isnan(x) ((x)!=(x))
#endif
#define Q15ONE 1.0f #define Q15ONE 1.0f
#define NORM_SCALING 1.f #define NORM_SCALING 1.f

5
src/mlp.c
View file

@ -75,6 +75,11 @@ static OPUS_INLINE float tansig_approx(float x)
return 1; return 1;
if (!(x>-8)) if (!(x>-8))
return -1; return -1;
#ifndef FIXED_POINT
/* Another check in case of -ffast-math */
if (celt_isnan(x))
return 0;
#endif
if (x<0) if (x<0)
{ {
x=-x; x=-x;

4
src/mlp_data.c
View file

@ -1,6 +1,10 @@
/* The contents of this file was automatically generated by mlp_train.c /* The contents of this file was automatically generated by mlp_train.c
It contains multi-layer perceptron (MLP) weights. */ It contains multi-layer perceptron (MLP) weights. */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "mlp.h" #include "mlp.h"
/* RMS error was 0.138320, seed was 1361535663 */ /* RMS error was 0.138320, seed was 1361535663 */

2
src/opus_encoder.c
View file

@ -1452,7 +1452,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
sum = celt_inner_prod(&pcm_buf[total_buffer*st->channels], &pcm_buf[total_buffer*st->channels], frame_size*st->channels); sum = celt_inner_prod(&pcm_buf[total_buffer*st->channels], &pcm_buf[total_buffer*st->channels], frame_size*st->channels);
/* This should filter out both NaNs and ridiculous signals that could /* This should filter out both NaNs and ridiculous signals that could
cause NaNs further down. */ cause NaNs further down. */
if (!(sum < 1e9)) if (!(sum < 1e9) || celt_isnan(sum))
OPUS_CLEAR(&pcm_buf[total_buffer*st->channels], frame_size*st->channels); OPUS_CLEAR(&pcm_buf[total_buffer*st->channels], frame_size*st->channels);
} }
#endif #endif