Renamed celt_word* to opus_val*
This commit is contained in:
parent
f9d14f8d77
commit
ff5f7228fd
31 changed files with 401 additions and 401 deletions
|
@ -103,7 +103,7 @@ void clt_mdct_clear(mdct_lookup *l)
|
|||
|
||||
#endif /* CUSTOM_MODES */
|
||||
|
||||
void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * restrict out, const celt_word16 *window, int overlap, int shift)
|
||||
void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * restrict out, const opus_val16 *window, int overlap, int shift)
|
||||
{
|
||||
int i;
|
||||
int N, N2, N4;
|
||||
|
@ -129,8 +129,8 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar
|
|||
const kiss_fft_scalar * restrict xp1 = in+(overlap>>1);
|
||||
const kiss_fft_scalar * restrict xp2 = in+N2-1+(overlap>>1);
|
||||
kiss_fft_scalar * restrict yp = out;
|
||||
const celt_word16 * restrict wp1 = window+(overlap>>1);
|
||||
const celt_word16 * restrict wp2 = window+(overlap>>1)-1;
|
||||
const opus_val16 * restrict wp1 = window+(overlap>>1);
|
||||
const opus_val16 * restrict wp2 = window+(overlap>>1)-1;
|
||||
for(i=0;i<(overlap>>2);i++)
|
||||
{
|
||||
/* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
|
||||
|
@ -207,7 +207,7 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar
|
|||
}
|
||||
|
||||
|
||||
void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * restrict out, const celt_word16 * restrict window, int overlap, int shift)
|
||||
void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * restrict out, const opus_val16 * restrict window, int overlap, int shift)
|
||||
{
|
||||
int i;
|
||||
int N, N2, N4;
|
||||
|
@ -288,8 +288,8 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
|
|||
kiss_fft_scalar * restrict fp1 = f2+N4-1;
|
||||
kiss_fft_scalar * restrict xp1 = out+N2-1;
|
||||
kiss_fft_scalar * restrict yp1 = out+N4-overlap/2;
|
||||
const celt_word16 * restrict wp1 = window;
|
||||
const celt_word16 * restrict wp2 = window+overlap-1;
|
||||
const opus_val16 * restrict wp1 = window;
|
||||
const opus_val16 * restrict wp2 = window+overlap-1;
|
||||
for(i = 0; i< N4-overlap/2; i++)
|
||||
{
|
||||
*xp1 = *fp1;
|
||||
|
@ -310,8 +310,8 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
|
|||
kiss_fft_scalar * restrict fp2 = f2+N4;
|
||||
kiss_fft_scalar * restrict xp2 = out+N2;
|
||||
kiss_fft_scalar * restrict yp2 = out+N-1-(N4-overlap/2);
|
||||
const celt_word16 * restrict wp1 = window;
|
||||
const celt_word16 * restrict wp2 = window+overlap-1;
|
||||
const opus_val16 * restrict wp1 = window;
|
||||
const opus_val16 * restrict wp2 = window+overlap-1;
|
||||
for(i = 0; i< N4-overlap/2; i++)
|
||||
{
|
||||
*xp2 = *fp2;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue