diff options
| author | Dave Burke <daveburke@google.com> | 2012-05-12 13:17:25 -0700 |
|---|---|---|
| committer | Dave Burke <daveburke@google.com> | 2012-05-12 13:47:46 -0700 |
| commit | 698b536f3b34a7cfc41a80e1034cc359456bdd66 (patch) | |
| tree | fa3dfa75d535b188725f1b84316cb4b06db79771 /libFDK/src/fft.cpp | |
| parent | 9bf37cc9712506b2483650c82d3c41152337ef7e (diff) | |
| download | fdk-aac-698b536f3b34a7cfc41a80e1034cc359456bdd66.tar.gz fdk-aac-698b536f3b34a7cfc41a80e1034cc359456bdd66.tar.bz2 fdk-aac-698b536f3b34a7cfc41a80e1034cc359456bdd66.zip | |
Update to 2012_05_11 version.
Fixes:
- Don't throw error for invalid bitrate but limit to functional value
- More robust ASC parsing
- More robust handling of corrupt bitstreams
- Handle multiple raw access units
Change-Id: Ib49fe2545ff4185fe924126da702fe84ac5c2d87
Diffstat (limited to 'libFDK/src/fft.cpp')
| -rw-r--r-- | libFDK/src/fft.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libFDK/src/fft.cpp b/libFDK/src/fft.cpp index 9f47807..cd04b98 100644 --- a/libFDK/src/fft.cpp +++ b/libFDK/src/fft.cpp @@ -344,7 +344,7 @@ static inline void fft15(FIXP_DBL *pInput) y[ 3 + iy] = ur - vi; /* Im B'= -Re C + Re D + Im A - Im B */ \ y[ 7 + iy] = vi + ur; /* Im D'= Re C - Re D + Im A - Im B */ -static const FIXP_SPK fft16_w16[2] = { {{STC(0x7641af3d), STC(0x30fbc54d)}}, {{ STC(0x30fbc54d), STC(0x7641af3d)}} }; +static const FIXP_STP fft16_w16[2] = { STCP(0x7641af3d, 0x30fbc54d), STCP(0x30fbc54d, 0x7641af3d) }; LNK_SECTION_CODE_L1 inline void fft_16(FIXP_DBL *RESTRICT x) @@ -527,10 +527,10 @@ inline void fft_16(FIXP_DBL *RESTRICT x) } #ifndef FUNCTION_fft_32 -static const FIXP_SPK fft32_w32[6] = +static const FIXP_STP fft32_w32[6] = { - {{ STC(0x7641af3d), STC(0x30fbc54d)}}, {{ STC(0x30fbc54d), STC(0x7641af3d)}}, {{ STC(0x7d8a5f40), STC(0x18f8b83c)}}, - {{ STC(0x6a6d98a4), STC(0x471cece7)}}, {{ STC(0x471cece7), STC(0x6a6d98a4)}}, {{ STC(0x18f8b83c), STC(0x7d8a5f40)}} + STCP (0x7641af3d, 0x30fbc54d), STCP(0x30fbc54d, 0x7641af3d), STCP(0x7d8a5f40, 0x18f8b83c), + STCP (0x6a6d98a4, 0x471cece7), STCP(0x471cece7, 0x6a6d98a4), STCP(0x18f8b83c, 0x7d8a5f40) }; LNK_SECTION_CODE_L1 |