Diff
Modified: trunk/Source/WebCore/ChangeLog (267933 => 267934)
--- trunk/Source/WebCore/ChangeLog 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/ChangeLog 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,3 +1,36 @@
+2020-10-03 Adrian Perez de Castro <[email protected]>
+
+ [GTK] Build broken with ENABLE_MEDIA_STREAM enabled and ENABLE_WEB_RTC_DISABLED
+ https://bugs.webkit.org/show_bug.cgi?id=217128
+
+ Remove USE(LIBWEBRTC) guards from media stream code, as it does not actually
+ depend on libwebrtc and can be built by itself. This allows using e.g. live
+ audio recording inputs with WebAudio.
+
+ Reviewed by Philippe Normand.
+
+ No new tests needed.
+
+ * platform/mediastream/gstreamer/GStreamerAudioCaptureSource.cpp:
+ * platform/mediastream/gstreamer/GStreamerAudioCaptureSource.h:
+ * platform/mediastream/gstreamer/GStreamerAudioCapturer.cpp:
+ (WebCore::GStreamerAudioCapturer::GStreamerAudioCapturer):
+ * platform/mediastream/gstreamer/GStreamerAudioCapturer.h:
+ * platform/mediastream/gstreamer/GStreamerAudioStreamDescription.h:
+ * platform/mediastream/gstreamer/GStreamerCapturer.cpp:
+ * platform/mediastream/gstreamer/GStreamerCapturer.h:
+ * platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp:
+ * platform/mediastream/gstreamer/GStreamerVideoCaptureSource.h:
+ * platform/mediastream/gstreamer/GStreamerVideoCapturer.cpp:
+ * platform/mediastream/gstreamer/GStreamerVideoCapturer.h:
+ * platform/mediastream/gstreamer/MockRealtimeAudioSourceGStreamer.cpp:
+ * platform/mediastream/gstreamer/MockRealtimeAudioSourceGStreamer.h:
+ * platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.cpp:
+ * platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.h:
+ * platform/mediastream/gstreamer/RealtimeMediaSourceCenterLibWebRTC.cpp:
+ * platform/mock/MockRealtimeAudioSource.cpp:
+ * platform/mock/MockRealtimeVideoSource.cpp:
+
2020-10-03 Zalan Bujtas <[email protected]>
[LFC][IFC][Soft hyphen] Mark the last run on the line when hyphenation is required.
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCaptureSource.cpp (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCaptureSource.cpp 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCaptureSource.cpp 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,7 +22,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "GStreamerAudioCaptureSource.h"
#include "GStreamerAudioData.h"
@@ -207,4 +208,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCaptureSource.h (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCaptureSource.h 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCaptureSource.h 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,7 +22,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "CaptureDevice.h"
#include "GStreamerAudioCapturer.h"
#include "GStreamerCaptureDevice.h"
@@ -63,4 +64,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCapturer.cpp (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCapturer.cpp 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCapturer.cpp 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,22 +22,30 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "GStreamerAudioCapturer.h"
+#if USE(LIBWEBRTC)
#include "LibWebRTCAudioFormat.h"
+#endif
#include <gst/app/gstappsink.h>
namespace WebCore {
+#if USE(LIBWEBRTC)
+static constexpr size_t AudioCaptureSampleRate = LibWebRTCAudioFormat::sampleRate;
+#else
+static constexpr size_t AudioCaptureSampleRate = 48000;
+#endif
+
GStreamerAudioCapturer::GStreamerAudioCapturer(GStreamerCaptureDevice device)
- : GStreamerCapturer(device, adoptGRef(gst_caps_new_simple("audio/x-raw", "rate", G_TYPE_INT, LibWebRTCAudioFormat::sampleRate, nullptr)))
+ : GStreamerCapturer(device, adoptGRef(gst_caps_new_simple("audio/x-raw", "rate", G_TYPE_INT, AudioCaptureSampleRate, nullptr)))
{
}
GStreamerAudioCapturer::GStreamerAudioCapturer()
- : GStreamerCapturer("appsrc", adoptGRef(gst_caps_new_simple("audio/x-raw", "rate", G_TYPE_INT, LibWebRTCAudioFormat::sampleRate, nullptr)))
+ : GStreamerCapturer("appsrc", adoptGRef(gst_caps_new_simple("audio/x-raw", "rate", G_TYPE_INT, AudioCaptureSampleRate, nullptr)))
{
}
@@ -71,4 +80,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCapturer.h (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCapturer.h 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCapturer.h 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,7 +22,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "GStreamerCapturer.h"
@@ -40,4 +41,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioStreamDescription.h (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioStreamDescription.h 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioStreamDescription.h 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
- * Copyright (C) 2018 Igalia S.L. All rights reserved.
+ * Copyright (C) 2018, 2020 Igalia S.L.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -20,7 +20,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "AudioStreamDescription.h"
#include "GStreamerCommon.h"
@@ -103,4 +103,4 @@
} // WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerCapturer.cpp (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerCapturer.cpp 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerCapturer.cpp 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,13 +22,12 @@
#include "config.h"
-#if ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "GStreamerCapturer.h"
#include <gst/app/gstappsink.h>
#include <gst/app/gstappsrc.h>
#include <mutex>
-#include <webrtc/api/media_stream_interface.h>
GST_DEBUG_CATEGORY(webkit_capturer_debug);
#define GST_CAT_DEFAULT webkit_capturer_debug
@@ -184,4 +184,4 @@
} // namespace WebCore
-#endif // ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerCapturer.h (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerCapturer.h 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerCapturer.h 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,11 +22,10 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "GStreamerCaptureDevice.h"
#include "GStreamerCommon.h"
-#include "LibWebRTCMacros.h"
#include <gst/gst.h>
@@ -70,4 +70,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,7 +22,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "GStreamerVideoCaptureSource.h"
#include "GStreamerCaptureDeviceManager.h"
@@ -28,13 +29,6 @@
#include "MediaSampleGStreamer.h"
#include <gst/app/gstappsink.h>
-#include <webrtc/api/media_stream_interface.h>
-#include <webrtc/api/peer_connection_interface.h>
-#include <webrtc/media/base/video_common.h>
-// #include <webrtc/media/engine/video_capturer.h>
-// #include <webrtc/media/engine/video_capturer_factory.h>
-#include <webrtc/modules/video_capture/video_capture_factory.h>
-#include <webrtc/modules/video_capture/video_capture_defines.h>
namespace WebCore {
@@ -292,4 +286,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.h (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.h 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.h 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,7 +22,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "CaptureDevice.h"
#include "GStreamerVideoCapturer.h"
#include "RealtimeVideoCaptureSource.h"
@@ -67,4 +68,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.cpp (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.cpp 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.cpp 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,7 +22,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "GStreamerVideoCapturer.h"
namespace WebCore {
@@ -99,4 +100,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.h (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.h 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.h 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,7 +22,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "GStreamerCapturer.h"
@@ -43,4 +44,4 @@
};
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeAudioSourceGStreamer.cpp (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeAudioSourceGStreamer.cpp 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeAudioSourceGStreamer.cpp 2020-10-03 21:32:45 UTC (rev 267934)
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "MockRealtimeAudioSourceGStreamer.h"
#include "MockRealtimeMediaSourceCenter.h"
@@ -141,4 +141,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeAudioSourceGStreamer.h (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeAudioSourceGStreamer.h 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeAudioSourceGStreamer.h 2020-10-03 21:32:45 UTC (rev 267934)
@@ -22,7 +22,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "GStreamerAudioData.h"
#include "GStreamerAudioStreamDescription.h"
@@ -54,4 +54,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.cpp (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.cpp 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.cpp 2020-10-03 21:32:45 UTC (rev 267934)
@@ -22,7 +22,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "MockRealtimeVideoSourceGStreamer.h"
#include "MediaSampleGStreamer.h"
@@ -80,4 +80,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.h (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.h 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/MockRealtimeVideoSourceGStreamer.h 2020-10-03 21:32:45 UTC (rev 267934)
@@ -22,7 +22,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "MockRealtimeVideoSource.h"
@@ -44,4 +44,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/RealtimeMediaSourceCenterLibWebRTC.cpp (267933 => 267934)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/RealtimeMediaSourceCenterLibWebRTC.cpp 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/RealtimeMediaSourceCenterLibWebRTC.cpp 2020-10-03 21:32:45 UTC (rev 267934)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Metrological Group B.V.
+ * Copyright (C) 2020 Igalia S.L.
* Author: Thibault Saunier <[email protected]>
* Author: Alejandro G. Castro <[email protected]>
*
@@ -21,7 +22,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC)
+#if ENABLE(MEDIA_STREAM)
#include "RealtimeMediaSourceCenter.h"
#include "GStreamerAudioCaptureSource.h"
@@ -48,4 +49,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC)
+#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp (267933 => 267934)
--- trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp 2020-10-03 21:32:45 UTC (rev 267934)
@@ -44,7 +44,7 @@
namespace WebCore {
-#if !PLATFORM(MAC) && !PLATFORM(IOS_FAMILY) && !(USE(GSTREAMER) && USE(LIBWEBRTC))
+#if !PLATFORM(MAC) && !PLATFORM(IOS_FAMILY) && !USE(GSTREAMER)
CaptureSourceOrError MockRealtimeAudioSource::create(String&& deviceID, String&& name, String&& hashSalt, const MediaConstraints* constraints)
{
#ifndef NDEBUG
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (267933 => 267934)
--- trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2020-10-03 21:17:06 UTC (rev 267933)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2020-10-03 21:32:45 UTC (rev 267934)
@@ -49,7 +49,7 @@
namespace WebCore {
-#if !PLATFORM(MAC) && !PLATFORM(IOS_FAMILY) && !(USE(GSTREAMER) && USE(LIBWEBRTC))
+#if !PLATFORM(MAC) && !PLATFORM(IOS_FAMILY) && !USE(GSTREAMER)
CaptureSourceOrError MockRealtimeVideoSource::create(String&& deviceID, String&& name, String&& hashSalt, const MediaConstraints* constraints)
{
#ifndef NDEBUG
