[WebAudio] Add webm/vorbis container support

jyavenard · jyavenard · commit 92f059279658 · 2021-08-03T00:49:37.000Z
https://bugs.webkit.org/show_bug.cgi?id=228139 rdar://80883073 Reviewed by Jer Noble. Source/WebKit: Access to the com.apple.audio.AudioComponentRegistrar is denied by the sandbox which prevents registering the Vorbis Audio Component. So we instantiate the decoder right before setting up the sandbox. This is a workaround for rdar://81137953. Test: webaudio/decode-audio-data-webm-vorbis.html * WebProcess/cocoa/WebProcessCocoa.mm: (WebKit::WebProcess::initializeSandbox): LayoutTests: * platform/mac/TestExpectations: * webaudio/decode-audio-data-webm-vorbis-expected.txt: Added. * webaudio/decode-audio-data-webm-vorbis.html: Added. Canonical link: https://commits.webkit.org/240195@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2021-08-02  Jean-Yves Avenard  <jya@apple.com>
+
+        [WebAudio] Add webm/vorbis container support
+        https://bugs.webkit.org/show_bug.cgi?id=228139
+        rdar://80883073
+
+        Reviewed by Jer Noble.
+
+        * platform/mac/TestExpectations:
+        * webaudio/decode-audio-data-webm-vorbis-expected.txt: Added.
+        * webaudio/decode-audio-data-webm-vorbis.html: Added.
+
 2021-08-02  Eric Hutchison  <ehutchison@apple.com>
 
         [ iOS iPad ] editing/inserting/insert-paragraph-separator-with-html-elements-crash.html is a flaky failure.
diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
@@ -1716,6 +1716,7 @@ webkit.org/b/214155 imported/w3c/web-platform-tests/html/cross-origin-embedder-p
 [ Catalina Mojave BigSur ] media/media-source/media-webm-opus-partial.html [ Skip ]
 [ Catalina Mojave BigSur ] media/media-source/media-webm-opus-partial-abort.html [ Skip ]
 [ Catalina Mojave BigSur ] webaudio/decode-audio-data-webm-opus.html [ Skip ]
+[ Catalina Mojave BigSur ] webaudio/decode-audio-data-webm-vorbis.html [ Skip ]
 
 webkit.org/b/214422 imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/suspend-after-construct.html [ Pass Failure ]
 
diff --git a/LayoutTests/webaudio/decode-audio-data-webm-vorbis-expected.txt b/LayoutTests/webaudio/decode-audio-data-webm-vorbis-expected.txt
@@ -0,0 +1,10 @@
+Test that decoding an vorbis webm file succeeds
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Successfully decoded content
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/webaudio/decode-audio-data-webm-vorbis.html b/LayoutTests/webaudio/decode-audio-data-webm-vorbis.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src="../resources/js-test.js"></script>
+<script type="text/javascript" src="resources/audio-testing.js"></script>
+</head>
+<body>
+<script>
+description("Test that decoding an vorbis webm file succeeds");
+
+window.jsTestIsAsync = true;
+
+var context = new window.AudioContext();
+var request = new XMLHttpRequest();
+request.open("GET", 'resources/media/vorbis.webm', true);
+request.responseType = "arraybuffer";
+
+request.onload = function() {
+    context.decodeAudioData(request.response, (buffer) => {
+        testPassed("Successfully decoded content");
+        finishJSTest();
+      }, () => {
+        testFailed("Failed to decode file");
+        finishJSTest();
+      });
+}
+request.send();
+
+</script>
+</body>
+</html>
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2021-08-02  Jean-Yves Avenard  <jya@apple.com>
+
+        [WebAudio] Add webm/vorbis container support
+        https://bugs.webkit.org/show_bug.cgi?id=228139
+        rdar://80883073
+
+        Reviewed by Jer Noble.
+
+        Access to the com.apple.audio.AudioComponentRegistrar is denied by the sandbox which
+        prevents registering the Vorbis Audio Component. So we instantiate the decoder right before
+        setting up the sandbox.
+        This is a workaround for rdar://81137953.
+        Test: webaudio/decode-audio-data-webm-vorbis.html
+
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::initializeSandbox):
+
 2021-08-02  Jean-Yves Avenard  <jya@apple.com>
 
         Crash in -[WKFullScreenWindowController windowDidExitFullScreen:]
diff --git a/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm b/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
@@ -81,6 +81,7 @@
 #import <WebCore/SystemSoundManager.h>
 #import <WebCore/UTIUtilities.h>
 #import <WebCore/VersionChecks.h>
+#import <WebCore/WebMAudioUtilitiesCocoa.h>
 #import <algorithm>
 #import <dispatch/dispatch.h>
 #import <mach/mach.h>
@@ -744,6 +745,9 @@ static inline void restrictImageAndVideoDecoders()
     // Need to override the default, because service has a different bundle ID.
     auto webKitBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
 
+    // We need to initialize the Vorbis decoder before the sandbox gets setup; this is a one off action.
+    WebCore::registerVorbisDecoderIfNeeded();
+
     sandboxParameters.setOverrideSandboxProfilePath(makeString(String([webKitBundle resourcePath]), "/com.apple.WebProcess.sb"));
 
     bool enableMessageFilter = false;
