summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marc Valin <jmvalin@jmvalin.ca>2012-03-05 17:13:59 -0500
committerJean-Marc Valin <jmvalin@jmvalin.ca>2012-03-05 17:13:59 -0500
commitfdb039badc731ca88a03dfba8481ad6e4d3346aa (patch)
treedcb6cfa96edad3f5af1355647ff950c631558a1a
parent17c5966045b463fde45418000b03c95eb5cd7e09 (diff)
downloadopus-fdb039badc731ca88a03dfba8481ad6e4d3346aa.tar.gz
Eliminates an unused parameter warning in anti_collapse()
-rw-r--r--celt/bands.c2
-rw-r--r--celt/bands.h2
-rw-r--r--celt/celt.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/celt/bands.c b/celt/bands.c
index 68b36261..4b52eb5a 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -201,7 +201,7 @@ void denormalise_bands(const CELTMode *m, const celt_norm * restrict X, celt_sig
}
/* This prevents energy collapse for transients with multiple short MDCTs */
-void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_masks, int LM, int C, int CC, int size,
+void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_masks, int LM, int C, int size,
int start, int end, opus_val16 *logE, opus_val16 *prev1logE,
opus_val16 *prev2logE, int *pulses, opus_uint32 seed)
{
diff --git a/celt/bands.h b/celt/bands.h
index cb9572fb..75ff2ef4 100644
--- a/celt/bands.h
+++ b/celt/bands.h
@@ -86,7 +86,7 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
int time_domain, int fold, int dual_stereo, int intensity, int *tf_res,
opus_int32 total_bits, opus_int32 balance, ec_ctx *ec, int M, int codedBands, opus_uint32 *seed);
-void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_masks, int LM, int C, int CC, int size,
+void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_masks, int LM, int C, int size,
int start, int end, opus_val16 *logE, opus_val16 *prev1logE,
opus_val16 *prev2logE, int *pulses, opus_uint32 seed);
diff --git a/celt/celt.c b/celt/celt.c
index ddf65fad..1b6a2f70 100644
--- a/celt/celt.c
+++ b/celt/celt.c
@@ -1552,7 +1552,7 @@ int celt_encode_with_ec(CELTEncoder * restrict st, const opus_val16 * pcm, int f
#endif
if (anti_collapse_on)
{
- anti_collapse(st->mode, X, collapse_masks, LM, C, CC, N,
+ anti_collapse(st->mode, X, collapse_masks, LM, C, N,
st->start, st->end, oldBandE, oldLogE, oldLogE2, pulses, st->rng);
}
@@ -2525,7 +2525,7 @@ int celt_decode_with_ec(CELTDecoder * restrict st, const unsigned char *data, in
fine_quant, fine_priority, len*8-ec_tell(dec), dec, C);
if (anti_collapse_on)
- anti_collapse(st->mode, X, collapse_masks, LM, C, CC, N,
+ anti_collapse(st->mode, X, collapse_masks, LM, C, N,
st->start, st->end, oldBandE, oldLogE, oldLogE2, pulses, st->rng);
log2Amp(st->mode, st->start, st->end, bandE, oldBandE, C);