Changeset 109458 in webkit

Timestamp:

Mar 1, 2012 3:59:02 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Enable IPP for Biquad filter
​https://bugs.webkit.org/show_bug.cgi?id=77509

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

Source/WebCore:

Use IIR filter in IPP and improve ~27% performance in linux.
Changes are covered by current tests.

• platform/audio/Biquad.cpp:

(WebCore::Biquad::Biquad):
(WebCore::Biquad::~Biquad):
(WebCore):
(WebCore::Biquad::process):
(WebCore::Biquad::reset):
(WebCore::Biquad::setLowpassParams):
(WebCore::Biquad::setHighpassParams):
(WebCore::Biquad::setNormalizedCoefficients):
(WebCore::Biquad::setZeroPolePairs):

• platform/audio/Biquad.h:

(Biquad):

LayoutTests:

Adjust a code format issue.

• webaudio/resources/biquad-testing.js:

(filterData):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/resources/biquad-testing.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/audio/Biquad.cpp (modified) (11 diffs)
• Source/WebCore/platform/audio/Biquad.h (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-01  Xingnan Wang  <xingnan.wang@intel.com>
+
+        Enable IPP for Biquad filter
+        https://bugs.webkit.org/show_bug.cgi?id=77509
+
+        Reviewed by Chris Rogers.
+
+        Adjust a code format issue.
+
+        * webaudio/resources/biquad-testing.js:
+        (filterData):
+
 2012-03-01  Adam Klein  <adamk@chromium.org>
 

trunk/LayoutTests/webaudio/resources/biquad-testing.js

@@ -378 +378 @@
     var b2 = filterCoef.b2;
     var a1 = filterCoef.a1;
-    var a2 = filterCoef. a2;
+    var a2 = filterCoef.a2;
 
     // Prime the pump. (Assumes the signal has length >= 2!)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Xingnan Wang  <xingnan.wang@intel.com>
+
+        Enable IPP for Biquad filter
+        https://bugs.webkit.org/show_bug.cgi?id=77509
+
+        Reviewed by Chris Rogers.
+
+        Use IIR filter in IPP and improve ~27% performance in linux.
+        Changes are covered by current tests.
+
+        * platform/audio/Biquad.cpp:
+        (WebCore::Biquad::Biquad):
+        (WebCore::Biquad::~Biquad):
+        (WebCore):
+        (WebCore::Biquad::process):
+        (WebCore::Biquad::reset):
+        (WebCore::Biquad::setLowpassParams):
+        (WebCore::Biquad::setHighpassParams):
+        (WebCore::Biquad::setNormalizedCoefficients):
+        (WebCore::Biquad::setZeroPolePairs):
+        * platform/audio/Biquad.h:
+        (Biquad):
+
 2012-03-01  Peter Kotwicz  <pkotwicz@google.com>
 

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

@@ -54 +54 @@
 #endif
 
+#if USE(WEBAUDIO_IPP)
+    int bufferSize;
+    ippsIIRGetStateSize64f_BiQuad_32f(1, &bufferSize);
+    m_ippInternalBuffer = ippsMalloc_8u(bufferSize);
+#endif // USE(WEBAUDIO_IPP)
+
     // Initialize as pass-thru (straight-wire, no filter effect)
-    m_b0 = 1;
-    m_b1 = 0;
-    m_b2 = 0;
-    m_a1 = 0;
-    m_a2 = 0;
+    setNormalizedCoefficients(1, 0, 0, 1, 0, 0);
 
     reset(); // clear filter memory
+}
+
+Biquad::~Biquad()
+{
+#if USE(WEBAUDIO_IPP)
+    ippsFree(m_ippInternalBuffer);
+#endif // USE(WEBAUDIO_IPP)
 }
 
@@ -69 +78 @@
     // Use vecLib if available
     processFast(sourceP, destP, framesToProcess);
-#else
+
+#elif USE(WEBAUDIO_IPP)
+    ippsIIR64f_32f(sourceP, destP, static_cast<int>(framesToProcess), m_biquadState);
+#else // USE(WEBAUDIO_IPP)
+
     int n = framesToProcess;
 
