WebKit Bugzilla
Attachment 346864 Details for
Bug 188452
: Video playback is using more power
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-188452-20180809144951.patch (text/plain), 21.43 KB, created by
Jer Noble
on 2018-08-09 14:49:52 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Jer Noble
Created:
2018-08-09 14:49:52 PDT
Size:
21.43 KB
patch
obsolete
>Subversion Revision: 234695 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 61c2db15b8b8ca5d9c8b2d3f66b75b3b98f1b39c..4d4b1296d5c1da45c25dfc0dfede7510f07e76cd 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,32 @@ >+2018-08-09 Jer Noble <jer.noble@apple.com> >+ >+ Video playback is using more power >+ https://bugs.webkit.org/show_bug.cgi?id=188452 >+ <rdar://problem/42298937> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Test: TestWebKitAPI/Tests/WebKitCocoa/PreferredAudioBufferSize.mm >+ >+ When the meaning of PlatformMediaSession::Video changed to "video-only", we failed to update >+ MediaSessionManagerCocoa::updateSessionState() to use the new PlatformMediaSession::VideoAudio >+ enum, so Video-only sessions were getting the higher audio buffer size (where it's not needed) >+ and Video-and-Audio sessions were getting the default value. >+ >+ To enable testing, add a preferredAudioBufferSize property to Internals. Also, the getter for >+ AudioSession::preferredBufferSize was using the wrong CoreAudio property address, and was >+ always returning 0. >+ >+ * platform/audio/AudioSession.h: >+ * platform/audio/cocoa/MediaSessionManagerCocoa.cpp: >+ (MediaSessionManagerCocoa::updateSessionState): >+ * platform/audio/mac/AudioSessionMac.cpp: >+ (WebCore::AudioSession::preferredBufferSize const): >+ * testing/Internals.cpp: >+ (WebCore::Internals::preferredAudioBufferSize const): >+ * testing/Internals.h: >+ * testing/Internals.idl: >+ > 2018-08-08 Sihui Liu <sihui_liu@apple.com> > > Assertion failed in Webcore::Process::setIdentifier() >diff --git a/Source/WebCore/platform/audio/AudioSession.h b/Source/WebCore/platform/audio/AudioSession.h >index 2df2050976ee3f656542654a2f63d2d8bf902a93..f2f4f953f2d09111b833b357365d935505f26c17 100644 >--- a/Source/WebCore/platform/audio/AudioSession.h >+++ b/Source/WebCore/platform/audio/AudioSession.h >@@ -73,7 +73,7 @@ public: > > bool tryToSetActive(bool); > >- size_t preferredBufferSize() const; >+ WEBCORE_EXPORT size_t preferredBufferSize() const; > void setPreferredBufferSize(size_t); > > class MutedStateObserver { >diff --git a/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.cpp b/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.cpp >index 5da5127cb6391e3fa0fb6cae035db7162281bdda..03a96bdeaa09549261a41f6fe0359c8cc0f3ec78 100644 >--- a/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.cpp >+++ b/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.cpp >@@ -48,7 +48,7 @@ void MediaSessionManagerCocoa::updateSessionState() > // while having a large enough buffer so that the audio rendering remains stable, hence a computation based on sample rate. > else if (has(PlatformMediaSession::MediaStreamCapturingAudio)) > AudioSession::sharedSession().setPreferredBufferSize(AudioSession::sharedSession().sampleRate() / 50); >- else if ((has(PlatformMediaSession::Video) || has(PlatformMediaSession::Audio)) && DeprecatedGlobalSettings::lowPowerVideoAudioBufferSizeEnabled()) { >+ else if ((has(PlatformMediaSession::VideoAudio) || has(PlatformMediaSession::Audio)) && DeprecatedGlobalSettings::lowPowerVideoAudioBufferSizeEnabled()) { > // FIXME: <http://webkit.org/b/116725> Figure out why enabling the code below > // causes media LayoutTests to fail on 10.8. > >diff --git a/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp b/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp >index 6b595ef0912b8afad63c269dca1cae7a5233d4a9..79ab9f41be5ce6de84c88e3a691810d0f49a4391 100644 >--- a/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp >+++ b/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp >@@ -147,7 +147,7 @@ size_t AudioSession::preferredBufferSize() const > UInt32 bufferSizeSize = sizeof(bufferSize); > > AudioObjectPropertyAddress preferredBufferSizeAddress = { >- kAudioDevicePropertyBufferFrameSizeRange, >+ kAudioDevicePropertyBufferFrameSize, > kAudioObjectPropertyScopeGlobal, > kAudioObjectPropertyElementMaster }; > OSStatus result = AudioObjectGetPropertyData(defaultDevice(), &preferredBufferSizeAddress, 0, 0, &bufferSizeSize, &bufferSize); >diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp >index 0b348e80199a68ab89d307c0fe9e462dfd9433b9..13b7b707e2738e33f810ce49ccd5a1af0bd72745 100644 >--- a/Source/WebCore/testing/Internals.cpp >+++ b/Source/WebCore/testing/Internals.cpp >@@ -4462,6 +4462,14 @@ String Internals::audioSessionCategory() const > return emptyString(); > } > >+double Internals::preferredAudioBufferSize() const >+{ >+#if USE(AUDIO_SESSION) >+ return AudioSession::sharedSession().preferredBufferSize(); >+#endif >+ return 0; >+} >+ > void Internals::clearCacheStorageMemoryRepresentation(DOMPromiseDeferred<void>&& promise) > { > auto* document = contextDocument(); >diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h >index 3884efde17cdbd26af07f96f58a134145db5d004..7e32be804939496b34905ea5da4ef2eab76d7a9b 100644 >--- a/Source/WebCore/testing/Internals.h >+++ b/Source/WebCore/testing/Internals.h >@@ -662,6 +662,7 @@ public: > #endif > > String audioSessionCategory() const; >+ double preferredAudioBufferSize() const; > > void clearCacheStorageMemoryRepresentation(DOMPromiseDeferred<void>&&); > void cacheStorageEngineRepresentation(DOMPromiseDeferred<IDLDOMString>&&); >diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl >index 750c6f9519dafbf9177bd567f2133bef6ee28842..01148b98d9b0f8bfb454a7d7411a6f6f64c8820f 100644 >--- a/Source/WebCore/testing/Internals.idl >+++ b/Source/WebCore/testing/Internals.idl >@@ -630,6 +630,7 @@ enum CompositingPolicy { > void setConsoleMessageListener(StringCallback callback); > > DOMString audioSessionCategory(); >+ double preferredAudioBufferSize(); > > [Conditional=SERVICE_WORKER] Promise<boolean> hasServiceWorkerRegistration(DOMString scopeURL); > [Conditional=SERVICE_WORKER] void terminateServiceWorker(ServiceWorker worker); >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 5beae2a31bd37f2cfddf518eb8684bae1b306128..82e02d9749ef65e3dd1232d3a2c665bbcb33d8ed 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,16 @@ >+2018-08-09 Jer Noble <jer.noble@apple.com> >+ >+ Video playback is using more power >+ https://bugs.webkit.org/show_bug.cgi?id=188452 >+ <rdar://problem/42298937> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * TestWebKitAPI/Tests/WebKitCocoa/PreferredAudioBufferSize.mm: >+ (PreferredAudioBufferSize::createView): >+ (PreferredAudioBufferSize::preferredAudioBufferSize const): >+ (TEST_F): >+ > 2018-08-08 Wenson Hsieh <wenson_hsieh@apple.com> > > [iOS] fast/events/ios/contenteditable-autocapitalize.html is a flaky failure >diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj >index 3e036c33fd46179f40039012bd08d45fcf609b13..0fbd35f4523f48255fc20fa3cb53fe4bec12b0c8 100644 >--- a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj >+++ b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj >@@ -720,7 +720,11 @@ > CA38459620AE17A900990D3B /* LocalStorageDatabaseTracker.mm in Sources */ = {isa = PBXBuildFile; fileRef = CA38459520AE012E00990D3B /* LocalStorageDatabaseTracker.mm */; }; > CD0BD0A61F79924D001AB2CF /* ContextMenuImgWithVideo.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD0BD0A51F799220001AB2CF /* ContextMenuImgWithVideo.mm */; }; > CD0BD0A81F79982D001AB2CF /* ContextMenuImgWithVideo.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD0BD0A71F7997C2001AB2CF /* ContextMenuImgWithVideo.html */; }; >+ CD227E44211A4D5D00D285AF /* PreferredAudioBufferSize.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD227E43211A4D5D00D285AF /* PreferredAudioBufferSize.mm */; }; > CD321B041E3A85FA00EB21C8 /* video-with-muted-audio-and-webaudio.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD321B031E3A84B700EB21C8 /* video-with-muted-audio-and-webaudio.html */; }; >+ CD577799211CE0E4001B371E /* web-audio-only.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD577798211CDE8F001B371E /* web-audio-only.html */; }; >+ CD57779C211CE91F001B371E /* audio-with-web-audio.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD57779A211CE6B7001B371E /* audio-with-web-audio.html */; }; >+ CD57779D211CE91F001B371E /* video-with-audio-and-web-audio.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD57779B211CE6CE001B371E /* video-with-audio-and-web-audio.html */; }; > CD59F53419E9110D00CF1835 /* file-with-mse.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD59F53219E910AA00CF1835 /* file-with-mse.html */; }; > CD59F53519E9110D00CF1835 /* test-mse.mp4 in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD59F53319E910BC00CF1835 /* test-mse.mp4 */; }; > CD758A6F20572EA00071834A /* video-with-paused-audio-and-playing-muted.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD758A6E20572D540071834A /* video-with-paused-audio-and-playing-muted.html */; }; >@@ -916,6 +920,9 @@ > dstPath = TestWebKitAPI.resources; > dstSubfolderSpec = 7; > files = ( >+ CD57779C211CE91F001B371E /* audio-with-web-audio.html in Copy Resources */, >+ CD57779D211CE91F001B371E /* video-with-audio-and-web-audio.html in Copy Resources */, >+ CD577799211CE0E4001B371E /* web-audio-only.html in Copy Resources */, > 1A9E52C913E65EF4006917F5 /* 18-characters.html in Copy Resources */, > 379028B914FAC24C007E6B43 /* acceptsFirstMouse.html in Copy Resources */, > 1C2B81871C8925A000A5529F /* Ahem.ttf in Copy Resources */, >@@ -1916,11 +1923,15 @@ > CD0BD0A51F799220001AB2CF /* ContextMenuImgWithVideo.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextMenuImgWithVideo.mm; sourceTree = "<group>"; }; > CD0BD0A71F7997C2001AB2CF /* ContextMenuImgWithVideo.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = ContextMenuImgWithVideo.html; sourceTree = "<group>"; }; > CD225C071C45A69200140761 /* ParsedContentRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentRange.cpp; sourceTree = "<group>"; }; >+ CD227E43211A4D5D00D285AF /* PreferredAudioBufferSize.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PreferredAudioBufferSize.mm; sourceTree = "<group>"; }; > CD321B031E3A84B700EB21C8 /* video-with-muted-audio-and-webaudio.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "video-with-muted-audio-and-webaudio.html"; sourceTree = "<group>"; }; > CD5393C71757BA9700C07123 /* MD5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MD5.cpp; sourceTree = "<group>"; }; > CD5393C91757BAC400C07123 /* SHA1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SHA1.cpp; sourceTree = "<group>"; }; > CD5451E919E41F9D0016936F /* CSSParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSParser.cpp; sourceTree = "<group>"; }; > CD5497B315857F0C00B5BC30 /* MediaTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTime.cpp; sourceTree = "<group>"; }; >+ CD577798211CDE8F001B371E /* web-audio-only.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "web-audio-only.html"; sourceTree = "<group>"; }; >+ CD57779A211CE6B7001B371E /* audio-with-web-audio.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "audio-with-web-audio.html"; sourceTree = "<group>"; }; >+ CD57779B211CE6CE001B371E /* video-with-audio-and-web-audio.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "video-with-audio-and-web-audio.html"; sourceTree = "<group>"; }; > CD59F53219E910AA00CF1835 /* file-with-mse.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "file-with-mse.html"; sourceTree = "<group>"; }; > CD59F53319E910BC00CF1835 /* test-mse.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "test-mse.mp4"; sourceTree = "<group>"; }; > CD758A6E20572D540071834A /* video-with-paused-audio-and-playing-muted.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "video-with-paused-audio-and-playing-muted.html"; sourceTree = "<group>"; }; >@@ -2334,6 +2345,7 @@ > 3FCC4FE41EC4E8520076E37C /* PictureInPictureDelegate.mm */, > 83BAEE8C1EF4625500DDE894 /* PluginLoadClientPolicies.mm */, > C95501BE19AD2FAF0049BE3E /* Preferences.mm */, >+ CD227E43211A4D5D00D285AF /* PreferredAudioBufferSize.mm */, > 7C1AF7931E8DCBAB002645B9 /* PrepareForMoveToWindow.mm */, > 518C1152205B04F9001FF4AE /* ProcessSwapOnNavigation.mm */, > 5798E2AF1CAF5C2800C5CBA0 /* ProvisionalURLNotChange.mm */, >@@ -2714,6 +2726,9 @@ > 51714EB31CF8C761004723C4 /* WebProcessKillIDBCleanup-2.html */, > 5120C83B1E674E350025B250 /* WebsiteDataStoreCustomPaths.html */, > 2E131C171D83A97E001BA36C /* wide-autoplaying-video-with-audio.html */, >+ CD577798211CDE8F001B371E /* web-audio-only.html */, >+ CD57779A211CE6B7001B371E /* audio-with-web-audio.html */, >+ CD57779B211CE6CE001B371E /* video-with-audio-and-web-audio.html */, > ); > name = Resources; > sourceTree = "<group>"; >@@ -3729,6 +3744,7 @@ > CD78E11D1DB7EA660014A2DE /* FullscreenDelegate.mm in Sources */, > 7C83E0BD1D0A650C00FEBCF3 /* FullscreenTopContentInset.mm in Sources */, > CDBFCC451A9FF45300A7B691 /* FullscreenZoomInitialFrame.mm in Sources */, >+ CD227E44211A4D5D00D285AF /* PreferredAudioBufferSize.mm in Sources */, > 83DB79691EF63B3C00BFA5E5 /* Function.cpp in Sources */, > 7CCE7EF81A411AE600447C4C /* Geolocation.cpp in Sources */, > 631EFFF61E7B5E8D00D2EBB8 /* Geolocation.mm in Sources */, >diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PreferredAudioBufferSize.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PreferredAudioBufferSize.mm >new file mode 100644 >index 0000000000000000000000000000000000000000..05dd87f67d37f86bd75bde3d35b085537defde7b >--- /dev/null >+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PreferredAudioBufferSize.mm >@@ -0,0 +1,119 @@ >+/* >+ * Copyright (C) 2018 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+ * THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#include "config.h" >+ >+#if WK_HAVE_C_SPI && WK_API_ENABLED >+ >+#import "PlatformUtilities.h" >+#import "Test.h" >+#import "TestWKWebView.h" >+#import "WebCoreTestSupport.h" >+#import <JavaScriptCore/JSContext.h> >+#import <WebKit/WKPreferencesPrivate.h> >+#import <WebKit/WKUIDelegatePrivate.h> >+#import <WebKit/_WKFullscreenDelegate.h> >+#import <wtf/RetainPtr.h> >+ >+class PreferredAudioBufferSize : public testing::Test { >+public: >+ void SetUp() override >+ { >+ configuration = adoptNS([[WKWebViewConfiguration alloc] init]); >+ WKRetainPtr<WKContextRef> context(AdoptWK, TestWebKitAPI::Util::createContextForInjectedBundleTest("InternalsInjectedBundleTest")); >+ configuration.get().processPool = (WKProcessPool *)context.get(); >+ configuration.get().preferences._lowPowerVideoAudioBufferSizeEnabled = YES; >+ } >+ >+ void createView() >+ { >+ webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration.get() addToWindow:YES]); >+ } >+ >+ double preferredAudioBufferSize() const >+ { >+ return [webView stringByEvaluatingJavaScript:@"window.internals.preferredAudioBufferSize()"].doubleValue; >+ } >+ >+ RetainPtr<WKWebViewConfiguration> configuration; >+ RetainPtr<TestWKWebView> webView; >+}; >+ >+TEST_F(PreferredAudioBufferSize, Empty) >+{ >+ createView(); >+ [webView synchronouslyLoadHTMLString:@""]; >+ EXPECT_EQ(512, preferredAudioBufferSize()); >+} >+ >+TEST_F(PreferredAudioBufferSize, AudioElement) >+{ >+ createView(); >+ [webView synchronouslyLoadTestPageNamed:@"audio-only"]; >+ [webView waitForMessage:@"playing"]; >+ EXPECT_EQ(4096, preferredAudioBufferSize()); >+} >+ >+TEST_F(PreferredAudioBufferSize, WebAudio) >+{ >+ createView(); >+ [webView synchronouslyLoadTestPageNamed:@"web-audio-only"]; >+ [webView waitForMessage:@"playing"]; >+ EXPECT_EQ(128, preferredAudioBufferSize()); >+} >+ >+TEST_F(PreferredAudioBufferSize, VideoOnly) >+{ >+ createView(); >+ [webView synchronouslyLoadTestPageNamed:@"video-without-audio"]; >+ [webView waitForMessage:@"playing"]; >+ EXPECT_EQ(512, preferredAudioBufferSize()); >+} >+ >+TEST_F(PreferredAudioBufferSize, VideoWithAudio) >+{ >+ createView(); >+ [webView synchronouslyLoadTestPageNamed:@"video-with-audio"]; >+ [webView waitForMessage:@"playing"]; >+ EXPECT_EQ(4096, preferredAudioBufferSize()); >+} >+ >+TEST_F(PreferredAudioBufferSize, AudioWithWebAudio) >+{ >+ createView(); >+ [webView synchronouslyLoadTestPageNamed:@"audio-with-web-audio"]; >+ [webView waitForMessage:@"playing"]; >+ EXPECT_EQ(128, preferredAudioBufferSize()); >+} >+ >+TEST_F(PreferredAudioBufferSize, VideoWithAudioAndWebAudio) >+{ >+ createView(); >+ [webView synchronouslyLoadTestPageNamed:@"video-with-audio-and-web-audio"]; >+ [webView waitForMessage:@"playing"]; >+ EXPECT_EQ(128, preferredAudioBufferSize()); >+} >+ >+#endif // WK_HAVE_C_SPI && WK_API_ENABLED >diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/audio-with-web-audio.html b/Tools/TestWebKitAPI/Tests/WebKitCocoa/audio-with-web-audio.html >new file mode 100644 >index 0000000000000000000000000000000000000000..a32661f2e9e1e9e4a06beb8d50e63dc911b6547f >--- /dev/null >+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/audio-with-web-audio.html >@@ -0,0 +1,21 @@ >+<!DOCTYPE html> >+<html> >+<head> >+ <script> >+ window.addEventListener('load', async event => { >+ let context = new webkitAudioContext(); >+ let node = context.createBufferSource(); >+ node.connect(context.destination); >+ >+ let audio = new Audio(); >+ audio.src = "video-with-audio.mp4"; >+ >+ Promise.all([context.resume(), audio.play()]).then(() => { >+ window.webkit.messageHandlers.testHandler.postMessage('playing'); >+ }, () => { >+ window.webkit.messageHandlers.testHandler.postMessage('not playing'); >+ }); >+ }); >+ </script> >+</head> >+</html> >diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/video-with-audio-and-web-audio.html b/Tools/TestWebKitAPI/Tests/WebKitCocoa/video-with-audio-and-web-audio.html >new file mode 100644 >index 0000000000000000000000000000000000000000..33485d9a2b304fb92da7008bc8d15f4f12655b5c >--- /dev/null >+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/video-with-audio-and-web-audio.html >@@ -0,0 +1,22 @@ >+ >+<!DOCTYPE html> >+<html> >+<head> >+ <script> >+ window.addEventListener('load', event => { >+ let context = new webkitAudioContext(); >+ let node = context.createBufferSource(); >+ node.connect(context.destination); >+ >+ let video = document.querySelector('video'); >+ >+ Promise.all([context.resume(), video.play()]).then(() => { >+ window.webkit.messageHandlers.testHandler.postMessage('playing'); >+ }, () => { >+ window.webkit.messageHandlers.testHandler.postMessage('not playing'); >+ }); >+ }); >+ </script> >+</head> >+ <video src="video-with-audio.mp4"></video> >+</html> >diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/web-audio-only.html b/Tools/TestWebKitAPI/Tests/WebKitCocoa/web-audio-only.html >new file mode 100644 >index 0000000000000000000000000000000000000000..2167c9dc24fbedb8860b5bc9e62ade4442ddf578 >--- /dev/null >+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/web-audio-only.html >@@ -0,0 +1,21 @@ >+<!DOCTYPE html> >+<html> >+<head> >+ <script> >+ window.addEventListener('load', async event => { >+ var context = new webkitAudioContext(); >+ context.addEventListener('statechange', statechange); >+ node = context.createBufferSource(); >+ node.connect(context.destination); >+ context.resume(); >+ }); >+ >+ function statechange(event) { >+ var context = event.target; >+ var message = context.state === 'running' ? 'playing' : 'not playing'; >+ window.webkit.messageHandlers.testHandler.postMessage(message); >+ } >+ </script> >+</head> >+</html> >+
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=346864">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 188452
:
346863
|
346864
|
346865