zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iSAC fixed point: fix int overflows

Browse Source 
Bug: webrtc:11137
Change-Id: If9276457b39285191ee2d9a0fbcb7e0a7a379be8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168523
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30513}
This commit is contained in:
Alessio Bazzica
2020-02-13 11:19:10 +01:00
committed by Commit Bot
parent 72d6915d5f
commit d428ddd8f1
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c
View File

@ -21,7 +21,8 @@ extern int32_t WebRtcIsacfix_Log2Q8(uint32_t x);
void WebRtcIsacfix_PCorr2Q32(const int16_t* in, int32_t* logcorQ8) {
int16_t scaling,n,k;
int32_t ysum32,csum32, lys, lcs;
int32_t csum32, lys, lcs;
int64_t ysum64;
const int32_t oneQ8 = 1 << 8; // 1.00 in Q8
const int16_t* x;
const int16_t* inptr;
@ -30,15 +31,15 @@ void WebRtcIsacfix_PCorr2Q32(const int16_t* in, int32_t* logcorQ8) {
scaling = WebRtcSpl_GetScalingSquare((int16_t*)in,
PITCH_CORR_LEN2,
PITCH_CORR_LEN2);
ysum32 = 1;
ysum64 = 1;
csum32 = 0;
x = in + PITCH_MAX_LAG / 2 + 2;
for (n = 0; n < PITCH_CORR_LEN2; n++) {
ysum32 += in[n] * in[n] >> scaling; // Q0
ysum64 += in[n] * in[n] >> scaling; // Q0
csum32 += x[n] * in[n] >> scaling; // Q0
}
logcorQ8 += PITCH_LAG_SPAN2 - 1;
lys = WebRtcIsacfix_Log2Q8((uint32_t)ysum32) >> 1; // Q8, sqrt(ysum)
lys = WebRtcIsacfix_Log2Q8((uint32_t)ysum64) >> 1; // Q8, sqrt(ysum)
if (csum32 > 0) {
lcs = WebRtcIsacfix_Log2Q8((uint32_t)csum32); // 2log(csum) in Q8
if (lcs > (lys + oneQ8)) { // csum/sqrt(ysum) > 2 in Q8
@ -53,9 +54,9 @@ void WebRtcIsacfix_PCorr2Q32(const int16_t* in, int32_t* logcorQ8) {
for (k = 1; k < PITCH_LAG_SPAN2; k++) {
inptr = &in[k];
ysum32 -= in[k - 1] * in[k - 1] >> scaling;
ysum32 += in[PITCH_CORR_LEN2 + k - 1] * in[PITCH_CORR_LEN2 + k - 1] >>
scaling;
ysum64 -= in[k - 1] * in[k - 1] >> scaling;
ysum64 += (int32_t)(in[PITCH_CORR_LEN2 + k - 1])
* in[PITCH_CORR_LEN2 + k - 1] >> scaling;
#ifdef WEBRTC_HAS_NEON
{
@ -82,21 +83,22 @@ void WebRtcIsacfix_PCorr2Q32(const int16_t* in, int32_t* logcorQ8) {
csum32 += vbuff[3];
}
#else
csum32 = 0;
int64_t csum64_tmp = 0;
if(scaling == 0) {
for (n = 0; n < PITCH_CORR_LEN2; n++) {
csum32 += x[n] * inptr[n];
csum64_tmp += (int32_t)(x[n]) * inptr[n];
}
} else {
for (n = 0; n < PITCH_CORR_LEN2; n++) {
csum32 += (x[n] * inptr[n]) >> scaling;
csum64_tmp += ((int32_t)(x[n]) * inptr[n]) >> scaling;
}
}
csum32 = csum64_tmp;
#endif
logcorQ8--;
lys = WebRtcIsacfix_Log2Q8((uint32_t)ysum32) >> 1; // Q8, sqrt(ysum)
lys = WebRtcIsacfix_Log2Q8((uint32_t)ysum64) >> 1; // Q8, sqrt(ysum)
if (csum32 > 0) {
lcs = WebRtcIsacfix_Log2Q8((uint32_t)csum32); // 2log(csum) in Q8