Changeset 102622 in webkit

Timestamp:

Dec 12, 2011 2:13:32 PM (12 years ago)

Author:

abarth@webkit.org

Message:

Remove platform/audio/fftw
​https://bugs.webkit.org/show_bug.cgi?id=73163

Reviewed by Eric Seidel.

The FFTW library is GPL, not LGPL, like WebKit. This patch removes the
integration with the library so folks who use WebAudio don't
accidentially violate the GPL by linking in FFTW.

• GNUmakefile.am:
• WebCore.gyp/WebCore.gyp:
• WebCore.gypi:
• platform/audio/FFTFrame.h:
• platform/audio/FFTFrameStub.cpp:
• platform/audio/fftw: Removed.
• platform/audio/fftw/FFTFrameFFTW.cpp: Removed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gyp/WebCore.gyp (modified) (3 diffs)
• WebCore.gypi (modified) (1 diff)
• platform/audio/FFTFrame.h (modified) (2 diffs)
• platform/audio/FFTFrameStub.cpp (modified) (2 diffs)
• platform/audio/fftw (deleted)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-26  Adam Barth  <abarth@webkit.org>
+
+        Remove platform/audio/fftw
+        https://bugs.webkit.org/show_bug.cgi?id=73163
+
+        Reviewed by Eric Seidel.
+
+        The FFTW library is GPL, not LGPL, like WebKit.  This patch removes the
+        integration with the library so folks who use WebAudio don't
+        accidentially violate the GPL by linking in FFTW.
+
+        * GNUmakefile.am:
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * platform/audio/FFTFrame.h:
+        * platform/audio/FFTFrameStub.cpp:
+        * platform/audio/fftw: Removed.
+        * platform/audio/fftw/FFTFrameFFTW.cpp: Removed.
+
 2011-12-12  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

@@ -1096 +1096 @@
           },
         }],
-        ['OS != "mac" and OS != "android" and "WTF_USE_WEBAUDIO_FFTW=1" in feature_defines', {
-          'include_dirs': [
-            '<(chromium_src_dir)/third_party/fftw/api',
-          ],
-        }],
       ],
     },
@@ -1309 +1304 @@
           },
         }],
-        ['OS != "mac" and OS != "android" and "WTF_USE_WEBAUDIO_FFTW=1" in feature_defines', {
-          # This directory needs to be on the include path for multiple sub-targets of webcore.
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(chromium_src_dir)/third_party/fftw/api',
-            ],
-          },
-        }],
         ['OS != "android" and "WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
           # This directory needs to be on the include path for multiple sub-targets of webcore.
@@ -1944 +1931 @@
           },
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "android" and "WTF_USE_WEBAUDIO_FFTW=1" in feature_defines', {
-          # FIXME: (kbr) figure out how to make these dependencies
-          # work in a cross-platform way. Attempts to use
-          # "link_settings" and "libraries" in conjunction with the
-          # msvs-specific settings didn't work so far.
-          'all_dependent_settings': {
-            'ldflags': [
-              # FIXME: (kbr) build the FFTW into PRODUCT_DIR using GYP.
-              '-Lthird_party/fftw/.libs',
-            ],
-            'link_settings': {
-              'libraries': [
-                '-lfftw3f'
-              ],
-            },
-          },
-        }],
         ['enable_svg!=0', {
           'dependencies': [

trunk/Source/WebCore/WebCore.gypi

@@ -3227 +3227 @@
             'platform/audio/ZeroPole.h',
             'platform/audio/chromium/AudioBusChromium.cpp',
-            'platform/audio/fftw/FFTFrameFFTW.cpp',
             'platform/audio/mac/AudioBusMac.mm',
             'platform/audio/mac/AudioDestinationMac.cpp',

trunk/Source/WebCore/platform/audio/FFTFrame.h

@@ -47 +47 @@
 #include "mkl_dfti.h"
 #endif // USE(WEBAUDIO_MKL)
-
-#if USE(WEBAUDIO_FFTW)
-#include "fftw3.h"
-#endif // USE(WEBAUDIO_FFTW)
 
 #if USE(WEBAUDIO_FFMPEG)
@@ -151 +147 @@
 #endif // USE(WEBAUDIO_FFMPEG)
 
-#if USE(WEBAUDIO_FFTW)
-    fftwf_plan m_forwardPlan;
-    fftwf_plan m_backwardPlan;
-
-    enum Direction {
-        Forward,
-        Backward
-    };
-
-    // Both the real and imaginary data are stored here.
-    // The real data is stored first, followed by three float values of padding.
-    // The imaginary data is stored after the padding and is 16-byte aligned (if m_data itself is aligned).
-    // The reason we don't use separate arrays for real and imaginary is because the FFTW plans are shared
-    // between FFTFrame instances and require that the real and imaginary data pointers be the same distance apart.
-    AudioFloatArray m_data;
-
-    static Mutex *s_planLock;
-    static fftwf_plan* fftwForwardPlans;
-    static fftwf_plan* fftwBackwardPlans;
-
-    static fftwf_plan fftwPlanForSize(unsigned fftSize, Direction,
-                                      float*, float*, float*);
-#endif // USE(WEBAUDIO_FFTW)
-
 #endif // !USE_ACCELERATE_FFT
 };

trunk/Source/WebCore/platform/audio/FFTFrameStub.cpp

@@ -30 +30 @@
 #if ENABLE(WEB_AUDIO)
 
-#if !OS(DARWIN) && !USE(WEBAUDIO_MKL) && !USE(WEBAUDIO_FFTW) && !USE(WEBAUDIO_FFMPEG)
+#if !OS(DARWIN) && !USE(WEBAUDIO_MKL) && !USE(WEBAUDIO_FFMPEG)
 
 #include "FFTFrame.h"
@@ -103 +103 @@
 } // namespace WebCore
 
-#endif // !OS(DARWIN) && !USE(WEBAUDIO_MKL) && !USE(WEBAUDIO_FFTW)
+#endif // !OS(DARWIN) && !USE(WEBAUDIO_MKL)
 
 #endif // ENABLE(WEB_AUDIO)