commit 71766ef7a451a48536255c62c273b037ebcb2c42
author Jean-Marc Valin <jmvalin@jmvalin.ca> Mon Jun 17 00:44:12 2013 -0400
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Mon Jun 17 00:44:12 2013 -0400
tree 3251cf9977d479b515aee62b80b9116d06813c16
parent 7fd98c571f781c32d5de0ec83be3f38b678e73fe

Avoids symbol clashes with Speex (pitch_xcorr) and libm (y1)

celt/pitch.c

diff --git a/celt/pitch.c b/celt/pitch.c
index 025f448..ac99360 100644
--- a/celt/pitch.c
+++ b/celt/pitch.c
@@ -222,7 +222,7 @@
 #else
 void
 #endif
-pitch_xcorr(opus_val16 *x, opus_val16 *y, opus_val32 *xcorr, int len, int max_pitch)
+celt_pitch_xcorr(opus_val16 *x, opus_val16 *y, opus_val32 *xcorr, int len, int max_pitch)
 {
    int i, j;
 #ifdef FIXED_POINT
@@ -250,7 +250,7 @@
 #else
 void
 #endif
-pitch_xcorr(opus_val16 *_x, opus_val16 *_y, opus_val32 *xcorr, int len, int max_pitch)
+celt_pitch_xcorr(opus_val16 *_x, opus_val16 *_y, opus_val32 *xcorr, int len, int max_pitch)
 {
    int i,j;
 #ifdef FIXED_POINT
@@ -342,7 +342,7 @@
 #ifdef FIXED_POINT
    maxcorr =
 #endif
-   pitch_xcorr(x_lp4, y_lp4, xcorr, len>>2, max_pitch>>2);
+   celt_pitch_xcorr(x_lp4, y_lp4, xcorr, len>>2, max_pitch>>2);
 
    find_best_pitch(xcorr, y_lp4, len>>2, max_pitch>>2, best_pitch
 #ifdef FIXED_POINT
@@ -395,14 +395,14 @@
 }
 
 #ifndef OVERRIDE_DUAL_INNER_PROD
-static opus_val32 dual_inner_prod(opus_val16 *x, opus_val16 *y1, opus_val16 *y2, int N)
+static opus_val32 dual_inner_prod(opus_val16 *x, opus_val16 *y01, opus_val16 *y02, int N)
 {
    int i;
    opus_val32 xy=0;
    for (i=0;i<N;i++)
    {
-      xy = MAC16_16(xy, x[i], y1[i]);
-      xy = MAC16_16(xy, x[i], y2[i]);
+      xy = MAC16_16(xy, x[i], y01[i]);
+      xy = MAC16_16(xy, x[i], y02[i]);
    }
    return xy;
 }