diff options
-rw-r--r-- | apps/codecs/libfaad/sbr_dct.c | 2 | ||||
-rw-r--r-- | apps/codecs/libfaad/sbr_qmf.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/codecs/libfaad/sbr_dct.c b/apps/codecs/libfaad/sbr_dct.c index f471745813..f22a24a18e 100644 --- a/apps/codecs/libfaad/sbr_dct.c +++ b/apps/codecs/libfaad/sbr_dct.c | |||
@@ -1535,7 +1535,7 @@ const uint32_t dct4_revtab[32] ICONST_ATTR = { | |||
1535 | x_im = imag_part; \ | 1535 | x_im = imag_part; \ |
1536 | tmp = MUL_C(x_re + x_im, tab[tabidx++]); \ | 1536 | tmp = MUL_C(x_re + x_im, tab[tabidx++]); \ |
1537 | out1 = MUL_C(x_re , tab[tabidx++]) + tmp; \ | 1537 | out1 = MUL_C(x_re , tab[tabidx++]) + tmp; \ |
1538 | out2 = MUL_C(x_im , tab[tabidx++]) + tmp; \ | 1538 | out2 = MUL_C(x_im , tab[tabidx++]) + tmp; |
1539 | 1539 | ||
1540 | /* size 64 only! */ | 1540 | /* size 64 only! */ |
1541 | void dct4_kernel(real_t *real, real_t *imag) | 1541 | void dct4_kernel(real_t *real, real_t *imag) |
diff --git a/apps/codecs/libfaad/sbr_qmf.c b/apps/codecs/libfaad/sbr_qmf.c index beb0c6496e..a0b01661f8 100644 --- a/apps/codecs/libfaad/sbr_qmf.c +++ b/apps/codecs/libfaad/sbr_qmf.c | |||
@@ -98,7 +98,7 @@ void sbr_qmf_analysis_32(sbr_info *sbr, qmfa_info *qmfa, const real_t *input, | |||
98 | 98 | ||
99 | /* add new samples to input buffer x */ | 99 | /* add new samples to input buffer x */ |
100 | idx0 = qmfa->x_index + 31; idx1 = idx0 + 320; | 100 | idx0 = qmfa->x_index + 31; idx1 = idx0 + 320; |
101 | for (n = 32 - 1; n >= 0; n-=4) | 101 | for (n = 0; n < 32; n+=4) |
102 | { | 102 | { |
103 | qmfa->x[idx0--] = qmfa->x[idx1--] = (input[in++]); | 103 | qmfa->x[idx0--] = qmfa->x[idx1--] = (input[in++]); |
104 | qmfa->x[idx0--] = qmfa->x[idx1--] = (input[in++]); | 104 | qmfa->x[idx0--] = qmfa->x[idx1--] = (input[in++]); |
@@ -390,11 +390,11 @@ void sbr_qmf_synthesis_64(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHFG][6 | |||
390 | 390 | ||
391 | #define FAAD_CMPLX_PRETWIDDLE_SUB(k) \ | 391 | #define FAAD_CMPLX_PRETWIDDLE_SUB(k) \ |
392 | (MUL_F(QMF_RE(X[l][k]), RE(qmf32_pre_twiddle[k])) - \ | 392 | (MUL_F(QMF_RE(X[l][k]), RE(qmf32_pre_twiddle[k])) - \ |
393 | MUL_F(QMF_IM(X[l][k]), IM(qmf32_pre_twiddle[k]))) \ | 393 | MUL_F(QMF_IM(X[l][k]), IM(qmf32_pre_twiddle[k]))) |
394 | 394 | ||
395 | #define FAAD_CMPLX_PRETWIDDLE_ADD(k) \ | 395 | #define FAAD_CMPLX_PRETWIDDLE_ADD(k) \ |
396 | (MUL_F(QMF_IM(X[l][k]), RE(qmf32_pre_twiddle[k])) + \ | 396 | (MUL_F(QMF_IM(X[l][k]), RE(qmf32_pre_twiddle[k])) + \ |
397 | MUL_F(QMF_RE(X[l][k]), IM(qmf32_pre_twiddle[k]))) \ | 397 | MUL_F(QMF_RE(X[l][k]), IM(qmf32_pre_twiddle[k]))) |
398 | 398 | ||
399 | void sbr_qmf_synthesis_32(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHFG][64], | 399 | void sbr_qmf_synthesis_32(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHFG][64], |
400 | real_t *output) | 400 | real_t *output) |