commit b7bd4c20acfd951ba46647e07411285997d952f4
author Jean-Marc Valin <jmvalin@jmvalin.ca> Sat May 18 23:33:48 2013 -0400
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Sat May 18 23:52:18 2013 -0400
tree 62938a5bce642bc1ac25e638a2b3427ee48d8b06
parent 359306985b69086e260bb4cc9b053ba00f3125d1

celt_maxabs16() now returns an opus_val32 to avoid problems with -32768

celt/celt_encoder.c

diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 41bbe88..26e6ebb 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -106,7 +106,7 @@
    opus_int32 vbr_drift;
    opus_int32 vbr_offset;
    opus_int32 vbr_count;
-   opus_val16 overlap_max;
+   opus_val32 overlap_max;
    opus_val16 stereo_saving;
    int intensity;
    opus_val16 *energy_save;
@@ -1158,7 +1158,7 @@
    opus_val16 tf_estimate;
    int pitch_change=0;
    opus_int32 tot_boost;
-   opus_val16 sample_max;
+   opus_val32 sample_max;
    opus_val16 maxDepth;
    const OpusCustomMode *mode;
    int nbEBands;
@@ -1289,9 +1289,9 @@
 
    ALLOC(in, CC*(N+st->overlap), celt_sig);
 
-   sample_max=MAX16(st->overlap_max, celt_maxabs16(pcm, C*(N-overlap)/st->upsample));
+   sample_max=MAX32(st->overlap_max, celt_maxabs16(pcm, C*(N-overlap)/st->upsample));
    st->overlap_max=celt_maxabs16(pcm+C*(N-overlap)/st->upsample, C*overlap/st->upsample);
-   sample_max=MAX16(sample_max, st->overlap_max);
+   sample_max=MAX32(sample_max, st->overlap_max);
 #ifdef FIXED_POINT
    silence = (sample_max==0);
 #else