[xiph-cvs] cvs commit: speex/libspeex lpc.c lpc.h nb_celp.c sb_celp.c

[Jean-Marc Valin]

jm          02/11/05 20:47:39

  Modified:    libspeex lpc.c lpc.h nb_celp.c sb_celp.c
  Log:
  Prevents a symbol name clash with the G729 version used by OpenH323

Revision  Changes    Path
1.7       +1 -1      speex/libspeex/lpc.c

Index: lpc.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/lpc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lpc.c	11 Oct 2002 03:39:34 -0000	1.6
+++ lpc.c	6 Nov 2002 01:47:39 -0000	1.7
@@ -106,7 +106,7 @@
  *                      `--'
  * 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)

<p><p>1.4       +1 -1      speex/libspeex/lpc.h

Index: lpc.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/lpc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lpc.h	11 Oct 2002 03:39:34 -0000	1.3
+++ lpc.h	6 Nov 2002 01:47:39 -0000	1.4
@@ -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);

<p><p>1.78      +1 -1      speex/libspeex/nb_celp.c

Index: nb_celp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/nb_celp.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- nb_celp.c	2 Nov 2002 15:27:24 -0000	1.77
+++ nb_celp.c	6 Nov 2002 01:47:39 -0000	1.78
@@ -251,7 +251,7 @@
       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 */

<p><p>1.88      +1 -1      speex/libspeex/sb_celp.c

Index: sb_celp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/sb_celp.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sb_celp.c	4 Nov 2002 03:00:51 -0000	1.87
+++ sb_celp.c	6 Nov 2002 01:47:39 -0000	1.88
@@ -305,7 +305,7 @@
       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 */

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.