Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6963)

Unified Diff: Source/platform/audio/FFTFrame.h

Issue 110013008: OS(MACOSX) and USE(WEBAUDIO_FFMPEG) are mutually exclusive (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/platform/audio/ffmpeg/FFTFrameFFMPEG.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/audio/FFTFrame.h
diff --git a/Source/platform/audio/FFTFrame.h b/Source/platform/audio/FFTFrame.h
index 45ac610ed0149829556e04f11ac64e2eaefb9cfc..abc4e5c4f4d9fe9b51d8e82ac4dbc1f90b7c709d 100644
--- a/Source/platform/audio/FFTFrame.h
+++ b/Source/platform/audio/FFTFrame.h
@@ -32,26 +32,14 @@
#include "platform/PlatformExport.h"
#include "platform/audio/AudioArray.h"
-#if OS(MACOSX) && !USE(WEBAUDIO_FFMPEG)
-#define USE_ACCELERATE_FFT 1
-#else
-#define USE_ACCELERATE_FFT 0
-#endif
-
-#if USE_ACCELERATE_FFT
+#if OS(MACOSX)
#include <Accelerate/Accelerate.h>
-#endif
-
-#if !USE_ACCELERATE_FFT
-
-#if USE(WEBAUDIO_OPENMAX_DL_FFT)
+#elif USE(WEBAUDIO_OPENMAX_DL_FFT)
#include <dl/sp/api/omxSP.h>
#elif USE(WEBAUDIO_FFMPEG)
struct RDFTContext;
#endif
-#endif // !USE_ACCELERATE_FFT
-
#if USE(WEBAUDIO_IPP)
#include <ipps.h>
#endif // USE(WEBAUDIO_IPP)
@@ -104,7 +92,7 @@ private:
void interpolateFrequencyComponents(const FFTFrame& frame1, const FFTFrame& frame2, double x);
-#if USE_ACCELERATE_FFT
+#if OS(MACOSX)
DSPSplitComplex& dspSplitComplex() { return m_frame; }
DSPSplitComplex dspSplitComplex() const { return m_frame; }
@@ -117,7 +105,7 @@ private:
DSPSplitComplex m_frame;
AudioFloatArray m_realData;
AudioFloatArray m_imagData;
-#else // !USE_ACCELERATE_FFT
+#else // !OS(MACOSX)
#if USE(WEBAUDIO_FFMPEG)
static RDFTContext* contextForSize(unsigned fftSize, int trans);
@@ -152,7 +140,7 @@ private:
AudioFloatArray m_imagData;
#endif
-#endif // !USE_ACCELERATE_FFT
+#endif // !OS(MACOSX)
};
} // namespace WebCore
« no previous file with comments | « no previous file | Source/platform/audio/ffmpeg/FFTFrameFFMPEG.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698