@@ -172 +185 @@
 void Biquad::reset()
 {
-    m_x1 = m_x2 = m_y1 = m_y2 = 0;
-
 #if OS(DARWIN)
     // Two extra samples for filter history
@@ -183 +194 @@
     outputP[0] = 0;
     outputP[1] = 0;
+
+#elif USE(WEBAUDIO_IPP)
+    int bufferSize;
+    ippsIIRGetStateSize64f_BiQuad_32f(1, &bufferSize);
+    ippsZero_8u(m_ippInternalBuffer, bufferSize);
+
+#else
+    m_x1 = m_x2 = m_y1 = m_y2 = 0;
 #endif
 }
@@ -188 +207 @@
 void Biquad::setLowpassParams(double cutoff, double resonance)
 {
-    resonance = std::max(0.0, resonance); // can't go negative
     // Limit cutoff to 0 to 1.
     cutoff = std::max(0.0, std::min(cutoff, 1.0));
     
-    double g = pow(10.0, 0.05 * resonance);
-    double d = sqrt((4 - sqrt(16 - 16 / (g * g))) / 2);
-
     if (cutoff == 1) {
         // When cutoff is 1, the z-transform is 1.
-        m_b0 = 1;
-        m_b1 = 0;
-        m_b2 = 0;
-        m_a1 = 0;
-        m_a2 = 0;
+        setNormalizedCoefficients(1, 0, 0,
+                                  1, 0, 0);
     } else if (cutoff > 0) {
         // Compute biquad coefficients for lowpass filter
+        resonance = std::max(0.0, resonance); // can't go negative
+        double g = pow(10.0, 0.05 * resonance);
+        double d = sqrt((4 - sqrt(16 - 16 / (g * g))) / 2);
+
         double theta = piDouble * cutoff;
         double sn = 0.5 * d * sin(theta);
@@ -210 +226 @@
         double alpha = 0.25 * (0.5 + beta - gamma);
 
-        m_b0 = 2 * alpha;
-        m_b1 = 2 * 2 * alpha;
-        m_b2 = 2 * alpha;
-        m_a1 = 2 * -gamma;
-        m_a2 = 2 * beta;
+        double b0 = 2 * alpha;
+        double b1 = 2 * 2 * alpha;
+        double b2 = 2 * alpha;
+        double a1 = 2 * -gamma;
+        double a2 = 2 * beta;
+
+        setNormalizedCoefficients(b0, b1, b2, 1, a1, a2);
     } else {
         // When cutoff is zero, nothing gets through the filter, so set
         // coefficients up correctly.
-        m_b0 = 0;
-        m_b1 = 0;
-        m_b2 = 0;
-        m_a1 = 0;
-        m_a2 = 0;
+        setNormalizedCoefficients(0, 0, 0,
+                                  1, 0, 0);
     }
 }
