diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-13 04:16:25 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-13 04:16:25 +0000 |
commit | 1e05c7d11ef8431ac4042ba8a3bb6512752e3e4f (patch) | |
tree | 999d3be518eb2363e18cf6140414d699f64c2427 | |
parent | 1e9c73304401c81a912e1a73aa60633990bf7420 (diff) | |
parent | efa0f5bc300984c24188213e0d650f1da34d2a09 (diff) | |
download | tremolo-pie-qpr3-s1-release.tar.gz |
Snap for 5304822 from efa0f5bc300984c24188213e0d650f1da34d2a09 to pi-qpr3-releaseandroid-9.0.0_r46android-9.0.0_r44android-9.0.0_r43android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-release
Change-Id: I0f70ad7cafc02b5f51ce3a4e36bf83cb0a1d0e47
-rw-r--r-- | Tremolo/codebook.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c index 467640d..a06302d 100644 --- a/Tremolo/codebook.c +++ b/Tremolo/codebook.c @@ -376,14 +376,21 @@ long _book_maptype1_quantvals(codebook *b){ long acc=1; long acc1=1; int i; - for(i=0;i<b->dim;i++){ - acc*=vals; - acc1*=vals+1; + for (i = 0; i < b->dim; i++) { + if (acc > b->entries / vals) { + break; + } + acc *= vals; + if (acc1 > LONG_MAX / (vals + 1)) { + acc1 = LONG_MAX; + } else { + acc1 *= (vals + 1); + } } - if(acc<=b->entries && acc1>b->entries){ + if (i >= b->dim && acc <= b->entries && acc1 > b->entries) { return(vals); }else{ - if(acc>b->entries){ + if (i < b->dim || acc > b->entries) { vals--; }else{ vals++; |