Diff
Modified: trunk/LayoutTests/ChangeLog (289893 => 289894)
--- trunk/LayoutTests/ChangeLog 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/LayoutTests/ChangeLog 2022-02-16 17:19:14 UTC (rev 289894)
@@ -1,3 +1,14 @@
+2022-02-16 Philippe Normand <[email protected]>
+
+ Add a dedicated ENABLE flag for MediaRecorder
+ https://bugs.webkit.org/show_bug.cgi?id=236652
+
+ Reviewed by Eric Carlson.
+
+ * platform/glib/TestExpectations: Skip MediaRecorder test, GLib ports don't enable this
+ feature yet. This test used to pass because MediaRecorder used to be under MediaStream and
+ there is a mock Recorder implementation.
+
2022-02-16 Alexey Shvayka <[email protected]>
REGRESSION(r287293): EventListener::wasCreatedFromMarkup() is incorrect after replaceJSFunctionForAttributeListener()
Modified: trunk/LayoutTests/platform/glib/TestExpectations (289893 => 289894)
--- trunk/LayoutTests/platform/glib/TestExpectations 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/LayoutTests/platform/glib/TestExpectations 2022-02-16 17:19:14 UTC (rev 289894)
@@ -1648,6 +1648,7 @@
# MediaRecorder is not currently implemented
http/wpt/mediarecorder [ Skip ]
imported/w3c/web-platform-tests/mediacapture-record [ Skip ]
+fast/mediacapturefromelement/CanvasCaptureMediaStream-offscreencanvas.html [ Skip ]
imported/w3c/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-update-with-border-object-fit.html [ Pass ]
Modified: trunk/Source/WTF/ChangeLog (289893 => 289894)
--- trunk/Source/WTF/ChangeLog 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WTF/ChangeLog 2022-02-16 17:19:14 UTC (rev 289894)
@@ -1,3 +1,16 @@
+2022-02-16 Philippe Normand <[email protected]>
+
+ Add a dedicated ENABLE flag for MediaRecorder
+ https://bugs.webkit.org/show_bug.cgi?id=236652
+
+ Reviewed by Eric Carlson.
+
+ ENABLE(MEDIA_RECORDER) depends on ENABLE(MEDIA_STREAM) and is enabled only for COCOA
+ platforms. Suggested by Eric Carlson.
+
+ * wtf/PlatformEnable.h:
+ * wtf/PlatformEnableCocoa.h:
+
2022-02-16 Kimmo Kinnunen <[email protected]>
RemoteVideoFrameProxy is missing reference field encode, decode
Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml (289893 => 289894)
--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml 2022-02-16 17:19:14 UTC (rev 289894)
@@ -856,7 +856,7 @@
type: bool
humanReadableName: "MediaRecorder"
humanReadableDescription: "MediaRecorder"
- condition: ENABLE(MEDIA_STREAM)
+ condition: ENABLE(MEDIA_RECORDER)
defaultValue:
WebKitLegacy:
default: false
Modified: trunk/Source/WTF/wtf/PlatformEnable.h (289893 => 289894)
--- trunk/Source/WTF/wtf/PlatformEnable.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WTF/wtf/PlatformEnable.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -363,6 +363,10 @@
#define ENABLE_MEDIA_CONTROLS_SCRIPT 0
#endif
+#if !defined(ENABLE_MEDIA_RECORDER)
+#define ENABLE_MEDIA_RECORDER 0
+#endif
+
#if !defined(ENABLE_MEDIA_SOURCE)
#define ENABLE_MEDIA_SOURCE 0
#endif
@@ -926,6 +930,10 @@
#error "ENABLE(OFFSCREEN_CANVAS_IN_WORKERS) requires ENABLE(OFFSCREEN_CANVAS)"
#endif
+#if ENABLE(MEDIA_RECORDER) && !ENABLE(MEDIA_STREAM)
+#error "ENABLE(MEDIA_RECORDER) requires ENABLE(MEDIA_STREAM)"
+#endif
+
#if USE(CG)
#if ENABLE(DESTINATION_COLOR_SPACE_DISPLAY_P3) && !HAVE(CORE_GRAPHICS_DISPLAY_P3_COLOR_SPACE)
Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (289893 => 289894)
--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -384,6 +384,10 @@
#define ENABLE_MEDIA_STREAM 1
#endif
+#if !defined(ENABLE_MEDIA_RECORDER) && ENABLE(MEDIA_STREAM) && !PLATFORM(MACCATALYST) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+#define ENABLE_MEDIA_RECORDER 1
+#endif
+
#if !defined(ENABLE_MEDIA_USAGE) && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000))
#define ENABLE_MEDIA_USAGE 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (289893 => 289894)
--- trunk/Source/WebCore/ChangeLog 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/ChangeLog 2022-02-16 17:19:14 UTC (rev 289894)
@@ -1,3 +1,38 @@
+2022-02-16 Philippe Normand <[email protected]>
+
+ Add a dedicated ENABLE flag for MediaRecorder
+ https://bugs.webkit.org/show_bug.cgi?id=236652
+
+ Reviewed by Eric Carlson.
+
+ ENABLE(MEDIA_RECORDER) depends on ENABLE(MEDIA_STREAM) and is enabled only for COCOA
+ platforms, until the GStreamer backend is merged.
+
+ * Modules/mediarecorder/BlobEvent.cpp:
+ * Modules/mediarecorder/BlobEvent.h:
+ * Modules/mediarecorder/BlobEvent.idl:
+ * Modules/mediarecorder/MediaRecorder.cpp:
+ * Modules/mediarecorder/MediaRecorder.h:
+ * Modules/mediarecorder/MediaRecorder.idl:
+ * Modules/mediarecorder/MediaRecorderErrorEvent.cpp:
+ * Modules/mediarecorder/MediaRecorderErrorEvent.h:
+ * Modules/mediarecorder/MediaRecorderErrorEvent.idl:
+ * Modules/mediarecorder/MediaRecorderProvider.cpp:
+ * Modules/mediarecorder/MediaRecorderProvider.h:
+ * platform/mediarecorder/MediaRecorderPrivate.cpp:
+ * platform/mediarecorder/MediaRecorderPrivate.h:
+ * platform/mediarecorder/MediaRecorderPrivateAVFImpl.cpp:
+ * platform/mediarecorder/MediaRecorderPrivateAVFImpl.h:
+ * platform/mediarecorder/MediaRecorderPrivateMock.cpp:
+ * platform/mediarecorder/MediaRecorderPrivateMock.h:
+ * platform/mediarecorder/MediaRecorderPrivateOptions.h:
+ * platform/mediarecorder/cocoa/AudioSampleBufferCompressor.h:
+ * platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm:
+ * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h:
+ * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:
+ * platform/mediarecorder/cocoa/VideoSampleBufferCompressor.h:
+ * platform/mediarecorder/cocoa/VideoSampleBufferCompressor.mm:
+
2022-02-16 Alexey Shvayka <[email protected]>
REGRESSION(r287293): EventListener::wasCreatedFromMarkup() is incorrect after replaceJSFunctionForAttributeListener()
Modified: trunk/Source/WebCore/Modules/mediarecorder/BlobEvent.cpp (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/BlobEvent.cpp 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/BlobEvent.cpp 2022-02-16 17:19:14 UTC (rev 289894)
@@ -26,7 +26,7 @@
#include "config.h"
#include "BlobEvent.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "Blob.h"
#include <wtf/IsoMallocInlines.h>
@@ -54,4 +54,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/Modules/mediarecorder/BlobEvent.h (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/BlobEvent.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/BlobEvent.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -24,7 +24,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "Event.h"
@@ -58,4 +58,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/Modules/mediarecorder/BlobEvent.idl (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/BlobEvent.idl 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/BlobEvent.idl 2022-02-16 17:19:14 UTC (rev 289894)
@@ -25,7 +25,7 @@
typedef double DOMHighResTimeStamp;
[
- Conditional=MEDIA_STREAM,
+ Conditional=MEDIA_RECORDER,
EnabledBySetting=MediaRecorderEnabled,
Exposed=Window
] interface BlobEvent : Event {
Modified: trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.cpp (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.cpp 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.cpp 2022-02-16 17:19:14 UTC (rev 289894)
@@ -26,7 +26,7 @@
#include "config.h"
#include "MediaRecorder.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "Blob.h"
#include "BlobEvent.h"
@@ -410,4 +410,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.h (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -24,7 +24,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "ActiveDOMObject.h"
#include "EventTarget.h"
@@ -142,4 +142,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.idl (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.idl 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.idl 2022-02-16 17:19:14 UTC (rev 289894)
@@ -26,7 +26,7 @@
[
ActiveDOMObject,
- Conditional=MEDIA_STREAM,
+ Conditional=MEDIA_RECORDER,
EnabledBySetting=MediaRecorderEnabled,
Exposed=Window
] interface MediaRecorder : EventTarget {
Modified: trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.cpp (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.cpp 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.cpp 2022-02-16 17:19:14 UTC (rev 289894)
@@ -26,7 +26,7 @@
#include "config.h"
#include "MediaRecorderErrorEvent.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "DOMException.h"
#include <wtf/IsoMallocInlines.h>
@@ -65,4 +65,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.h (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -24,7 +24,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "Event.h"
namespace WebCore {
@@ -55,4 +55,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.idl (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.idl 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.idl 2022-02-16 17:19:14 UTC (rev 289894)
@@ -27,7 +27,7 @@
};
[
- Conditional=MEDIA_STREAM,
+ Conditional=MEDIA_RECORDER,
Exposed=Window,
EnabledBySetting=MediaRecorderEnabled
] interface MediaRecorderErrorEvent : Event {
Modified: trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderProvider.cpp (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderProvider.cpp 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderProvider.cpp 2022-02-16 17:19:14 UTC (rev 289894)
@@ -26,17 +26,24 @@
#include "config.h"
#include "MediaRecorderProvider.h"
-#if ENABLE(MEDIA_STREAM) && PLATFORM(COCOA)
+#if ENABLE(MEDIA_RECORDER)
#include "ContentType.h"
#include "HTMLParserIdioms.h"
+
+#if PLATFORM(COCOA) && USE(AVFOUNDATION)
#include "MediaRecorderPrivateAVFImpl.h"
+#endif
namespace WebCore {
std::unique_ptr<MediaRecorderPrivate> MediaRecorderProvider::createMediaRecorderPrivate(MediaStreamPrivate& stream, const MediaRecorderPrivateOptions& options)
{
+#if PLATFORM(COCOA) && USE(AVFOUNDATION)
return MediaRecorderPrivateAVFImpl::create(stream, options);
+#else
+ return nullptr;
+#endif
}
bool MediaRecorderProvider::isSupported(const String& value)
Modified: trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderProvider.h (289893 => 289894)
--- trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderProvider.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/Modules/mediarecorder/MediaRecorderProvider.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -39,7 +39,7 @@
MediaRecorderProvider() = default;
virtual ~MediaRecorderProvider() = default;
-#if ENABLE(MEDIA_STREAM) && PLATFORM(COCOA)
+#if ENABLE(MEDIA_RECORDER)
virtual std::unique_ptr<MediaRecorderPrivate> createMediaRecorderPrivate(MediaStreamPrivate&, const MediaRecorderPrivateOptions&);
virtual bool isSupported(const String&);
#endif
Modified: trunk/Source/WebCore/dom/EventNames.in (289893 => 289894)
--- trunk/Source/WebCore/dom/EventNames.in 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/dom/EventNames.in 2022-02-16 17:19:14 UTC (rev 289894)
@@ -53,9 +53,9 @@
ApplePayShippingMethodSelectedEvent conditional=APPLE_PAY
ApplePayValidateMerchantEvent conditional=APPLE_PAY
AudioProcessingEvent conditional=WEB_AUDIO
-BlobEvent conditional=MEDIA_STREAM
+BlobEvent conditional=MEDIA_RECORDER
OfflineAudioCompletionEvent conditional=WEB_AUDIO
-MediaRecorderErrorEvent conditional=MEDIA_STREAM
+MediaRecorderErrorEvent conditional=MEDIA_RECORDER
MediaStreamTrackEvent conditional=MEDIA_STREAM
MerchantValidationEvent conditional=PAYMENT_REQUEST
PaymentMethodChangeEvent conditional=PAYMENT_REQUEST
Modified: trunk/Source/WebCore/dom/EventTargetFactory.in (289893 => 289894)
--- trunk/Source/WebCore/dom/EventTargetFactory.in 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/dom/EventTargetFactory.in 2022-02-16 17:19:14 UTC (rev 289894)
@@ -24,7 +24,7 @@
MediaDevices conditional=MEDIA_STREAM
MediaKeySession conditional=ENCRYPTED_MEDIA
MediaQueryList
-MediaRecorder conditional=MEDIA_STREAM
+MediaRecorder conditional=MEDIA_RECORDER
MediaSessionCoordinator conditional=MEDIA_SESSION_COORDINATOR
MediaSource conditional=MEDIA_SOURCE
MediaStream conditional=MEDIA_STREAM
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (289893 => 289894)
--- trunk/Source/WebCore/loader/EmptyClients.cpp 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2022-02-16 17:19:14 UTC (rev 289894)
@@ -1172,7 +1172,7 @@
public:
EmptyMediaRecorderProvider() = default;
private:
-#if ENABLE(MEDIA_STREAM) && PLATFORM(COCOA)
+#if ENABLE(MEDIA_RECORDER)
std::unique_ptr<MediaRecorderPrivate> createMediaRecorderPrivate(MediaStreamPrivate&, const MediaRecorderPrivateOptions&) final { return nullptr; }
#endif
};
Modified: trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivate.cpp (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivate.cpp 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivate.cpp 2022-02-16 17:19:14 UTC (rev 289894)
@@ -26,7 +26,7 @@
#include "config.h"
#include "MediaRecorderPrivate.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "MediaStreamPrivate.h"
@@ -129,4 +129,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivate.h (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivate.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivate.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -30,7 +30,7 @@
#include <wtf/CompletionHandler.h>
#include <wtf/Forward.h>
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
namespace WTF {
class MediaTime;
@@ -137,4 +137,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateAVFImpl.cpp (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateAVFImpl.cpp 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateAVFImpl.cpp 2022-02-16 17:19:14 UTC (rev 289894)
@@ -26,7 +26,7 @@
#include "config.h"
#include "MediaRecorderPrivateAVFImpl.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "AudioStreamDescription.h"
#include "CAAudioStreamDescription.h"
@@ -169,4 +169,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateAVFImpl.h (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateAVFImpl.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateAVFImpl.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -24,7 +24,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "CAAudioStreamDescription.h"
#include "MediaRecorderPrivate.h"
@@ -68,4 +68,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateMock.cpp (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateMock.cpp 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateMock.cpp 2022-02-16 17:19:14 UTC (rev 289894)
@@ -26,7 +26,7 @@
#include "config.h"
#include "MediaRecorderPrivateMock.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "MediaStreamTrackPrivate.h"
#include "SharedBuffer.h"
@@ -115,4 +115,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateMock.h (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateMock.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateMock.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -24,7 +24,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "MediaRecorderPrivate.h"
#include <wtf/Lock.h>
@@ -61,4 +61,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateOptions.h (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateOptions.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateOptions.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -26,7 +26,7 @@
#include <wtf/Forward.h>
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
namespace WebCore {
@@ -76,4 +76,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.h (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -24,7 +24,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
+#if ENABLE(MEDIA_RECORDER) && USE(AVFOUNDATION)
#import <CoreMedia/CoreMedia.h>
#import <wtf/WorkQueue.h>
@@ -95,4 +95,4 @@
}
-#endif // ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
+#endif // ENABLE(MEDIA_RECORDER) && USE(AVFOUNDATION)
Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm 2022-02-16 17:19:14 UTC (rev 289894)
@@ -25,7 +25,7 @@
#include "config.h"
#include "AudioSampleBufferCompressor.h"
-#if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
+#if ENABLE(MEDIA_RECORDER) && USE(AVFOUNDATION)
#include "Logging.h"
#include <AudioToolbox/AudioCodec.h>
@@ -540,4 +540,4 @@
}
-#endif // ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
+#endif // ENABLE(MEDIA_RECORDER) && USE(AVFOUNDATION)
Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -24,7 +24,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "AudioStreamDescription.h"
@@ -147,4 +147,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm 2022-02-16 17:19:14 UTC (rev 289894)
@@ -26,7 +26,7 @@
#include "config.h"
#include "MediaRecorderPrivateWriterCocoa.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
#include "AudioSampleBufferCompressor.h"
#include "AudioStreamDescription.h"
@@ -575,4 +575,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/VideoSampleBufferCompressor.h (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/cocoa/VideoSampleBufferCompressor.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/VideoSampleBufferCompressor.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -24,7 +24,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
+#if ENABLE(MEDIA_RECORDER) && USE(AVFOUNDATION)
#include <CoreMedia/CoreMedia.h>
#include <VideoToolbox/VTErrors.h>
Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/VideoSampleBufferCompressor.mm (289893 => 289894)
--- trunk/Source/WebCore/platform/mediarecorder/cocoa/VideoSampleBufferCompressor.mm 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/VideoSampleBufferCompressor.mm 2022-02-16 17:19:14 UTC (rev 289894)
@@ -25,7 +25,7 @@
#import "config.h"
#import "VideoSampleBufferCompressor.h"
-#if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
+#if ENABLE(MEDIA_RECORDER) && USE(AVFOUNDATION)
#import "ContentType.h"
#import "Logging.h"
Modified: trunk/Source/WebCore/testing/Internals.cpp (289893 => 289894)
--- trunk/Source/WebCore/testing/Internals.cpp 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/testing/Internals.cpp 2022-02-16 17:19:14 UTC (rev 289894)
@@ -286,12 +286,15 @@
#endif
#if ENABLE(MEDIA_STREAM)
-#include "MediaRecorder.h"
-#include "MediaRecorderPrivateMock.h"
#include "MediaStream.h"
#include "MockRealtimeMediaSourceCenter.h"
#endif
+#if ENABLE(MEDIA_RECORDER)
+#include "MediaRecorder.h"
+#include "MediaRecorderPrivateMock.h"
+#endif
+
#if ENABLE(WEB_RTC)
#include "RTCPeerConnection.h"
#endif
@@ -606,6 +609,9 @@
#if ENABLE(MEDIA_STREAM)
page.settings().setInterruptAudioOnPageVisibilityChangeEnabled(false);
+#endif
+
+#if ENABLE(MEDIA_RECORDER)
WebCore::MediaRecorder::setCustomPrivateRecorderCreator(nullptr);
#endif
@@ -1698,7 +1704,9 @@
if (auto* page = document->page())
page->settings().setInterruptAudioOnPageVisibilityChangeEnabled(shouldInterrupt);
}
+#endif // ENABLE(MEDIA_STREAM)
+#if ENABLE(MEDIA_RECORDER)
static ExceptionOr<std::unique_ptr<MediaRecorderPrivate>> createRecorderMockSource(MediaStreamPrivate& stream, const MediaRecorderPrivateOptions&)
{
return std::unique_ptr<MediaRecorderPrivate>(new MediaRecorderPrivateMock(stream));
@@ -1708,7 +1716,7 @@
{
WebCore::MediaRecorder::setCustomPrivateRecorderCreator(createRecorderMockSource);
}
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(MEDIA_RECORDER)
ExceptionOr<Ref<DOMRect>> Internals::absoluteLineRectFromPoint(int x, int y)
{
Modified: trunk/Source/WebCore/testing/Internals.h (289893 => 289894)
--- trunk/Source/WebCore/testing/Internals.h 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/testing/Internals.h 2022-02-16 17:19:14 UTC (rev 289894)
@@ -636,6 +636,8 @@
#if ENABLE(MEDIA_STREAM)
void setShouldInterruptAudioOnPageVisibilityChange(bool);
+#endif
+#if ENABLE(MEDIA_RECORDER)
void setCustomPrivateRecorderCreator();
#endif
Modified: trunk/Source/WebCore/testing/Internals.idl (289893 => 289894)
--- trunk/Source/WebCore/testing/Internals.idl 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/WebCore/testing/Internals.idl 2022-02-16 17:19:14 UTC (rev 289894)
@@ -801,7 +801,7 @@
[Conditional=WIRELESS_PLAYBACK_TARGET] undefined setMockMediaPlaybackTargetPickerEnabled(boolean enabled);
[Conditional=WIRELESS_PLAYBACK_TARGET] undefined setMockMediaPlaybackTargetPickerState(DOMString deviceName, DOMString deviceState);
[Conditional=WIRELESS_PLAYBACK_TARGET] undefined mockMediaPlaybackTargetPickerDismissPopup();
- [Conditional=MEDIA_STREAM] undefined setCustomPrivateRecorderCreator();
+ [Conditional=MEDIA_RECORDER] undefined setCustomPrivateRecorderCreator();
[Conditional=WEB_AUDIO] undefined useMockAudioDestinationCocoa();
Modified: trunk/Source/cmake/WebKitFeatures.cmake (289893 => 289894)
--- trunk/Source/cmake/WebKitFeatures.cmake 2022-02-16 17:16:03 UTC (rev 289893)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2022-02-16 17:19:14 UTC (rev 289894)
@@ -167,6 +167,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_MATHML "Toggle MathML support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CAPTURE "Toggle Media Capture support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CONTROLS_SCRIPT "Toggle definition of media controls in _javascript_" PRIVATE ON)
+ WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_RECORDER "Toggle Media Recorder support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SESSION "Toggle Media Session support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SESSION_COORDINATOR "Toggle Media Session Coordinator support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SESSION_PLAYLIST "Toggle Media Session Playlist support" PRIVATE OFF)
@@ -250,6 +251,7 @@
WEBKIT_OPTION_DEPEND(ENABLE_WEBASSEMBLY_B3JIT ENABLE_FTL_JIT)
WEBKIT_OPTION_DEPEND(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS ENABLE_REMOTE_INSPECTOR)
WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_CONTROLS_SCRIPT ENABLE_VIDEO)
+ WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_RECORDER ENABLE_MEDIA_STREAM)
WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_SESSION ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_SOURCE ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_STREAM ENABLE_VIDEO)
