Changeset 268907 in webkit

Timestamp:

Oct 23, 2020, 1:06:05 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer] Replace USE(WEBAUDIO_GSTREAMER) with USE(GSTREAMER)
​https://bugs.webkit.org/show_bug.cgi?id=218083

Patch by Philippe Normand <​pnormand@igalia.com> on 2020-10-23
Reviewed by Xabier Rodriguez-Calvar.

.:

A separate define was introduced back when we thought enabling WebAudio without enabling
<audio> would be a highly relevant scenario. I don't think it is very relevant, let's clean
this up.

• Source/cmake/GStreamerChecks.cmake: Wrap the WebAudio platform bits in the USE(GSTREAMER) umbrella.

Source/WebCore:

• platform/audio/FFTFrame.h: No need for G_{BEGIN,END}_DECLS dance anymore, these were added

upstream 9 years ago.

• platform/audio/FFTFrameStub.cpp:
• platform/audio/HRTFElevation.cpp:
• platform/audio/gstreamer/FFTFrameGStreamer.cpp:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/audio/FFTFrame.h (modified) (2 diffs)
• Source/WebCore/platform/audio/FFTFrameStub.cpp (modified) (2 diffs)
• Source/WebCore/platform/audio/HRTFElevation.cpp (modified) (1 diff)
• Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp (modified) (2 diffs)
• Source/cmake/GStreamerChecks.cmake (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2020-10-23  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] Replace USE(WEBAUDIO_GSTREAMER) with USE(GSTREAMER)
+        https://bugs.webkit.org/show_bug.cgi?id=218083
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        A separate define was introduced back when we thought enabling WebAudio without enabling
+        <audio> would be a highly relevant scenario. I don't think it is very relevant, let's clean
+        this up.
+
+        * Source/cmake/GStreamerChecks.cmake: Wrap the WebAudio platform bits in the USE(GSTREAMER) umbrella.
+
 2020-10-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-23  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] Replace USE(WEBAUDIO_GSTREAMER) with USE(GSTREAMER)
+        https://bugs.webkit.org/show_bug.cgi?id=218083
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        * platform/audio/FFTFrame.h: No need for G_{BEGIN,END}_DECLS dance anymore, these were added
+        upstream 9 years ago.
+        * platform/audio/FFTFrameStub.cpp:
+        * platform/audio/HRTFElevation.cpp:
+        * platform/audio/gstreamer/FFTFrameGStreamer.cpp:
+
 2020-10-22  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -32 +32 @@
 #include "AudioArray.h"
 
-#if USE(WEBAUDIO_GSTREAMER)
-#include <glib.h>
-G_BEGIN_DECLS
+#if USE(GSTREAMER)
 #include <gst/fft/gstfftf32.h>
-G_END_DECLS
-#endif // USE(WEBAUDIO_GSTREAMER)
+#endif // USE(GSTREAMER)
 
 #if USE(ACCELERATE)
@@ -108 +105 @@
 #endif
 
-#if USE(WEBAUDIO_GSTREAMER)
+#if USE(GSTREAMER)
     GstFFTF32* m_fft;
     GstFFTF32* m_inverseFft;
     UniqueArray<GstFFTF32Complex> m_complexData;
-#endif // USE(WEBAUDIO_GSTREAMER)
+#endif // USE(GSTREAMER)
 
     AudioFloatArray m_realData;

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

@@ -30 +30 @@
 #if ENABLE(WEB_AUDIO)
 
-#if !OS(DARWIN) && !USE(WEBAUDIO_GSTREAMER)
+#if !OS(DARWIN) && !USE(GSTREAMER)
 
 #include "FFTFrame.h"
@@ -81 +81 @@
 } // namespace WebCore
 
-#endif // !OS(DARWIN) && !USE(WEBAUDIO_GSTREAMER)
+#endif // !OS(DARWIN) && !USE(GSTREAMER)
 
 #endif // ENABLE(WEB_AUDIO)

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

@@ -55 +55 @@
 constexpr float ResponseSampleRate = 44100;
 
-#if PLATFORM(COCOA) || USE(WEBAUDIO_GSTREAMER)
+#if PLATFORM(COCOA) || USE(GSTREAMER)
 #define USE_CONCATENATED_IMPULSE_RESPONSES
 #endif

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

@@ -21 +21 @@
 #include "config.h"
 
-#if USE(WEBAUDIO_GSTREAMER)
+#if USE(GSTREAMER)
 
 #include "FFTFrame.h"
@@ -141 +141 @@
 } // namespace WebCore
 
-#endif // USE(WEBAUDIO_GSTREAMER)
+#endif // USE(GSTREAMER)

trunk/Source/cmake/GStreamerChecks.cmake

@@ -17 +17 @@
               message(FATAL_ERROR "GStreamer static library libgstreamer-full-1.0 not found")
           else ()
-              SET_AND_EXPOSE_TO_BUILD(USE_WEBAUDIO_GSTREAMER TRUE)
               SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER_FULL TRUE)
           endif ()
@@ -28 +27 @@
           if (ENABLE_WEB_AUDIO)
               list(APPEND GSTREAMER_COMPONENTS audio fft)
-              SET_AND_EXPOSE_TO_BUILD(USE_WEBAUDIO_GSTREAMER TRUE)
           endif ()
 
@@ -36 +34 @@
               if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
                   message(FATAL_ERROR "WebAudio requires the audio and fft GStreamer libraries. Please check your gst-plugins-base installation.")
-              else ()
-                  SET_AND_EXPOSE_TO_BUILD(USE_WEBAUDIO_GSTREAMER TRUE)
               endif ()
           endif ()