commit 2dc27dfa13eb4f2b9cd291852b4e9c9508cd9cb2
author Jean-Marc Valin <jmvalin@jmvalin.ca> Wed Nov 13 19:35:43 2013 -0500
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Wed Nov 13 23:18:26 2013 -0500
tree 2995e3420a13cc416d8c4282f1bfa99aeaad3bf2
parent ab86a9cca7f891044d64e4ca6c055bc95224d773

Rename preemphasis() to celt_preemphasis() to avoid amrnb symbol clash

http://lists.xiph.org/pipermail/opus/2013-November/002372.html

celt/celt.h

diff --git a/celt/celt.h b/celt/celt.h
index ad1c1d8..1d41f5f 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -194,7 +194,7 @@
 
 int resampling_factor(opus_int32 rate);
 
-void preemphasis(const opus_val16 * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTRICT inp,
+void celt_preemphasis(const opus_val16 * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTRICT inp,
                         int N, int CC, int upsample, const opus_val16 *coef, celt_sig *mem, int clip);
 
 void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,

celt/celt_encoder.c

diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 784d432..ba78ea9 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -450,7 +450,7 @@
 }
 
 
-void preemphasis(const opus_val16 * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTRICT inp,
+void celt_preemphasis(const opus_val16 * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTRICT inp,
                         int N, int CC, int upsample, const opus_val16 *coef, celt_sig *mem, int clip)
 {
    int i;
@@ -1452,7 +1452,7 @@
       enc->nbits_total+=tell-ec_tell(enc);
    }
    c=0; do {
-      preemphasis(pcm+c, in+c*(N+st->overlap)+st->overlap, N, CC, st->upsample,
+      celt_preemphasis(pcm+c, in+c*(N+st->overlap)+st->overlap, N, CC, st->upsample,
                   mode->preemph, st->preemph_memE+c, st->clip);
    } while (++c<CC);