diff options
-rw-r--r-- | apps/codecs/libfaad/sbr_qmf.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/apps/codecs/libfaad/sbr_qmf.c b/apps/codecs/libfaad/sbr_qmf.c index 6008c72b11..f94c3072a4 100644 --- a/apps/codecs/libfaad/sbr_qmf.c +++ b/apps/codecs/libfaad/sbr_qmf.c | |||
@@ -44,10 +44,10 @@ | |||
44 | #define FAAD_ANALYSIS_SCALE2(X) ((X)) | 44 | #define FAAD_ANALYSIS_SCALE2(X) ((X)) |
45 | #define FAAD_ANALYSIS_SCALE3(X) ((X)) | 45 | #define FAAD_ANALYSIS_SCALE3(X) ((X)) |
46 | #else | 46 | #else |
47 | #define FAAD_SYNTHESIS_SCALE(X) ((X)*scale) | 47 | #define FAAD_SYNTHESIS_SCALE(X) ((X)/64.0f) |
48 | #define FAAD_ANALYSIS_SCALE1(X) ((X)) | 48 | #define FAAD_ANALYSIS_SCALE1(X) ((X)) |
49 | #define FAAD_ANALYSIS_SCALE2(X) (2.*(X)) | 49 | #define FAAD_ANALYSIS_SCALE2(X) (2.0f*(X)) |
50 | #define FAAD_ANALYSIS_SCALE3(X) ((X)/32.0) | 50 | #define FAAD_ANALYSIS_SCALE3(X) ((X)/32.0f) |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | qmfa_info *qmfa_init(uint8_t channels) | 53 | qmfa_info *qmfa_init(uint8_t channels) |
@@ -403,9 +403,6 @@ void sbr_qmf_synthesis_32(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHFG][6 | |||
403 | { | 403 | { |
404 | ALIGN real_t x1[32]; | 404 | ALIGN real_t x1[32]; |
405 | ALIGN real_t x2[32]; | 405 | ALIGN real_t x2[32]; |
406 | #ifndef FIXED_POINT | ||
407 | real_t scale = 1.f/64.f; | ||
408 | #endif | ||
409 | int32_t n, k, idx0, idx1, out = 0; | 406 | int32_t n, k, idx0, idx1, out = 0; |
410 | uint32_t l; | 407 | uint32_t l; |
411 | 408 | ||
@@ -473,9 +470,6 @@ void sbr_qmf_synthesis_64(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHFG][6 | |||
473 | ALIGN real_t imag2[32]; | 470 | ALIGN real_t imag2[32]; |
474 | qmf_t *pX; | 471 | qmf_t *pX; |
475 | real_t *p_buf_1, *p_buf_3; | 472 | real_t *p_buf_1, *p_buf_3; |
476 | #ifndef FIXED_POINT | ||
477 | real_t scale = 1.f/64.f; | ||
478 | #endif | ||
479 | int32_t n, k, idx0, idx1, out = 0; | 473 | int32_t n, k, idx0, idx1, out = 0; |
480 | uint32_t l; | 474 | uint32_t l; |
481 | 475 | ||