shithub: opus

Download patch

ref: aebc9046f9902e0c3f44d0d866261294592ea693
parent: a8e2a2b1a8ab2cb9d9e7d4fe21128ac9e769fe4e
author: Jean-Marc Valin <jmvalin@jmvalin.ca>
date: Tue Oct 16 11:57:04 EDT 2018 

Renaming compute_allocation to clt_compute_allocation() to avoid symbol clashes

As suggested in https://github.com/xiph/opus/pull/83


--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -1059,7 +1059,7 @@
    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);
 
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -2191,7 +2191,7 @@
 #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)
--- a/celt/rate.c
+++ b/celt/rate.c
@@ -529,7 +529,7 @@
    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;
--- a/celt/rate.h
+++ b/celt/rate.h
@@ -95,7 +95,7 @@
  @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