Changeset 267428 in webkit

Timestamp:

Sep 22, 2020, 12:03:05 PM (6 years ago)

Author:

Chris Dumez

Message:

Unreviewed, partial revert of r267383.

Restore GStreamer-specific implementation of FFTFrame::multiply() since it appears
r267383 introduced test failures on GTK port.

• platform/audio/FFTFrame.cpp:

(WebCore::FFTFrame::multiply): Deleted.

• platform/audio/FFTFrameStub.cpp:

(WebCore::FFTFrame::multiply):

• platform/audio/gstreamer/FFTFrameGStreamer.cpp:

(WebCore::FFTFrame::multiply):

• platform/audio/mac/FFTFrameMac.cpp:

(WebCore::FFTFrame::multiply):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/FFTFrame.cpp (modified) (1 diff)
• platform/audio/FFTFrameStub.cpp (modified) (1 diff)
• platform/audio/gstreamer/FFTFrameGStreamer.cpp (modified) (1 diff)
• platform/audio/mac/FFTFrameMac.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-22  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, partial revert of r267383.
+
+        Restore GStreamer-specific implementation of FFTFrame::multiply() since it appears
+        r267383 introduced test failures on GTK port.
+
+        * platform/audio/FFTFrame.cpp:
+        (WebCore::FFTFrame::multiply): Deleted.
+        * platform/audio/FFTFrameStub.cpp:
+        (WebCore::FFTFrame::multiply):
+        * platform/audio/gstreamer/FFTFrameGStreamer.cpp:
+        (WebCore::FFTFrame::multiply):
+        * platform/audio/mac/FFTFrameMac.cpp:
+        (WebCore::FFTFrame::multiply):
+
 2020-09-22  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -180 +180 @@
 }
 
-void FFTFrame::multiply(const FFTFrame& frame)
-{
-    FFTFrame& frame1 = *this;
-    const FFTFrame& frame2 = frame;
-
-    float* realP1 = frame1.realData();
-    float* imagP1 = frame1.imagData();
-    const float* realP2 = frame2.realData();
-    const float* imagP2 = frame2.imagData();
-
-    unsigned halfSize = m_FFTSize / 2;
-    float real0 = realP1[0];
-    float imag0 = imagP1[0];
-
-    // Complex multiply
-    VectorMath::zvmul(realP1, imagP1, realP2, imagP2, realP1, imagP1, halfSize);
-
-    // Multiply the packed DC/nyquist component
-    realP1[0] = real0 * realP2[0];
-    imagP1[0] = imag0 * imagP2[0];
-}
-
 double FFTFrame::extractAverageGroupDelay()
 {

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

@@ -65 +65 @@
 }
 
+void FFTFrame::multiply(const FFTFrame& frame)
+{
+    ASSERT_NOT_REACHED();
+}
+
 void FFTFrame::doFFT(const float* data)
 {

trunk/Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp

@@ -104 +104 @@
 }
 
+void FFTFrame::multiply(const FFTFrame& frame)
+{
+    FFTFrame& frame1 = *this;
+    FFTFrame& frame2 = const_cast<FFTFrame&>(frame);
+
+    float* realP1 = frame1.realData();
+    float* imagP1 = frame1.imagData();
+    const float* realP2 = frame2.realData();
+    const float* imagP2 = frame2.imagData();
+
+    size_t size = unpackedFFTDataSize(m_FFTSize);
+    VectorMath::zvmul(realP1, imagP1, realP2, imagP2, realP1, imagP1, size);
+}
+
 void FFTFrame::doFFT(const float* data)
 {

trunk/Source/WebCore/platform/audio/mac/FFTFrameMac.cpp

@@ -98 +98 @@
 FFTFrame::~FFTFrame() = default;
 
+void FFTFrame::multiply(const FFTFrame& frame)
+{
+    FFTFrame& frame1 = *this;
+    const FFTFrame& frame2 = frame;
+
+    float* realP1 = frame1.realData();
+    float* imagP1 = frame1.imagData();
+    const float* realP2 = frame2.realData();
+    const float* imagP2 = frame2.imagData();
+
+    unsigned halfSize = m_FFTSize / 2;
+    float real0 = realP1[0];
+    float imag0 = imagP1[0];
+
+    // Complex multiply
+    VectorMath::zvmul(realP1, imagP1, realP2, imagP2, realP1, imagP1, halfSize);
+
+    // Multiply the packed DC/nyquist component
+    realP1[0] = real0 * realP2[0];
+    imagP1[0] = imag0 * imagP2[0];
+}
+
 void FFTFrame::doFFT(const float* data)
 {