diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2018-10-16 15:57:04 -0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2018-10-16 15:57:04 -0400 |
| commit | aebc9046f9902e0c3f44d0d866261294592ea693 (patch) | |
| tree | 4dc3be91b7d2700a2de7bfd928f103309aacad38 | |
| parent | a8e2a2b1a8ab2cb9d9e7d4fe21128ac9e769fe4e (diff) | |
| download | opus-aebc9046f9902e0c3f44d0d866261294592ea693.tar.gz | |
Renaming compute_allocation to clt_compute_allocation() to avoid symbol clashes
As suggested in https://github.com/xiph/opus/pull/83
| -rw-r--r-- | celt/celt_decoder.c | 2 | ||||
| -rw-r--r-- | celt/celt_encoder.c | 2 | ||||
| -rw-r--r-- | celt/rate.c | 2 | ||||
| -rw-r--r-- | celt/rate.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c index 8520e57b..e6efce93 100644 --- a/celt/celt_decoder.c +++ b/celt/celt_decoder.c @@ -1059,7 +1059,7 @@ int celt_decode_with_ec(CELTDecoder * OPUS_RESTRICT st, const unsigned char *dat ALLOC(pulses, nbEBands, int); ALLOC(fine_priority, nbEBands, int); - codedBands = compute_allocation(mode, start, end, offsets, cap, + codedBands = clt_compute_allocation(mode, start, end, offsets, cap, alloc_trim, &intensity, &dual_stereo, bits, &balance, pulses, fine_quant, fine_priority, C, LM, dec, 0, 0, 0); diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c index e6a47df6..44cb0850 100644 --- a/celt/celt_encoder.c +++ b/celt/celt_encoder.c @@ -2191,7 +2191,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm, #endif if (st->lfe) signalBandwidth = 1; - codedBands = compute_allocation(mode, start, end, offsets, cap, + codedBands = clt_compute_allocation(mode, start, end, offsets, cap, alloc_trim, &st->intensity, &dual_stereo, bits, &balance, pulses, fine_quant, fine_priority, C, LM, enc, 1, st->lastCodedBands, signalBandwidth); if (st->lastCodedBands) diff --git a/celt/rate.c b/celt/rate.c index ca4cc870..465e1ba2 100644 --- a/celt/rate.c +++ b/celt/rate.c @@ -529,7 +529,7 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end, return codedBands; } -int compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo, +int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo, opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth) { int lo, hi, len, j; diff --git a/celt/rate.h b/celt/rate.h index 515f7687..852b9d6f 100644 --- a/celt/rate.h +++ b/celt/rate.h @@ -95,7 +95,7 @@ static OPUS_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int puls @param pulses Number of pulses per band (returned) @return Total number of bits allocated */ -int compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stero, +int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stero, opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth); #endif |