Title: [268907] trunk
- Revision
- 268907
- Author
- [email protected]
- Date
- 2020-10-23 01:06:05 -0700 (Fri, 23 Oct 2020)
Log Message
[GStreamer] Replace USE(WEBAUDIO_GSTREAMER) with USE(GSTREAMER)
https://bugs.webkit.org/show_bug.cgi?id=218083
Patch by Philippe Normand <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (268906 => 268907)
--- trunk/ChangeLog 2020-10-23 07:33:47 UTC (rev 268906)
+++ trunk/ChangeLog 2020-10-23 08:06:05 UTC (rev 268907)
@@ -1,3 +1,16 @@
+2020-10-23 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
WebDriver: add support for wheel actions
Modified: trunk/Source/WebCore/ChangeLog (268906 => 268907)
--- trunk/Source/WebCore/ChangeLog 2020-10-23 07:33:47 UTC (rev 268906)
+++ trunk/Source/WebCore/ChangeLog 2020-10-23 08:06:05 UTC (rev 268907)
@@ -1,3 +1,16 @@
+2020-10-23 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
Null check platformStrategies when making blob read stream for an NSURLRequest
Modified: trunk/Source/WebCore/platform/audio/FFTFrame.h (268906 => 268907)
--- trunk/Source/WebCore/platform/audio/FFTFrame.h 2020-10-23 07:33:47 UTC (rev 268906)
+++ trunk/Source/WebCore/platform/audio/FFTFrame.h 2020-10-23 08:06:05 UTC (rev 268907)
@@ -31,12 +31,9 @@
#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)
#include <Accelerate/Accelerate.h>
@@ -107,11 +104,11 @@
DSPSplitComplex m_frame;
#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;
AudioFloatArray m_imagData;
Modified: trunk/Source/WebCore/platform/audio/FFTFrameStub.cpp (268906 => 268907)
--- trunk/Source/WebCore/platform/audio/FFTFrameStub.cpp 2020-10-23 07:33:47 UTC (rev 268906)
+++ trunk/Source/WebCore/platform/audio/FFTFrameStub.cpp 2020-10-23 08:06:05 UTC (rev 268907)
@@ -29,7 +29,7 @@
#if ENABLE(WEB_AUDIO)
-#if !OS(DARWIN) && !USE(WEBAUDIO_GSTREAMER)
+#if !OS(DARWIN) && !USE(GSTREAMER)
#include "FFTFrame.h"
@@ -80,6 +80,6 @@
} // namespace WebCore
-#endif // !OS(DARWIN) && !USE(WEBAUDIO_GSTREAMER)
+#endif // !OS(DARWIN) && !USE(GSTREAMER)
#endif // ENABLE(WEB_AUDIO)
Modified: trunk/Source/WebCore/platform/audio/HRTFElevation.cpp (268906 => 268907)
--- trunk/Source/WebCore/platform/audio/HRTFElevation.cpp 2020-10-23 07:33:47 UTC (rev 268906)
+++ trunk/Source/WebCore/platform/audio/HRTFElevation.cpp 2020-10-23 08:06:05 UTC (rev 268907)
@@ -54,7 +54,7 @@
// The impulse responses may be resampled to a different sample-rate (depending on the audio hardware) when they are loaded.
constexpr float ResponseSampleRate = 44100;
-#if PLATFORM(COCOA) || USE(WEBAUDIO_GSTREAMER)
+#if PLATFORM(COCOA) || USE(GSTREAMER)
#define USE_CONCATENATED_IMPULSE_RESPONSES
#endif
Modified: trunk/Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp (268906 => 268907)
--- trunk/Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp 2020-10-23 07:33:47 UTC (rev 268906)
+++ trunk/Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp 2020-10-23 08:06:05 UTC (rev 268907)
@@ -20,7 +20,7 @@
#include "config.h"
-#if USE(WEBAUDIO_GSTREAMER)
+#if USE(GSTREAMER)
#include "FFTFrame.h"
@@ -140,4 +140,4 @@
} // namespace WebCore
-#endif // USE(WEBAUDIO_GSTREAMER)
+#endif // USE(GSTREAMER)
Modified: trunk/Source/cmake/GStreamerChecks.cmake (268906 => 268907)
--- trunk/Source/cmake/GStreamerChecks.cmake 2020-10-23 07:33:47 UTC (rev 268906)
+++ trunk/Source/cmake/GStreamerChecks.cmake 2020-10-23 08:06:05 UTC (rev 268907)
@@ -16,7 +16,6 @@
if (NOT PC_GSTREAMER_FULL_FOUND)
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 ()
else ()
@@ -27,7 +26,6 @@
if (ENABLE_WEB_AUDIO)
list(APPEND GSTREAMER_COMPONENTS audio fft)
- SET_AND_EXPOSE_TO_BUILD(USE_WEBAUDIO_GSTREAMER TRUE)
endif ()
find_package(GStreamer 1.10.0 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
@@ -35,8 +33,6 @@
if (ENABLE_WEB_AUDIO)
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 ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
