From 54bddf0f1a83f37cfeb8519627beaa2422a86418 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Wed, 11 Sep 2013 23:34:51 -0400
Subject: [PATCH] Surround analysis should now work for non-20ms frame sizes.
Not well tested.
---
src/opus_multistream_encoder.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c
index 985a84130..3065b6f77 100644
--- a/src/opus_multistream_encoder.c
+++ b/src/opus_multistream_encoder.c
@@ -222,8 +222,7 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, opus_val16 *b
{
int c;
int i;
- /* FIXME: pass LM properly */
- int LM=3;
+ int LM;
int pos[8] = {0};
int upsample;
int frame_size;
@@ -237,6 +236,10 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, opus_val16 *b
upsample = resampling_factor(rate);
frame_size = len*upsample;
+ for (LM=0;LM<=celt_mode->maxLM;LM++)
+ if (celt_mode->shortMdctSize<<LM==frame_size)
+ break;
+
ALLOC(in, frame_size+overlap, opus_val32);
ALLOC(x, len, opus_val16);
ALLOC(freq, frame_size, opus_val32);
--
GitLab