Changeset 268559 in webkit

Timestamp:

Oct 15, 2020 3:27:21 PM (4 years ago)

Author:

Chris Dumez

Message:

[Cocoa] Simplify logic for caching FFTSetups in FFTFrame
​https://bugs.webkit.org/show_bug.cgi?id=217782

Reviewed by Eric Carlson.

Simplify logic for caching FFTSetups in FFTFrame:

• Use a local static (NeverDestroyed) to cache the FFTSetups to avoid heap allocation and simplify logic a bit.
• Drop FFTFrame::cleanup() since it is dead code.

No new tests, no Web-facing behavior change.

• platform/audio/FFTFrame.h:
• platform/audio/FFTFrameStub.cpp:
• platform/audio/gstreamer/FFTFrameGStreamer.cpp:
• platform/audio/mac/FFTFrameMac.cpp:

(WebCore::FFTFrame::fftSetupForSize):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-15  Chris Dumez  <cdumez@apple.com>
+
+        [Cocoa] Simplify logic for caching FFTSetups in FFTFrame
+        https://bugs.webkit.org/show_bug.cgi?id=217782
+
+        Reviewed by Eric Carlson.
+
+        Simplify logic for caching FFTSetups in FFTFrame:
+        - Use a local static (NeverDestroyed) to cache the FFTSetups to avoid
+          heap allocation and simplify logic a bit.
+        - Drop FFTFrame::cleanup() since it is dead code.
+
+        No new tests, no Web-facing behavior change.
+
+        * platform/audio/FFTFrame.h:
+        * platform/audio/FFTFrameStub.cpp:
+        * platform/audio/gstreamer/FFTFrameGStreamer.cpp:
+        * platform/audio/mac/FFTFrameMac.cpp:
+        (WebCore::FFTFrame::fftSetupForSize):
+
 2020-10-15  Chris Dumez  <cdumez@apple.com>
 

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

@@ -63 +63 @@
 
     static void initialize();
-    static void cleanup();
     void doFFT(const float* data);
     void doInverseFFT(float* data);
@@ -102 +101 @@
     static FFTSetup fftSetupForSize(unsigned fftSize);
 
-    static FFTSetup* fftSetups;
-
     FFTSetup m_FFTSetup;
 

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

@@ -79 +79 @@
 }
 
-void FFTFrame::cleanup()
-{
-    ASSERT_NOT_REACHED();
-}
-
 float* FFTFrame::realData() const
 {

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

@@ -88 +88 @@
 }
 
-void FFTFrame::cleanup()
-{
-}
-
 FFTFrame::~FFTFrame()
 {

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

@@ -38 +38 @@
 
 #include "VectorMath.h"
+#include <wtf/NeverDestroyed.h>
+#include <wtf/Vector.h>
 
 namespace WebCore {
 
-const int kMinFFTPow2Size = 2;
-const int kMaxFFTPow2Size = 24;
-
-FFTSetup* FFTFrame::fftSetups = 0;
+constexpr unsigned kMinFFTPow2Size = 2;
+constexpr unsigned kMaxFFTPow2Size = 24;
 
 // Normal constructor: allocates for a given fftSize
@@ -124 +124 @@
 FFTSetup FFTFrame::fftSetupForSize(unsigned fftSize)
 {
-    if (!fftSetups) {
-        fftSetups = (FFTSetup*)fastMalloc(sizeof(FFTSetup) * kMaxFFTPow2Size);
-        memset(fftSetups, 0, sizeof(FFTSetup) * kMaxFFTPow2Size);
-    }
+    static NeverDestroyed<Vector<FFTSetup>> fftSetups(kMaxFFTPow2Size, nullptr);
 
-    int pow2size = static_cast<int>(log2(fftSize));
+    auto pow2size = static_cast<size_t>(log2(fftSize));
     ASSERT(pow2size < kMaxFFTPow2Size);
-    if (!fftSetups[pow2size])
-        fftSetups[pow2size] = vDSP_create_fftsetup(pow2size, FFT_RADIX2);
+    auto& fftSetup = fftSetups->at(pow2size);
+    if (!fftSetup)
+        fftSetup = vDSP_create_fftsetup(pow2size, FFT_RADIX2);
 
-    return fftSetups[pow2size];
+    return fftSetup;
 }
 
@@ -149 +147 @@
 void FFTFrame::initialize()
 {
-}
-
-void FFTFrame::cleanup()
-{
-    if (!fftSetups)
-        return;
-
-    for (int i = 0; i < kMaxFFTPow2Size; ++i) {
-        if (fftSetups[i])
-            vDSP_destroy_fftsetup(fftSetups[i]);
-    }
-
-    fastFree(fftSetups);
-    fftSetups = 0;
 }