eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-03 00:57:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes stupid preprocessor-related bug introduced in e368e6209.

Browse source 
Would cause the preemphasis and deemphasis to fail, but only with
custom modes enabled.
This commit is contained in:
Jean-Marc Valin 2013-01-09 11:13:00 -05:00
parent fa28dea7be
commit ebdfbfb743
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
celt/celt_decoder.c
View file

@ -216,7 +216,7 @@ void deemphasis(celt_sig *in[], opus_val16 *pcm, int N, int C, int downsample, c
scratch[j] = tmp; scratch[j] = tmp;
} }
} else } else
#else #endif
{ {
/* Shortcut for the standard (non-custom modes) case */ /* Shortcut for the standard (non-custom modes) case */
for (j=0;j<N;j++) 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; scratch[j] = tmp;
} }
} }
#endif
mem[c] = m; mem[c] = m;
/* Perform down-sampling */ /* Perform down-sampling */

3
celt/celt_encoder.c
View file

@ -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); m = MULT16_32_Q15(coef1, inp[i]) - MULT16_32_Q15(coef0, tmp);
} }
} else } else
#else #endif
{ {
for (i=0;i<N;i++) 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); m = - MULT16_32_Q15(coef0, x);
} }
} }
#endif
*mem = m; *mem = m;
} }