eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-03 09:07:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes two warnings in pitch_xcorr()

Browse source 
Rename y0 and y1 because of the name clash with Bessel functions.
Initialize y_3 to zero because gcc is too dumb to realize it can't
be used uninitialized.
This commit is contained in:
Jean-Marc Valin 2013-05-25 02:51:56 -04:00
parent e8e57a32f6
commit 319df9a836
1 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

80
celt/pitch.c
View file

@ -266,65 +266,65 @@ pitch_xcorr(opus_val16 *_x, opus_val16 *_y, opus_val32 *xcorr, int len, int max_
opus_val32 sum4=0; opus_val32 sum4=0;
const opus_val16 *y = _y+i; const opus_val16 *y = _y+i;
const opus_val16 *x = _x; const opus_val16 *x = _x;
opus_val16 y0, y1, y2, y3; opus_val16 y_0, y_1, y_2, y_3;
/*y0=y[0];y1=y[1];y2=y[2];y3=y[3];*/ y_3=0; /* gcc doesn't realize that y_3 can't be used uninitialized */
y0=*y++; y_0=*y++;
y1=*y++; y_1=*y++;
y2=*y++; y_2=*y++;
for (j=0;j<len-3;j+=4) for (j=0;j<len-3;j+=4)
{ {
opus_val16 tmp; opus_val16 tmp;
tmp = *x++; tmp = *x++;
y3=*y++; y_3=*y++;
sum1 = MAC16_16(sum1,tmp,y0); sum1 = MAC16_16(sum1,tmp,y_0);
sum2 = MAC16_16(sum2,tmp,y1); sum2 = MAC16_16(sum2,tmp,y_1);
sum3 = MAC16_16(sum3,tmp,y2); sum3 = MAC16_16(sum3,tmp,y_2);
sum4 = MAC16_16(sum4,tmp,y3); sum4 = MAC16_16(sum4,tmp,y_3);
tmp=*x++; tmp=*x++;
y0=*y++; y_0=*y++;
sum1 = MAC16_16(sum1,tmp,y1); sum1 = MAC16_16(sum1,tmp,y_1);
sum2 = MAC16_16(sum2,tmp,y2); sum2 = MAC16_16(sum2,tmp,y_2);
sum3 = MAC16_16(sum3,tmp,y3); sum3 = MAC16_16(sum3,tmp,y_3);
sum4 = MAC16_16(sum4,tmp,y0); sum4 = MAC16_16(sum4,tmp,y_0);
tmp=*x++; tmp=*x++;
y1=*y++; y_1=*y++;
sum1 = MAC16_16(sum1,tmp,y2); sum1 = MAC16_16(sum1,tmp,y_2);
sum2 = MAC16_16(sum2,tmp,y3); sum2 = MAC16_16(sum2,tmp,y_3);
sum3 = MAC16_16(sum3,tmp,y0); sum3 = MAC16_16(sum3,tmp,y_0);
sum4 = MAC16_16(sum4,tmp,y1); sum4 = MAC16_16(sum4,tmp,y_1);
tmp=*x++; tmp=*x++;
y2=*y++; y_2=*y++;
sum1 = MAC16_16(sum1,tmp,y3); sum1 = MAC16_16(sum1,tmp,y_3);
sum2 = MAC16_16(sum2,tmp,y0); sum2 = MAC16_16(sum2,tmp,y_0);
sum3 = MAC16_16(sum3,tmp,y1); sum3 = MAC16_16(sum3,tmp,y_1);
sum4 = MAC16_16(sum4,tmp,y2); sum4 = MAC16_16(sum4,tmp,y_2);
} }
if (j++<len) if (j++<len)
{ {
opus_val16 tmp = *x++; opus_val16 tmp = *x++;
y3=*y++; y_3=*y++;
sum1 = MAC16_16(sum1,tmp,y0); sum1 = MAC16_16(sum1,tmp,y_0);
sum2 = MAC16_16(sum2,tmp,y1); sum2 = MAC16_16(sum2,tmp,y_1);
sum3 = MAC16_16(sum3,tmp,y2); sum3 = MAC16_16(sum3,tmp,y_2);
sum4 = MAC16_16(sum4,tmp,y3); sum4 = MAC16_16(sum4,tmp,y_3);
} }
if (j++<len) if (j++<len)
{ {
opus_val16 tmp=*x++; opus_val16 tmp=*x++;
y0=*y++; y_0=*y++;
sum1 = MAC16_16(sum1,tmp,y1); sum1 = MAC16_16(sum1,tmp,y_1);
sum2 = MAC16_16(sum2,tmp,y2); sum2 = MAC16_16(sum2,tmp,y_2);
sum3 = MAC16_16(sum3,tmp,y3); sum3 = MAC16_16(sum3,tmp,y_3);
sum4 = MAC16_16(sum4,tmp,y0); sum4 = MAC16_16(sum4,tmp,y_0);
} }
if (j<len) if (j<len)
{ {
opus_val16 tmp=*x++; opus_val16 tmp=*x++;
y1=*y++; y_1=*y++;
sum1 = MAC16_16(sum1,tmp,y2); sum1 = MAC16_16(sum1,tmp,y_2);
sum2 = MAC16_16(sum2,tmp,y3); sum2 = MAC16_16(sum2,tmp,y_3);
sum3 = MAC16_16(sum3,tmp,y0); sum3 = MAC16_16(sum3,tmp,y_0);
sum4 = MAC16_16(sum4,tmp,y1); sum4 = MAC16_16(sum4,tmp,y_1);
} }
xcorr[i]=sum1; xcorr[i]=sum1;
xcorr[i+1]=sum2; xcorr[i+1]=sum2;