Changeset 107025 in webkit

Timestamp:

Feb 7, 2012 6:51:57 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Enable IPP for FFTFrame
​https://bugs.webkit.org/show_bug.cgi?id=75522

Patch by Xingnan Wang <​xingnan.wang@intel.com> on 2012-02-07
Reviewed by Tony Chang.

Add the FFTFrame implementation using Intel IPP's DFT algorithm.

• WebCore.gyp/WebCore.gyp:
• WebCore.gypi:
• platform/audio/FFTFrame.h:

(FFTFrame):

• platform/audio/FFTFrameStub.cpp:
• platform/audio/ipp/FFTFrameIPP.cpp: Added.

(WebCore):
(WebCore::FFTFrame::FFTFrame):
(WebCore::FFTFrame::initialize):
(WebCore::FFTFrame::cleanup):
(WebCore::FFTFrame::~FFTFrame):
(WebCore::FFTFrame::multiply):
(WebCore::FFTFrame::doFFT):
(WebCore::FFTFrame::doInverseFFT):
(WebCore::FFTFrame::realData):
(WebCore::FFTFrame::imagData):
(WebCore::FFTFrame::getUpToDateComplexData):

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/ipp (added)
• platform/audio/ipp/FFTFrameIPP.cpp (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-07  Xingnan Wang  <xingnan.wang@intel.com>
+
+        Enable IPP for FFTFrame
+        https://bugs.webkit.org/show_bug.cgi?id=75522
+
+        Reviewed by Tony Chang.
+
+        Add the FFTFrame implementation using Intel IPP's DFT algorithm.
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * platform/audio/FFTFrame.h:
+        (FFTFrame):
+        * platform/audio/FFTFrameStub.cpp:
+        * platform/audio/ipp/FFTFrameIPP.cpp: Added.
+        (WebCore):
+        (WebCore::FFTFrame::FFTFrame):
+        (WebCore::FFTFrame::initialize):
+        (WebCore::FFTFrame::cleanup):
+        (WebCore::FFTFrame::~FFTFrame):
+        (WebCore::FFTFrame::multiply):
+        (WebCore::FFTFrame::doFFT):
+        (WebCore::FFTFrame::doInverseFFT):
+        (WebCore::FFTFrame::realData):
+        (WebCore::FFTFrame::imagData):
+        (WebCore::FFTFrame::getUpToDateComplexData):
+
 2012-02-07  Adrienne Walker  <enne@google.com>
 

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

@@ -1146 +1146 @@
           },
         }],
+        ['OS=="linux" and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
+          'cflags': [
+            '<!@(pkg-config --cflags-only-I ipp)',
+          ],
+        }],
       ],
     },
@@ -1348 +1353 @@
           },
         }],
+        ['OS=="linux" and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(pkg-config --cflags-only-I ipp)',
+            ],
+          },
+        }],
         ['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.
@@ -1986 +1998 @@
           },
         }],
+        ['OS=="linux" and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
+          'link_settings': {
+            'ldflags': [
+              '<!@(pkg-config --libs-only-L ipp)',
+            ],
+            'libraries': [
+              '-lipps -lippcore',
+            ],
+          },
+        }],
         ['enable_svg!=0', {
           'dependencies': [

trunk/Source/WebCore/WebCore.gypi

@@ -2873 +2873 @@
             'platform/audio/mac/FFTFrameMac.cpp',
             'platform/audio/mkl/FFTFrameMKL.cpp',
+            'platform/audio/ipp/FFTFrameIPP.cpp',
             'platform/cf/BinaryPropertyList.cpp',
             'platform/cf/FileSystemCF.cpp',

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

@@ -60 +60 @@
 
 #endif // !USE_ACCELERATE_FFT
+
+#if USE(WEBAUDIO_IPP)
+#include <ipps.h>
+#endif // USE(WEBAUDIO_IPP)
 
 #include <wtf/PassOwnPtr.h>
@@ -162 +166 @@
 #endif // USE(WEBAUDIO_GSTREAMER)
 
+#if USE(WEBAUDIO_IPP)
+    Ipp8u* m_buffer;
+    IppsDFTSpec_R_32f* m_DFTSpec;
+
+    float* getUpToDateComplexData();
+    AudioFloatArray m_complexData;
+    AudioFloatArray m_realData;
+    AudioFloatArray m_imagData;
+#endif // USE(WEBAUDIO_IPP)
+
 #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_FFMPEG) && !USE(WEBAUDIO_GSTREAMER)
+#if !OS(DARWIN) && !USE(WEBAUDIO_MKL) && !USE(WEBAUDIO_FFMPEG) && !USE(WEBAUDIO_GSTREAMER) && !USE(WEBAUDIO_IPP)
 
 #include "FFTFrame.h"
@@ -103 +103 @@
 } // namespace WebCore
 
-#endif // !OS(DARWIN) && !USE(WEBAUDIO_MKL) && !USE(WEBAUDIO_GSTREAMER)
+#endif // !OS(DARWIN) && !USE(WEBAUDIO_MKL) && !USE(WEBAUDIO_FFMPEG) && !USE(WEBAUDIO_GSTREAMER) && !USE(WEBAUDIO_IPP)
 
 #endif // ENABLE(WEB_AUDIO)