eden-emu/opus
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preventing NaNs from crashing surround_analysis()

Browse source
This commit is contained in:
Jean-Marc Valin 2015-10-07 09:17:50 -04:00
parent 5dca296833
commit 7c49ad0c5b
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/opus_encoder.c
View file

@ -1465,7 +1465,10 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
/* 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 < 1e9f) || celt_isnan(sum)) if (!(sum < 1e9f) || 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);
st->hp_mem[0] = st->hp_mem[1] = st->hp_mem[2] = st->hp_mem[3] = 0;
}
} }
#endif #endif

14
src/opus_multistream_encoder.c
View file

@ -41,6 +41,7 @@
#include "modes.h" #include "modes.h"
#include "bands.h" #include "bands.h"
#include "quant_bands.h" #include "quant_bands.h"
#include "pitch.h"
typedef struct { typedef struct {
int nb_streams; int nb_streams;
@ -259,6 +260,19 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, opus_val16 *b
OPUS_COPY(in, mem+c*overlap, overlap); OPUS_COPY(in, mem+c*overlap, overlap);
(*copy_channel_in)(x, 1, pcm, channels, c, len); (*copy_channel_in)(x, 1, pcm, channels, c, len);
celt_preemphasis(x, in+overlap, frame_size, 1, upsample, celt_mode->preemph, preemph_mem+c, 0); celt_preemphasis(x, in+overlap, frame_size, 1, upsample, celt_mode->preemph, preemph_mem+c, 0);
#ifndef FIXED_POINT
{
opus_val32 sum;
sum = celt_inner_prod(in, in, frame_size+overlap, 0);
/* This should filter out both NaNs and ridiculous signals that could
cause NaNs further down. */
if (!(sum < 1e9f) || celt_isnan(sum))
{
OPUS_CLEAR(in, frame_size+overlap);
preemph_mem[c] = 0;
}
}
#endif
clt_mdct_forward(&celt_mode->mdct, in, freq, celt_mode->window, overlap, celt_mode->maxLM-LM, 1); clt_mdct_forward(&celt_mode->mdct, in, freq, celt_mode->window, overlap, celt_mode->maxLM-LM, 1);
if (upsample != 1) if (upsample != 1)
{ {