diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-13 13:02:23 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-13 13:02:23 +0000 |
| commit | ded1fc1388512a013fa43a8d2767bebf58000f0b (patch) | |
| tree | 600db2cceed1c6fffd057f37bba63a75f313e843 | |
| parent | 730fefc0a78614e09b6e94258468cf3a8c741c85 (diff) | |
| parent | f6646105b9b8d9b5912f606da818d614b3171f78 (diff) | |
| download | libopus-android-mainline-12.0.0_r120.tar.gz | |
Snap for 7913023 from f6646105b9b8d9b5912f606da818d614b3171f78 to mainline-media-swcodec-releaseandroid-mainline-12.0.0_r91android-mainline-12.0.0_r75android-mainline-12.0.0_r47android-mainline-12.0.0_r120android-mainline-12.0.0_r105android12-mainline-media-swcodec-release
Change-Id: I6d6c1a812487e58746c4171e22567ff841273c45
| -rw-r--r-- | src/analysis.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/analysis.c b/src/analysis.c index 058328f0..8b4f22d0 100644 --- a/src/analysis.c +++ b/src/analysis.c @@ -149,7 +149,10 @@ static opus_val32 silk_resampler_down2_hp( out32_hp = ADD32( out32_hp, X ); S[ 2 ] = ADD32( -in32, X ); - hp_ener += out32_hp*(opus_val64)out32_hp; + if(__builtin_add_overflow(hp_ener, out32_hp*(opus_val64)out32_hp, &hp_ener)) + { + hp_ener = UINT64_MAX; + } /* Add, convert back to int16 and store to output */ out[ k ] = HALF32(out32); } |