From ab86a9cca7f891044d64e4ca6c055bc95224d773 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Wed, 13 Nov 2013 23:06:25 -0500
Subject: [PATCH] Fixes more warnings
---
celt/celt_encoder.c | 7 +++++--
src/opus_multistream_encoder.c | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 5bb86c52c..784d43297 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1714,7 +1714,8 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
/* Disable new spreading+tapset estimator until we can show it works
better than the old one. So far it seems like spreading_decision()
works best. */
- if (0&&st->analysis.valid)
+#if 0
+ if (st->analysis.valid)
{
static const opus_val16 spread_thresholds[3] = {-QCONST16(.6f, 15), -QCONST16(.2f, 15), -QCONST16(.07f, 15)};
static const opus_val16 spread_histeresis[3] = {QCONST16(.15f, 15), QCONST16(.07f, 15), QCONST16(.02f, 15)};
@@ -1722,7 +1723,9 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
static const opus_val16 tapset_histeresis[2] = {QCONST16(.1f, 15), QCONST16(.05f, 15)};
st->spread_decision = hysteresis_decision(-st->analysis.tonality, spread_thresholds, spread_histeresis, 3, st->spread_decision);
st->tapset_decision = hysteresis_decision(st->analysis.tonality_slope, tapset_thresholds, tapset_histeresis, 2, st->tapset_decision);
- } else {
+ } else
+#endif
+ {
st->spread_decision = spreading_decision(mode, X,
&st->tonal_average, st->spread_decision, &st->hf_average,
&st->tapset_decision, pf_on&&!shortBlocks, effEnd, C, M);
diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c
index 25ba0edd9..54a0d10ec 100644
--- a/src/opus_multistream_encoder.c
+++ b/src/opus_multistream_encoder.c
@@ -76,7 +76,7 @@ struct OpusMSEncoder {
int variable_duration;
int surround;
opus_int32 bitrate_bps;
- opus_val32 subframe_mem[3];
+ float subframe_mem[3];
/* Encoder states go here */
/* then opus_val32 window_mem[channels*120]; */
/* then opus_val32 preemph_mem[channels]; */
--
GitLab