eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed celt_word* to opus_val*

Browse source
This commit is contained in:
Jean-Marc Valin 2011-07-29 18:59:12 -04:00
parent f9d14f8d77
commit ff5f7228fd
31 changed files with 401 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/opus_decoder.c
View file

@ -112,7 +112,7 @@ OpusDecoder *opus_decoder_create(int Fs, int channels)
}
static void smooth_fade(const short *in1, const short *in2, short *out,
int overlap, int channels, const celt_word16 *window, int Fs)
int overlap, int channels, const opus_val16 *window, int Fs)
{
int i, c;
int inc = 48000/Fs;
@ -120,7 +120,7 @@ static void smooth_fade(const short *in1, const short *in2, short *out,
{
for (i=0;i<overlap;i++)
{
celt_word16 w = MULT16_16_Q15(window[i*inc], window[i*inc]);
opus_val16 w = MULT16_16_Q15(window[i*inc], window[i*inc]);
out[i*channels+c] = SHR32(MAC16_16(MULT16_16(w,in2[i*channels+c]),
Q15ONE-w, in1[i*channels+c]), 15);
}
@ -165,7 +165,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
short redundant_audio[240*2];
int c;
int F2_5, F5, F10, F20;
const celt_word16 *window;
const opus_val16 *window;
silk_dec = (char*)st+st->silk_dec_offset;
celt_dec = (CELTDecoder*)((char*)st+st->celt_dec_offset);