diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-01-09 20:13:00 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-01-09 20:13:00 +0400 |
| commit | ebdfbfb743a876056ced27e7bba84f46607c9bfb (patch) | |
| tree | 510a7c989b5bb2816c141a49d34bb36aa30e9cca | |
| parent | fa28dea7be48ed381668cf716a4fb6d2b366e3aa (diff) | |
Fixes stupid preprocessor-related bug introduced in e368e6209.
Would cause the preemphasis and deemphasis to fail, but only with
custom modes enabled.
| -rw-r--r-- | celt/celt_decoder.c | 3 | ||||
| -rw-r--r-- | celt/celt_encoder.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c index f2a2fd80..2ba98869 100644 --- a/celt/celt_decoder.c +++ b/celt/celt_decoder.c @@ -216,7 +216,7 @@ void deemphasis(celt_sig *in[], opus_val16 *pcm, int N, int C, int downsample, c scratch[j] = tmp; } } else -#else +#endif { /* Shortcut for the standard (non-custom modes) case */ for (j=0;j<N;j++) @@ -226,7 +226,6 @@ void deemphasis(celt_sig *in[], opus_val16 *pcm, int N, int C, int downsample, c scratch[j] = tmp; } } -#endif mem[c] = m; /* Perform down-sampling */ diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c index 391ef794..0d92c1ff 100644 --- a/celt/celt_encoder.c +++ b/celt/celt_encoder.c @@ -442,7 +442,7 @@ static void preemphasis(const opus_val16 * OPUS_RESTRICT pcmp, celt_sig * OPUS_R m = MULT16_32_Q15(coef1, inp[i]) - MULT16_32_Q15(coef0, tmp); } } else -#else +#endif { for (i=0;i<N;i++) { @@ -453,7 +453,6 @@ static void preemphasis(const opus_val16 * OPUS_RESTRICT pcmp, celt_sig * OPUS_R m = - MULT16_32_Q15(coef0, x); } } -#endif *mem = m; } |