summaryrefslogtreecommitdiffstats
path: root/libFDK/src
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2013-12-14 17:32:17 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2013-12-14 17:32:17 +0100
commitee7be955947a0a591f42641419bf4a88953a77fb (patch)
treeef422756ae45ec9db4280bb0585f66a7beca72ef /libFDK/src
parent2f29dd48d02d402169246e3c7f9256869817392a (diff)
downloadODR-AudioEnc-ee7be955947a0a591f42641419bf4a88953a77fb.tar.gz
ODR-AudioEnc-ee7be955947a0a591f42641419bf4a88953a77fb.tar.bz2
ODR-AudioEnc-ee7be955947a0a591f42641419bf4a88953a77fb.zip
Apply piratfm's first commit
It's the patch from commit e969ea8 AAC960 works now. All modes: LC/SBR/PS. Only for DAB+, not DRM. without the copyright headers that create a ton of merge conficts
Diffstat (limited to 'libFDK/src')
-rw-r--r--libFDK/src/fft.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/libFDK/src/fft.cpp b/libFDK/src/fft.cpp
index 653a71a..ae3c98d 100644
--- a/libFDK/src/fft.cpp
+++ b/libFDK/src/fft.cpp
@@ -1078,7 +1078,8 @@ static inline void fft_apply_rot_vector(FIXP_DBL *RESTRICT pData, const int cl,
}
}
-#define FFT_TWO_STAGE_MACRO_ENABLE
+//FIXME:buggy for fft480
+//#define FFT_TWO_STAGE_MACRO_ENABLE
#ifdef FFT_TWO_STAGE_MACRO_ENABLE
@@ -1154,7 +1155,7 @@ static inline void fft_apply_rot_vector(FIXP_DBL *RESTRICT pData, const int cl,
#else /* FFT_TWO_STAGE_MACRO_ENABLE */
/* select either switch case of function pointer. */
-//#define FFT_TWO_STAGE_SWITCH_CASE
+#define FFT_TWO_STAGE_SWITCH_CASE
static inline void fftN2(
FIXP_DBL *pInput,
@@ -1206,7 +1207,7 @@ static inline void fftN2(
case 16: fft_16(pDst); break;
case 32: fft_32(pDst); break;
/*case 64: fft_64(pDst); break;*/
- case 128: fft_128(pDst); break;
+ /*case 128: fft_128(pDst); break;*/
}
#endif
pSrc += 2;
@@ -1245,7 +1246,7 @@ static inline void fftN2(
case 16: fft_16(pDst); break;
case 32: fft_32(pDst); break;
/*case 64: fft_64(pDst); break;*/
- case 128: fft_128(pDst); break;
+ /*case 128: fft_128(pDst); break;*/
}
#endif