Prevents a symbol name clash with the G729 version used by OpenH323
authorjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Wed, 6 Nov 2002 01:47:39 +0000 (01:47 +0000)
committerjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Wed, 6 Nov 2002 01:47:39 +0000 (01:47 +0000)
git-svn-id: http://svn.xiph.org/trunk/speex@4082 0101bb08-14d6-0310-b084-bc0e0c8e3800

libspeex/lpc.c
libspeex/lpc.h
libspeex/nb_celp.c
libspeex/sb_celp.c

index aa2ed28..9aec141 100644 (file)
@@ -106,7 +106,7 @@ wld(
  *                      `--'
  * for lags between 0 and lag-1, and x == 0 outside 0...n-1
  */
-void autocorr(
+void _spx_autocorr(
               const float * x,   /*  in: [0...n-1] samples x   */
               float *ac,   /* out: [0...lag-1] ac values */
               int lag, int   n)
index 9e9490a..e3f70b5 100644 (file)
@@ -33,7 +33,7 @@
 #ifndef LPC_H
 #define LPC_H
 
-void autocorr(
+void _spx_autocorr(
               const float * x,   /*  in: [0...n-1] samples x   */
               float *ac,   /* out: [0...lag-1] ac values */
               int lag, int   n);
index 53f1cba..5c79f26 100644 (file)
@@ -251,7 +251,7 @@ void nb_encode(void *state, float *in, SpeexBits *bits)
       st->buf2[i] = st->frame[i] * st->window[i];
 
    /* Compute auto-correlation */
-   autocorr(st->buf2, st->autocorr, st->lpcSize+1, st->windowSize);
+   _spx_autocorr(st->buf2, st->autocorr, st->lpcSize+1, st->windowSize);
 
    st->autocorr[0] += 10;        /* prevents NANs */
    st->autocorr[0] *= st->lpc_floor; /* Noise floor in auto-correlation domain */
index 7cbefce..27ef0c6 100644 (file)
@@ -305,7 +305,7 @@ void sb_encode(void *state, float *in, SpeexBits *bits)
       st->buf[i] = st->high[i] * st->window[i];
 
    /* Compute auto-correlation */
-   autocorr(st->buf, st->autocorr, st->lpcSize+1, st->windowSize);
+   _spx_autocorr(st->buf, st->autocorr, st->lpcSize+1, st->windowSize);
 
    st->autocorr[0] += 1;        /* prevents NANs */
    st->autocorr[0] *= st->lpc_floor; /* Noise floor in auto-correlation domain */