mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-14 10:37:38 -04:00
Minor macro redefinition in libfaad to avoid FIXED_POINT ifdef'ing.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28085 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
9fb54ae32b
commit
24d8e8ef1a
1 changed files with 3 additions and 9 deletions
|
@ -44,10 +44,10 @@
|
||||||
#define FAAD_ANALYSIS_SCALE2(X) ((X))
|
#define FAAD_ANALYSIS_SCALE2(X) ((X))
|
||||||
#define FAAD_ANALYSIS_SCALE3(X) ((X))
|
#define FAAD_ANALYSIS_SCALE3(X) ((X))
|
||||||
#else
|
#else
|
||||||
#define FAAD_SYNTHESIS_SCALE(X) ((X)*scale)
|
#define FAAD_SYNTHESIS_SCALE(X) ((X)/64.0f)
|
||||||
#define FAAD_ANALYSIS_SCALE1(X) ((X))
|
#define FAAD_ANALYSIS_SCALE1(X) ((X))
|
||||||
#define FAAD_ANALYSIS_SCALE2(X) (2.*(X))
|
#define FAAD_ANALYSIS_SCALE2(X) (2.0f*(X))
|
||||||
#define FAAD_ANALYSIS_SCALE3(X) ((X)/32.0)
|
#define FAAD_ANALYSIS_SCALE3(X) ((X)/32.0f)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
qmfa_info *qmfa_init(uint8_t channels)
|
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
|
||||||
{
|
{
|
||||||
ALIGN real_t x1[32];
|
ALIGN real_t x1[32];
|
||||||
ALIGN real_t x2[32];
|
ALIGN real_t x2[32];
|
||||||
#ifndef FIXED_POINT
|
|
||||||
real_t scale = 1.f/64.f;
|
|
||||||
#endif
|
|
||||||
int32_t n, k, idx0, idx1, out = 0;
|
int32_t n, k, idx0, idx1, out = 0;
|
||||||
uint32_t l;
|
uint32_t l;
|
||||||
|
|
||||||
|
@ -473,9 +470,6 @@ void sbr_qmf_synthesis_64(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHFG][6
|
||||||
ALIGN real_t imag2[32];
|
ALIGN real_t imag2[32];
|
||||||
qmf_t *pX;
|
qmf_t *pX;
|
||||||
real_t *p_buf_1, *p_buf_3;
|
real_t *p_buf_1, *p_buf_3;
|
||||||
#ifndef FIXED_POINT
|
|
||||||
real_t scale = 1.f/64.f;
|
|
||||||
#endif
|
|
||||||
int32_t n, k, idx0, idx1, out = 0;
|
int32_t n, k, idx0, idx1, out = 0;
|
||||||
uint32_t l;
|
uint32_t l;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue