Optimize for IPP in DirectConvolver::process()

https://bugs.webkit.org/show_bug.cgi?id=80255

Patch by Xingnan Wang <xingnan.wang@intel.com> on 2012-03-23
Reviewed by Chris Rogers.

Increase ~2X performance by conv() in IPP.

* platform/audio/DirectConvolver.cpp:
(WebCore::DirectConvolver::DirectConvolver):
(WebCore::DirectConvolver::process):
* platform/audio/DirectConvolver.h:
(DirectConvolver):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111880 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 556bf4a..bc27e41 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-03-23  Xingnan Wang  <xingnan.wang@intel.com>
+
+        Optimize for IPP in DirectConvolver::process()
+        https://bugs.webkit.org/show_bug.cgi?id=80255
+
+        Reviewed by Chris Rogers.
+
+        Increase ~2X performance by conv() in IPP.
+
+        * platform/audio/DirectConvolver.cpp:
+        (WebCore::DirectConvolver::DirectConvolver):
+        (WebCore::DirectConvolver::process):
+        * platform/audio/DirectConvolver.h:
+        (DirectConvolver):
+
 2012-03-23  Tommy Widenflycht  <tommyw@google.com>
 
         MediaStream API (JSEP): Introducing PeerConnection00 and IceCallback

diff --git a/Source/WebCore/platform/audio/DirectConvolver.cpp b/Source/WebCore/platform/audio/DirectConvolver.cpp
index 39f3e5c..f2906eb 100644 (file)
--- a/Source/WebCore/platform/audio/DirectConvolver.cpp
+++ b/Source/WebCore/platform/audio/DirectConvolver.cpp
@@ -40,14 +40,15 @@ using namespace VectorMath;
     
 DirectConvolver::DirectConvolver(size_t inputBlockSize)
     : m_inputBlockSize(inputBlockSize)
-    , m_inputBuffer(inputBlockSize * 2)
+#if USE(WEBAUDIO_IPP)
+    , m_overlayBuffer(inputBlockSize)
+#endif // USE(WEBAUDIO_IPP)
+    , m_buffer(inputBlockSize * 2)
 {
 }
 
 void DirectConvolver::process(AudioFloatArray* convolutionKernel, const float* sourceP, float* destP, size_t framesToProcess)
 {
-    // FIXME: Optimize for IPP, reverb function in IPP library can be used here.
-    // https://bugs.webkit.org/show_bug.cgi?id=80255
     // FIXME: Optimize for DARWIN, conv() function in Accelerate.framework can be used here.
     // https://bugs.webkit.org/show_bug.cgi?id=80256
 
@@ -63,14 +64,27 @@ void DirectConvolver::process(AudioFloatArray* convolutionKernel, const float* s
 
     float* kernelP = convolutionKernel->data();
 
-    float* inputP = m_inputBuffer.data() + m_inputBlockSize;
-
     // Sanity check
-    bool isCopyGood = kernelP && sourceP && destP && m_inputBuffer.data();
+    bool isCopyGood = kernelP && sourceP && destP && m_buffer.data();
     ASSERT(isCopyGood);
     if (!isCopyGood)
         return;
 
+#if USE(WEBAUDIO_IPP)
+    float* outputBuffer = m_buffer.data();
+    float* overlayBuffer = m_overlayBuffer.data();
+    bool isCopyGood2 = overlayBuffer && m_overlayBuffer.size() >= kernelSize && m_buffer.size() == m_inputBlockSize * 2;
+    ASSERT(isCopyGood2);
+    if (!isCopyGood2)
+        return;
+
+    ippsConv_32f(static_cast<const Ipp32f*>(sourceP), framesToProcess, static_cast<Ipp32f*>(kernelP), kernelSize, static_cast<Ipp32f*>(outputBuffer));
+
+    vadd(outputBuffer, 1, overlayBuffer, 1, destP, 1, framesToProcess);
+    memcpy(overlayBuffer, outputBuffer + m_inputBlockSize, sizeof(float) * kernelSize);
+#else
+    float* inputP = m_buffer.data() + m_inputBlockSize;
+
     // Copy samples to 2nd half of input buffer.
     memcpy(inputP, sourceP, sizeof(float) * framesToProcess);
 
@@ -345,12 +359,16 @@ void DirectConvolver::process(AudioFloatArray* convolutionKernel, const float* s
     }
 
     // Copy 2nd half of input buffer to 1st half.
-    memcpy(m_inputBuffer.data(), inputP, sizeof(float) * framesToProcess);
+    memcpy(m_buffer.data(), inputP, sizeof(float) * framesToProcess);
+#endif
 }
 
 void DirectConvolver::reset()
 {
-    m_inputBuffer.zero();
+    m_buffer.zero();
+#if USE(WEBAUDIO_IPP)
+    m_overlayBuffer.zero();
+#endif // USE(WEBAUDIO_IPP)
 }
 
 } // namespace WebCore

diff --git a/Source/WebCore/platform/audio/DirectConvolver.h b/Source/WebCore/platform/audio/DirectConvolver.h
index 3309c75..1cb8c67 100644 (file)
--- a/Source/WebCore/platform/audio/DirectConvolver.h
+++ b/Source/WebCore/platform/audio/DirectConvolver.h
@@ -31,6 +31,10 @@
 
 #include "AudioArray.h"
 
+#if USE(WEBAUDIO_IPP)
+#include <ipps.h>
+#endif // USE(WEBAUDIO_IPP)
+
 namespace WebCore {
 
 class DirectConvolver {
@@ -44,7 +48,10 @@ public:
 private:
     size_t m_inputBlockSize;
 
-    AudioFloatArray m_inputBuffer;
+#if USE(WEBAUDIO_IPP)
+    AudioFloatArray m_overlayBuffer;
+#endif // USE(WEBAUDIO_IPP)
+    AudioFloatArray m_buffer;
 };
 
 } // namespace WebCore