diff options
| author | Andrew D'Addesio <modchipv12@gmail.com> | 2017-12-02 11:36:25 -0600 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-12-04 07:28:45 +0000 |
| commit | de052ea454e06f2c1aab4e06cca0012cf80f2630 (patch) | |
| tree | be9c8345cc23e85ae5e612feac738d3d44419330 /libavcodec/opus_celt.c | |
| parent | 511e6f17f493719058229630c7db4d8d7c05aeac (diff) | |
| download | ffmpeg-de052ea454e06f2c1aab4e06cca0012cf80f2630.tar.gz | |
opus_celt: Fix arithmetic overflow (per RFC8251)
As per Sec.8 of RFC8251:
Cap on Band Energy
NaN due to large log-energy value. Affects celt_denormalize().
Signed-off-by: Andrew D'Addesio <modchipv12@gmail.com>
Diffstat (limited to 'libavcodec/opus_celt.c')
| -rw-r--r-- | libavcodec/opus_celt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/opus_celt.c b/libavcodec/opus_celt.c index 84d484753b..ff56041ea6 100644 --- a/libavcodec/opus_celt.c +++ b/libavcodec/opus_celt.c @@ -481,7 +481,8 @@ static void celt_denormalize(CeltFrame *f, CeltBlock *block, float *data) for (i = f->start_band; i < f->end_band; i++) { float *dst = data + (ff_celt_freq_bands[i] << f->size); - float norm = exp2f(block->energy[i] + ff_celt_mean_energy[i]); + float log_norm = block->energy[i] + ff_celt_mean_energy[i]; + float norm = exp2f(FFMIN(log_norm, 32.0f)); for (j = 0; j < ff_celt_freq_range[i] << f->size; j++) dst[j] *= norm; |