Skip to content
Permalink
Browse files
Unreviewed, reverting r262619, r262625, and r262641.
Caused mediarecorder layout test crashes.

Reverted changesets:

"[Cocoa] Use AVAssetWriterDelegate to implement MediaRecorder"
https://bugs.webkit.org/show_bug.cgi?id=206582
https://trac.webkit.org/changeset/262619

"[Cocoa] Use AVAssetWriterDelegate to implement MediaRecorder"
https://bugs.webkit.org/show_bug.cgi?id=206582
https://trac.webkit.org/changeset/262625

"Unreviewed, silence deprecation warning to fix build with
latest SDK."
https://trac.webkit.org/changeset/262641

Canonical link: https://commits.webkit.org/225662@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@262663 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
ryanhaddad committed Jun 5, 2020
1 parent 1acae83 commit 82ddc11da51c4b21fd72f973f67890d80a9b9d2f
Showing with 399 additions and 1,515 deletions.
  1. +20 −0 LayoutTests/ChangeLog
  2. +1 −4 LayoutTests/TestExpectations
  3. +10 −0 LayoutTests/http/wpt/mediarecorder/MediaRecorder-AV-audio-video-dataavailable-gpuprocess.html
  4. +0 −4 LayoutTests/platform/mac/TestExpectations
  5. +20 −0 Source/WTF/ChangeLog
  6. +0 −4 Source/WTF/wtf/PlatformHave.h
  7. +20 −0 Source/WebCore/ChangeLog
  8. +0 −5 Source/WebCore/Modules/mediarecorder/MediaRecorderProvider.cpp
  9. +20 −0 Source/WebCore/PAL/ChangeLog
  10. +0 −14 Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
  11. +0 −41 Source/WebCore/PAL/pal/cf/AudioToolboxSoftLink.cpp
  12. +0 −43 Source/WebCore/PAL/pal/cf/AudioToolboxSoftLink.h
  13. +0 −8 Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp
  14. +0 −17 Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h
  15. +0 −46 Source/WebCore/PAL/pal/cf/VideoToolboxSoftLink.cpp
  16. +0 −52 Source/WebCore/PAL/pal/cf/VideoToolboxSoftLink.h
  17. +0 −2 Source/WebCore/SourcesCocoa.txt
  18. +0 −12 Source/WebCore/WebCore.xcodeproj/project.pbxproj
  19. +2 −3 Source/WebCore/platform/mediarecorder/MediaRecorderPrivateAVFImpl.cpp
  20. +2 −2 Source/WebCore/platform/mediarecorder/MediaRecorderPrivateAVFImpl.h
  21. +0 −91 Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.h
  22. +0 −502 Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm
  23. +23 −53 Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h
  24. +245 −349 Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm
  25. +0 −71 Source/WebCore/platform/mediarecorder/cocoa/VideoSampleBufferCompressor.h
  26. +0 −167 Source/WebCore/platform/mediarecorder/cocoa/VideoSampleBufferCompressor.mm
  27. +20 −0 Source/WebKit/ChangeLog
  28. +3 −7 Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp
  29. +0 −4 Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h
  30. +2 −2 Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.cpp
  31. +2 −2 Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.h
  32. +1 −1 Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.messages.in
  33. +1 −1 Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorderManager.cpp
  34. +1 −1 Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorderManager.h
  35. +1 −1 Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorderManager.messages.in
  36. +0 −1 Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.h
  37. +2 −2 Source/WebKit/WebProcess/GPU/webrtc/MediaRecorderPrivate.cpp
  38. +2 −2 Source/WebKit/WebProcess/GPU/webrtc/MediaRecorderPrivate.h
  39. +1 −1 Source/WebKit/WebProcess/GPU/webrtc/MediaRecorderProvider.cpp
@@ -1,3 +1,23 @@
2020-06-05 Ryan Haddad <ryanhaddad@apple.com>

Unreviewed, reverting r262619, r262625, and r262641.

Caused mediarecorder layout test crashes.

Reverted changesets:

"[Cocoa] Use AVAssetWriterDelegate to implement MediaRecorder"
https://bugs.webkit.org/show_bug.cgi?id=206582
https://trac.webkit.org/changeset/262619

"[Cocoa] Use AVAssetWriterDelegate to implement MediaRecorder"
https://bugs.webkit.org/show_bug.cgi?id=206582
https://trac.webkit.org/changeset/262625

"Unreviewed, silence deprecation warning to fix build with
latest SDK."
https://trac.webkit.org/changeset/262641

2020-06-05 Jason Lawrence <lawrence.j@apple.com>

[ Mojave wk2 Release ] js/dom/unhandled-promise-rejection-console-no-report.html is flaky failing.
@@ -3298,10 +3298,7 @@ webgl/1.0.3/conformance/textures/texture-npot-video.html [ Skip ]
webgl/1.0.3/conformance/canvas/rapid-resizing.html [ Skip ]
webgl/1.0.3/conformance/extensions/webgl-draw-buffers.html [ Skip ]

# Not supported by default
http/wpt/mediarecorder [ Skip ]
imported/w3c/web-platform-tests/mediacapture-record [ Skip ]
fast/history/page-cache-media-recorder.html [ Skip ]
webkit.org/b/197673 http/wpt/mediarecorder/MediaRecorder-AV-audio-video-dataavailable.html [ Pass Failure Timeout ]

# WebGL 2 Conformance Suite rules for regular bots post ANGLE backend adoption.
# DEQP is skipped on the main fleet of bots because of the long run time.
@@ -56,7 +56,17 @@
}