@@ -228 +243 @@
 void Biquad::setHighpassParams(double cutoff, double resonance)
 {
-    resonance = std::max(0.0, resonance); // can't go negative
-
     // Limit cutoff to 0 to 1.
     cutoff = std::max(0.0, std::min(cutoff, 1.0));
 
-    double g = pow(10.0, 0.05 * resonance);
-    double d = sqrt((4 - sqrt(16 - 16 / (g * g))) / 2);
-
     if (cutoff == 1) {
         // The z-transform is 0.
-        m_b0 = 0;
-        m_b1 = 0;
-        m_b2 = 0;
-        m_a1 = 0;
-        m_a2 = 0;
+        setNormalizedCoefficients(0, 0, 0,
+                                  1, 0, 0);
     } else if (cutoff > 0) {
         // Compute biquad coefficients for highpass filter
+        resonance = std::max(0.0, resonance); // can't go negative
+        double g = pow(10.0, 0.05 * resonance);
+        double d = sqrt((4 - sqrt(16 - 16 / (g * g))) / 2);
+
         double theta = piDouble * cutoff;
         double sn = 0.5 * d * sin(theta);
@@ -251 +262 @@
         double alpha = 0.25 * (0.5 + beta + gamma);
 
-        m_b0 = 2 * alpha;
-        m_b1 = 2 * -2 * alpha;
-        m_b2 = 2 * alpha;
-        m_a1 = 2 * -gamma;
-        m_a2 = 2 * beta;
+        double b0 = 2 * alpha;
+        double b1 = 2 * -2 * alpha;
+        double b2 = 2 * alpha;
+        double a1 = 2 * -gamma;
+        double a2 = 2 * beta;
+
+        setNormalizedCoefficients(b0, b1, b2, 1, a1, a2);
     } else {
       // When cutoff is zero, we need to be careful because the above
@@ -261 +274 @@
       // and zeros on the unit circle in the same place. When cutoff
       // is zero, the z-transform is 1.
-      m_b0 = 1;
-      m_b1 = 0;
-      m_b2 = 0;
-      m_a1 = 0;
-      m_a2 = 0;
+        setNormalizedCoefficients(1, 0, 0,
+                                  1, 0, 0);
     }
 }
@@ -278 +288 @@
     m_a1 = a1 * a0Inverse;
     m_a2 = a2 * a0Inverse;
+
+#if USE(WEBAUDIO_IPP)
+    Ipp64f taps[6];
+    taps[0] = m_b0;
+    taps[1] = m_b1;
+    taps[2] = m_b2;
+    taps[3] = 1;
+    taps[4] = m_a1;
+    taps[5] = m_a2;
+    m_biquadState = 0;
+
+    ippsIIRInit64f_BiQuad_32f(&m_biquadState, taps, 1, 0, m_ippInternalBuffer);
+#endif // USE(WEBAUDIO_IPP)
 }
 
@@ -502 +525 @@
 void Biquad::setZeroPolePairs(const Complex &zero, const Complex &pole)
 {
-    m_b0 = 1;
-    m_b1 = -2 * zero.real();
+    double b0 = 1;
+    double b1 = -2 * zero.real();
 
     double zeroMag = abs(zero);
-    m_b2 = zeroMag * zeroMag;
-
-    m_a1 = -2 * pole.real();
+    double b2 = zeroMag * zeroMag;
+
+    double a1 = -2 * pole.real();
 
     double poleMag = abs(pole);
-    m_a2 = poleMag * poleMag;
+    double a2 = poleMag * poleMag;
+    setNormalizedCoefficients(b0, b1, b2, 1, a1, a2);
 }
 

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

@@ -35 +35 @@
 #include <wtf/Platform.h>
  
+#if USE(WEBAUDIO_IPP)
+#include <ipps.h>
+#endif // USE(WEBAUDIO_IPP)
+
 namespace WebCore {
 
@@ -45 +49 @@
 public:   
     Biquad();
-    virtual ~Biquad() { }
+    virtual ~Biquad();
 
     void process(const float* sourceP, float* destP, size_t framesToProcess);
@@ -90 +94 @@
     double m_a2;
 
-    // Filter memory
-    double m_x1; // input delayed by 1 sample
-    double m_x2; // input delayed by 2 samples
-    double m_y1; // output delayed by 1 sample
-    double m_y2; // output delayed by 2 samples
-
 #if OS(DARWIN)
     void processFast(const float* sourceP, float* destP, size_t framesToProcess);
@@ -102 +100 @@
     AudioDoubleArray m_inputBuffer;
     AudioDoubleArray m_outputBuffer;
+
+#elif USE(WEBAUDIO_IPP)
+    IppsIIRState64f_32f* m_biquadState;
+    Ipp8u* m_ippInternalBuffer;
+
+#else
+    // Filter memory
+    double m_x1; // input delayed by 1 sample
+    double m_x2; // input delayed by 2 samples
+    double m_y1; // output delayed by 1 sample
+    double m_y2; // output delayed by 2 samples
 #endif
 };