async_test(t => {
const ac = new AudioContext();
const osc = ac.createOscillator();
const dest = ac.createMediaStreamDestination();
const audio = dest.stream;
osc.connect(dest);

const video = createVideoStream();
assert_equals(video.getAudioTracks().length, 0, "video mediastream starts with no audio track");
assert_equals(audio.getAudioTracks().length, 1, "audio mediastream starts with one audio track");
video.addTrack(audio.getAudioTracks()[0]);
assert_equals(video.getAudioTracks().length, 1, "video mediastream starts with one audio track");
const recorder = new MediaRecorder(video);
let mode = 0;

@@ -1708,10 +1708,6 @@ webkit.org/b/212172 [ Catalina ] fast/text/font-collection.html [ ImageOnlyFailu
[ Catalina+ ] fast/text/design-system-ui-15.html [ Pass ]
[ Catalina+ ] fast/text/design-system-ui-16.html [ Pass ]

[ Catalina+ ] http/wpt/mediarecorder [ Pass Failure ]
[ Catalina+ ] imported/w3c/web-platform-tests/mediacapture-record [ Pass Failure ]
[ Catalina+ ] fast/history/page-cache-media-recorder.html [ Pass Failure ]

webkit.org/b/200128 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-video-element/video_timeupdate_on_seek.html [ Timeout Pass ]

# rdar://55405851 ([ macOS ] Layout tests webgpu/*-triangle-strip.html are flaky failures. (201827))
@@ -1,3 +1,23 @@
2020-06-05 Ryan Haddad <ryanhaddad@apple.com>

Unreviewed, reverting r262619, r262625, and r262641.

Caused mediarecorder layout test crashes.

Reverted changesets:

"[Cocoa] Use AVAssetWriterDelegate to implement MediaRecorder"
https://bugs.webkit.org/show_bug.cgi?id=206582
https://trac.webkit.org/changeset/262619

"[Cocoa] Use AVAssetWriterDelegate to implement MediaRecorder"
https://bugs.webkit.org/show_bug.cgi?id=206582
https://trac.webkit.org/changeset/262625

"Unreviewed, silence deprecation warning to fix build with
latest SDK."
https://trac.webkit.org/changeset/262641

2020-06-05 Per Arne Vollan <pvollan@apple.com>

[Cocoa] Adopt read-only mode for preferences in the WebContent process
@@ -542,10 +542,6 @@
#define HAVE_OS_SIGNPOST 1
#endif

#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(IOS)) && (defined __has_include && __has_include(<AVFoundation/AVAssetWriter_Private.h>))
#define HAVE_AVASSETWRITERDELEGATE 1
#endif

#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
#define HAVE_SYSTEM_FONT_STYLE_TITLE_0 1
#define HAVE_SYSTEM_FONT_STYLE_TITLE_4 1
@@ -1,3 +1,23 @@
2020-06-05 Ryan Haddad <ryanhaddad@apple.com>

Unreviewed, reverting r262619, r262625, and r262641.

Caused mediarecorder layout test crashes.

Reverted changesets:

"[Cocoa] Use AVAssetWriterDelegate to implement MediaRecorder"
https://bugs.webkit.org/show_bug.cgi?id=206582
https://trac.webkit.org/changeset/262619

"[Cocoa] Use AVAssetWriterDelegate to implement MediaRecorder"
https://bugs.webkit.org/show_bug.cgi?id=206582
https://trac.webkit.org/changeset/262625

"Unreviewed, silence deprecation warning to fix build with
latest SDK."
https://trac.webkit.org/changeset/262641

2020-06-05 Kate Cheney <katherine_cheney@apple.com>

ITP SQLite Database should only vacuum once per day
@@ -34,12 +34,7 @@ namespace WebCore {

std::unique_ptr<MediaRecorderPrivate> MediaRecorderProvider::createMediaRecorderPrivate(MediaStreamPrivate& stream)
{
#if HAVE(AVASSETWRITERDELEGATE)
return MediaRecorderPrivateAVFImpl::create(stream);
#else
UNUSED_PARAM(stream);
return nullptr;
#endif
}

}
@@ -1,3 +1,23 @@
2020-06-05 Ryan Haddad <ryanhaddad@apple.com>

Unreviewed, reverting r262619, r262625, and r262641.

Caused mediarecorder layout test crashes.

Reverted changesets:

"[Cocoa] Use AVAssetWriterDelegate to implement MediaRecorder"
https://bugs.webkit.org/show_bug.cgi?id=206582
https://trac.webkit.org/changeset/262619

"[Cocoa] Use AVAssetWriterDelegate to implement MediaRecorder"
https://bugs.webkit.org/show_bug.cgi?id=206582
https://trac.webkit.org/changeset/262625

"Unreviewed, silence deprecation warning to fix build with
latest SDK."
https://trac.webkit.org/changeset/262641

2020-06-05 Per Arne Vollan <pvollan@apple.com>

[Cocoa] Adopt read-only mode for preferences in the WebContent process
@@ -119,9 +119,6 @@
2E1342CC215AA10A007199D2 /* UIKitSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E1342CA215AA10A007199D2 /* UIKitSoftLink.h */; };
2E1342CD215AA10A007199D2 /* UIKitSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E1342CB215AA10A007199D2 /* UIKitSoftLink.mm */; };
31308B1420A21705003FB929 /* SystemPreviewSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 31308B1320A21705003FB929 /* SystemPreviewSPI.h */; };
416E995323DAE6BE00E871CB /* AudioToolboxSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416E995123DAE6BD00E871CB /* AudioToolboxSoftLink.cpp */; };
416E995423DAE6BE00E871CB /* AudioToolboxSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 416E995223DAE6BE00E871CB /* AudioToolboxSoftLink.h */; };
41E1F344248A6A000022D5DE /* VideoToolboxSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416E995523DAEFF700E871CB /* VideoToolboxSoftLink.cpp */; };
442956CD218A72DF0080DB54 /* RevealSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 442956CC218A72DE0080DB54 /* RevealSPI.h */; };
4450FC9F21F5F602004DFA56 /* QuickLookSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4450FC9D21F5F602004DFA56 /* QuickLookSoftLink.mm */; };
4450FCA021F5F602004DFA56 /* QuickLookSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4450FC9E21F5F602004DFA56 /* QuickLookSoftLink.h */; };
@@ -303,10 +300,6 @@
2E1342CB215AA10A007199D2 /* UIKitSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIKitSoftLink.mm; sourceTree = "<group>"; };
31308B1320A21705003FB929 /* SystemPreviewSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SystemPreviewSPI.h; sourceTree = "<group>"; };
37119A7820CCB5FF002C6DC9 /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; };
416E995123DAE6BD00E871CB /* AudioToolboxSoftLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioToolboxSoftLink.cpp; sourceTree = "<group>"; };
416E995223DAE6BE00E871CB /* AudioToolboxSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioToolboxSoftLink.h; sourceTree = "<group>"; };
416E995523DAEFF700E871CB /* VideoToolboxSoftLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoToolboxSoftLink.cpp; sourceTree = "<group>"; };
416E995623DAEFF700E871CB /* VideoToolboxSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoToolboxSoftLink.h; sourceTree = "<group>"; };
442956CC218A72DE0080DB54 /* RevealSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RevealSPI.h; sourceTree = "<group>"; };
4450FC9D21F5F602004DFA56 /* QuickLookSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookSoftLink.mm; sourceTree = "<group>"; };
4450FC9E21F5F602004DFA56 /* QuickLookSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSoftLink.h; sourceTree = "<group>"; };
@@ -548,12 +541,8 @@
0CF99CA51F73841C007EE793 /* cf */ = {
isa = PBXGroup;
children = (
416E995123DAE6BD00E871CB /* AudioToolboxSoftLink.cpp */,
416E995223DAE6BE00E871CB /* AudioToolboxSoftLink.h */,
0CF99CA61F738436007EE793 /* CoreMediaSoftLink.cpp */,
0CF99CA71F738437007EE793 /* CoreMediaSoftLink.h */,
416E995523DAEFF700E871CB /* VideoToolboxSoftLink.cpp */,
416E995623DAEFF700E871CB /* VideoToolboxSoftLink.h */,
);
path = cf;
sourceTree = "<group>";
@@ -746,7 +735,6 @@
293EE4A924154F8F0047493D /* AccessibilitySupportSoftLink.h in Headers */,
57FD318B22B35989008D0E8B /* AppSSOSoftLink.h in Headers */,
576CA9D622B854AB0030143C /* AppSSOSPI.h in Headers */,
416E995423DAE6BE00E871CB /* AudioToolboxSoftLink.h in Headers */,
2D02E93C2056FAA700A13797 /* AudioToolboxSPI.h in Headers */,
572A107822B456F500F410C8 /* AuthKitSPI.h in Headers */,
077E87B2226A460300A2AFF0 /* AVFoundationSoftLink.h in Headers */,
@@ -965,7 +953,6 @@
files = (
293EE4A824154F8F0047493D /* AccessibilitySupportSoftLink.cpp in Sources */,
57FD318A22B3593E008D0E8B /* AppSSOSoftLink.mm in Sources */,
416E995323DAE6BE00E871CB /* AudioToolboxSoftLink.cpp in Sources */,
077E87B1226A460200A2AFF0 /* AVFoundationSoftLink.mm in Sources */,
0C5FFF0F1F78D9DA009EFF1A /* ClockCM.mm in Sources */,
0CF99CA81F738437007EE793 /* CoreMediaSoftLink.cpp in Sources */,
@@ -980,7 +967,6 @@
44E1A8B021FA54EB00C3048E /* LookupSoftLink.mm in Sources */,
5C7C787423AC3E770065F47E /* ManagedConfigurationSoftLink.mm in Sources */,
0CF99CA41F736375007EE793 /* MediaTimeAVFoundation.cpp in Sources */,
41E1F344248A6A000022D5DE /* VideoToolboxSoftLink.cpp in Sources */,
CDACB3602387425B0018D7CE /* MediaToolboxSoftLink.cpp in Sources */,
A1F63CA021A4DBF7006FB43B /* PassKitSoftLink.mm in Sources */,
A1175B4F1F6B337300C4B9F0 /* PopupMenu.mm in Sources */,

This file was deleted.

This file was deleted.

0 comments on commit 82ddc11

Please sign in to comment.