haikuwebkit/Source/WebCore/platform/audio/NowPlayingInfo.h

169 lines
5.4 KiB
C
Raw Permalink Normal View History

Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
/*
[Mac] Connect MediaSession with MediaRemote and NowPlaying https://bugs.webkit.org/show_bug.cgi?id=221431 <rdar://problem/74000363> Reviewed by Jer Noble. Source/WebCore: Route all remote control commands to navigator.mediaSession when it has any registered action handlers, and pass navigator.mediaSession.metadata to NowPlaying. Tested with new API tests in Tools/TestWebKitAPI/Tests/WebKitCocoa/MediaSession.mm. * Modules/mediasession/MediaImage.h: (WebCore::MediaImage::encode const): (WebCore::MediaImage::decode): * Modules/mediasession/MediaMetadata.cpp: (WebCore::MediaMetadata::setTitle): (WebCore::MediaMetadata::setArtist): (WebCore::MediaMetadata::setAlbum): (WebCore::MediaMetadata::setArtwork): * Modules/mediasession/MediaMetadata.h: (WebCore::MediaMetadata::title const): (WebCore::MediaMetadata::artist const): (WebCore::MediaMetadata::album const): (WebCore::MediaMetadata::artwork const): (WebCore::MediaMetadata::metadata const): * Modules/mediasession/MediaMetadataInit.h: (WebCore::MediaMetadataInit::encode const): (WebCore::MediaMetadataInit::decode): * Modules/mediasession/MediaSession.cpp: (WebCore::nextLogIdentifier): (WebCore::logChannel): (WebCore::logClassName): (WebCore::platformCommandForMediaSessionAction): (WebCore::MediaSession::MediaSession): (WebCore::MediaSession::setMetadata): (WebCore::MediaSession::setPlaybackState): (WebCore::MediaSession::setActionHandler): (WebCore::MediaSession::setPositionState): * Modules/mediasession/MediaSession.h: (WebCore::MediaSession::hasActiveActionHandlers const): (WebCore::MediaSession::logger const): (WebCore::MediaSession::logIdentifier const): (WTF::LogArgument<WebCore::MediaSessionPlaybackState>::toString): (WTF::LogArgument<WebCore::MediaSessionAction>::toString): * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::didReceiveRemoteControlCommand): * html/MediaElementSession.cpp: (WebCore::MediaElementSession::didReceiveRemoteControlCommand): (WebCore::MediaElementSession::nowPlayingInfo const): * html/MediaElementSession.h: * page/ChromeClient.h: * platform/RemoteCommandListener.cpp: (WebCore::RemoteCommandListener::scheduleSupportedCommandsUpdate): (WebCore::RemoteCommandListener::addSupportedCommand): (WebCore::RemoteCommandListener::removeSupportedCommand): * platform/RemoteCommandListener.h: * platform/audio/NowPlayingInfo.h: (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::convertEnumerationToString): * platform/audio/PlatformMediaSession.h: * platform/audio/PlatformMediaSessionManager.h: (WebCore::PlatformMediaSessionManager::addSupportedCommand): (WebCore::PlatformMediaSessionManager::removeSupportedCommand): * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (WebCore::MediaSessionManagerCocoa::scheduleSessionStatusUpdate): (WebCore::MediaSessionManagerCocoa::sessionCanProduceAudioChanged): (WebCore::MediaSessionManagerCocoa::addSupportedCommand): (WebCore::MediaSessionManagerCocoa::removeSupportedCommand): (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): * platform/mac/MediaRemoteSoftLink.cpp: * platform/mac/MediaRemoteSoftLink.h: * platform/mac/RemoteCommandListenerMac.h: * platform/mac/RemoteCommandListenerMac.mm: (WebCore::mediaRemoteCommandForPlatformCommand): (WebCore::RemoteCommandListenerMac::defaultCommands): (WebCore::isSeekCommand): (WebCore::RemoteCommandListenerMac::updateSupportedCommands): (WebCore::RemoteCommandListenerMac::RemoteCommandListenerMac): Source/WebCore/PAL: * pal/spi/mac/MediaRemoteSPI.h: Source/WebKit: Add a private preference so the new MediaSession API test can enable the feature. * UIProcess/API/Cocoa/WKPreferences.mm: (-[WKPreferences _mediaSessionEnabled]): (-[WKPreferences _setMediaSessionEnabled:]): * UIProcess/API/Cocoa/WKPreferencesPrivate.h: Tools: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebKitCocoa/MediaSession.mm: Added. (TestWebKitAPI::MediaSessionTest::webView): (TestWebKitAPI::MediaSessionTest::webViewPid): (TestWebKitAPI::MediaSessionTest::getNowPlayingClient): (TestWebKitAPI::MediaSessionTest::getNowPlayingClientPid): (TestWebKitAPI::MediaSessionTest::loadPageAndBecomeNowPlaying): (TestWebKitAPI::MediaSessionTest::runScriptWithUserGesture): (TestWebKitAPI::MediaSessionTest::play): (TestWebKitAPI::MediaSessionTest::pause): (TestWebKitAPI::MediaSessionTest::sendMediaRemoteCommand): (TestWebKitAPI::MediaSessionTest::sendMediaRemoteSeekCommand): (TestWebKitAPI::MediaSessionTest::listenForEventMessages): (TestWebKitAPI::MediaSessionTest::eventListenerWasCalled): (TestWebKitAPI::MediaSessionTest::waitForEventListenerToBeCalled): (TestWebKitAPI::MediaSessionTest::listenForSessionHandlerMessages): (TestWebKitAPI::MediaSessionTest::sessionHandlerWasCalled): (TestWebKitAPI::MediaSessionTest::waitForSessionHandlerToBeCalled): (TestWebKitAPI::MediaSessionTest::getSupportedCommands): (TestWebKitAPI::TEST_F): * TestWebKitAPI/Tests/WebKitCocoa/media-remote.html: Added. Canonical link: https://commits.webkit.org/233763@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272445 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-02-05 23:18:55 +00:00
* Copyright (C) 2020-2021 Apple Inc. All rights reserved.
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
*
* 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.
*/
#pragma once
Now Playing artwork doesn't update when changed. https://bugs.webkit.org/show_bug.cgi?id=223731 <rdar://problem/75823923> Source/WebCore: Now Playing and Media Remote requires a unique identifier for the currently playing item. If the same identifier is provided for every call to MRMediaRemoteSetNowPlayingInfo, then some updates may be skipped. In earlier changes, the MediaSessionElement identifier was combined with the Media Element identifier which broke Now Playing as the MediaSession identifier never changes for the lifetime of the web content process. So we create a new method HTMLMediaElement::mediaUniqueIdentifier with a new MediaUniqueIdentifier that willthat will be updated whenever the source of a media element changes and stop using the MediaSession identifier when dealing with Now Playing. Patch by Jean-Yves Avenard <jya@apple.com> on 2021-04-01 Reviewed by Eric Carlson. Manually tested, no framework available to test such change. * WebCore.xcodeproj/project.pbxproj: Add MediaUniqueIdentifier.h * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::prepareForLoad): Use setCurrentSrc instead of directly modifying m_currentSrc. (WebCore::HTMLMediaElement::selectMediaResource): Use setCurrentSrc instead of directly modifying m_currentSrc. (WebCore::HTMLMediaElement::loadResource): Use setCurrentSrc instead of directly modifying m_currentSrc. (WebCore::HTMLMediaElement::setCurrentSrc): Add convenience method, generate new MediaUniqueIdentifier each time m_currentSrc is modified. (WebCore::HTMLMediaElement::mediaUniqueIdentifier const): Return unique media identifier. (WebCore::HTMLMediaElement::mediaSessionUniqueIdentifier const): Deleted. * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::nowPlayingInfo const): * platform/audio/NowPlayingInfo.h: Use MediaUniqueIdentifier for uniqueIdentifier member. (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSessionManager.h: Use MediaUniqueIdentifier instead. (WebCore::PlatformMediaSessionManager::lastUpdatedNowPlayingInfoUniqueIdentifier const): set kMRMediaRemoteNowPlayingInfoArtworkIdentifier in CFDictionary to the source of the artwork. Workaround a bug in Media Controller component. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): * platform/mac/MediaRemoteSoftLink.h: Soft-link kMRMediaRemoteNowPlayingInfoArtworkIdentifier symbol. * platform/mac/MediaRemoteSoftLink.mm: * testing/Internals.h: Add missing header. Source/WebCore/PAL: Patch by Jean-Yves Avenard <jya@apple.com> on 2021-04-01 Reviewed by Eric Carlson. * pal/spi/mac/MediaRemoteSPI.h: Canonical link: https://commits.webkit.org/236030@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275359 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-04-01 15:17:27 +00:00
#include "MediaUniqueIdentifier.h"
Show media session image artwork in Now Playing information pane. https://bugs.webkit.org/show_bug.cgi?id=223118 <rdar://problem/75360166> Patch by Jean-Yves Avenard <jya@apple.com> on 2021-03-17 Reviewed by Eric Carlson. Source/WebCore: Test: fast/mediasession/metadata/artworkdownload.html Manually tested for Now Playing system integration. * Modules/mediasession/MediaMetadata.cpp: (WebCore::ArtworkImageLoader::ArtworkImageLoader): Implementation of new ArtworkImageLoader class. (WebCore::ArtworkImageLoader::~ArtworkImageLoader): (WebCore::ArtworkImageLoader::requestImageResource): (WebCore::ArtworkImageLoader::notifyFinished): (WebCore::MediaMetadata::setMediaSession): (WebCore::MediaMetadata::resetMediaSession): (WebCore::MediaMetadata::setArtwork): (WebCore::MediaMetadata::refreshArtworkImage): (WebCore::MediaMetadata::setArtworkImage): Make use of new ArtworkImageLoader class. * Modules/mediasession/MediaMetadata.h: Add new ArtworkImageLoader class. Allows to download from a given URL in relation to a given Document. (WebCore::MediaMetadata::artworkSrc const): (WebCore::MediaMetadata::artworkImage const): * Modules/mediasession/MediaSession.cpp: (WebCore::MediaSession::setActionHandler): fix whitespace (automatic). (WebCore::MediaSession::document const): Add method, used by MediaMetadata * Modules/mediasession/MediaSession.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled const): fix whitespace (automatic). (WebCore::MediaElementSession::mediaEngineUpdated): fix whitespace (automatic). (WebCore::MediaElementSession::didReceiveRemoteControlCommand): fix whitespace (automatic). (WebCore::MediaElementSession::nowPlayingInfo const): Add artwork to NowPlayingInfo struct. * html/MediaElementSession.h: Add method, used by MediaMetadata * platform/audio/NowPlayingInfo.h: Add NowPlayingInfoArtwork struct. (WebCore::NowPlayingInfoArtwork::operator== const): (WebCore::NowPlayingInfoArtwork::operator!= const): (WebCore::NowPlayingInfoArtwork::encode const): (WebCore::NowPlayingInfoArtwork::decode): (WebCore::NowPlayingInfo::operator== const): (WebCore::NowPlayingInfo::operator!= const): (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/cocoa/MediaSessionManagerCocoa.mm: Add artwork image to CFDictionary (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): * testing/Internals.cpp: Add private interface to test ArtworkImageLoader class. (WebCore::Internals::~Internals): Reject pending ArtworkImageLoader promise if any. (WebCore::Internals::grabNextMediaStreamTrackFrame): Add missing move. (WebCore::Internals::loadArtworkImage): New method to load an image. * testing/Internals.h: New method. * testing/Internals.idl: New method. LayoutTests: * fast/mediasession/metadata/artworkdownload-expected.txt: Added. * fast/mediasession/metadata/artworkdownload.html: Added. Canonical link: https://commits.webkit.org/235427@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 20:46:52 +00:00
#include "SharedBuffer.h"
#include <wtf/URL.h>
#include <wtf/Vector.h>
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
#include <wtf/text/WTFString.h>
namespace WebCore {
Show media session image artwork in Now Playing information pane. https://bugs.webkit.org/show_bug.cgi?id=223118 <rdar://problem/75360166> Patch by Jean-Yves Avenard <jya@apple.com> on 2021-03-17 Reviewed by Eric Carlson. Source/WebCore: Test: fast/mediasession/metadata/artworkdownload.html Manually tested for Now Playing system integration. * Modules/mediasession/MediaMetadata.cpp: (WebCore::ArtworkImageLoader::ArtworkImageLoader): Implementation of new ArtworkImageLoader class. (WebCore::ArtworkImageLoader::~ArtworkImageLoader): (WebCore::ArtworkImageLoader::requestImageResource): (WebCore::ArtworkImageLoader::notifyFinished): (WebCore::MediaMetadata::setMediaSession): (WebCore::MediaMetadata::resetMediaSession): (WebCore::MediaMetadata::setArtwork): (WebCore::MediaMetadata::refreshArtworkImage): (WebCore::MediaMetadata::setArtworkImage): Make use of new ArtworkImageLoader class. * Modules/mediasession/MediaMetadata.h: Add new ArtworkImageLoader class. Allows to download from a given URL in relation to a given Document. (WebCore::MediaMetadata::artworkSrc const): (WebCore::MediaMetadata::artworkImage const): * Modules/mediasession/MediaSession.cpp: (WebCore::MediaSession::setActionHandler): fix whitespace (automatic). (WebCore::MediaSession::document const): Add method, used by MediaMetadata * Modules/mediasession/MediaSession.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled const): fix whitespace (automatic). (WebCore::MediaElementSession::mediaEngineUpdated): fix whitespace (automatic). (WebCore::MediaElementSession::didReceiveRemoteControlCommand): fix whitespace (automatic). (WebCore::MediaElementSession::nowPlayingInfo const): Add artwork to NowPlayingInfo struct. * html/MediaElementSession.h: Add method, used by MediaMetadata * platform/audio/NowPlayingInfo.h: Add NowPlayingInfoArtwork struct. (WebCore::NowPlayingInfoArtwork::operator== const): (WebCore::NowPlayingInfoArtwork::operator!= const): (WebCore::NowPlayingInfoArtwork::encode const): (WebCore::NowPlayingInfoArtwork::decode): (WebCore::NowPlayingInfo::operator== const): (WebCore::NowPlayingInfo::operator!= const): (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/cocoa/MediaSessionManagerCocoa.mm: Add artwork image to CFDictionary (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): * testing/Internals.cpp: Add private interface to test ArtworkImageLoader class. (WebCore::Internals::~Internals): Reject pending ArtworkImageLoader promise if any. (WebCore::Internals::grabNextMediaStreamTrackFrame): Add missing move. (WebCore::Internals::loadArtworkImage): New method to load an image. * testing/Internals.h: New method. * testing/Internals.idl: New method. LayoutTests: * fast/mediasession/metadata/artworkdownload-expected.txt: Added. * fast/mediasession/metadata/artworkdownload.html: Added. Canonical link: https://commits.webkit.org/235427@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 20:46:52 +00:00
struct NowPlayingInfoArtwork {
String src;
String mimeType;
RefPtr<SharedBuffer> imageData;
bool operator==(const NowPlayingInfoArtwork& other) const
{
return src == other.src && mimeType == other.mimeType;
Show media session image artwork in Now Playing information pane. https://bugs.webkit.org/show_bug.cgi?id=223118 <rdar://problem/75360166> Patch by Jean-Yves Avenard <jya@apple.com> on 2021-03-17 Reviewed by Eric Carlson. Source/WebCore: Test: fast/mediasession/metadata/artworkdownload.html Manually tested for Now Playing system integration. * Modules/mediasession/MediaMetadata.cpp: (WebCore::ArtworkImageLoader::ArtworkImageLoader): Implementation of new ArtworkImageLoader class. (WebCore::ArtworkImageLoader::~ArtworkImageLoader): (WebCore::ArtworkImageLoader::requestImageResource): (WebCore::ArtworkImageLoader::notifyFinished): (WebCore::MediaMetadata::setMediaSession): (WebCore::MediaMetadata::resetMediaSession): (WebCore::MediaMetadata::setArtwork): (WebCore::MediaMetadata::refreshArtworkImage): (WebCore::MediaMetadata::setArtworkImage): Make use of new ArtworkImageLoader class. * Modules/mediasession/MediaMetadata.h: Add new ArtworkImageLoader class. Allows to download from a given URL in relation to a given Document. (WebCore::MediaMetadata::artworkSrc const): (WebCore::MediaMetadata::artworkImage const): * Modules/mediasession/MediaSession.cpp: (WebCore::MediaSession::setActionHandler): fix whitespace (automatic). (WebCore::MediaSession::document const): Add method, used by MediaMetadata * Modules/mediasession/MediaSession.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled const): fix whitespace (automatic). (WebCore::MediaElementSession::mediaEngineUpdated): fix whitespace (automatic). (WebCore::MediaElementSession::didReceiveRemoteControlCommand): fix whitespace (automatic). (WebCore::MediaElementSession::nowPlayingInfo const): Add artwork to NowPlayingInfo struct. * html/MediaElementSession.h: Add method, used by MediaMetadata * platform/audio/NowPlayingInfo.h: Add NowPlayingInfoArtwork struct. (WebCore::NowPlayingInfoArtwork::operator== const): (WebCore::NowPlayingInfoArtwork::operator!= const): (WebCore::NowPlayingInfoArtwork::encode const): (WebCore::NowPlayingInfoArtwork::decode): (WebCore::NowPlayingInfo::operator== const): (WebCore::NowPlayingInfo::operator!= const): (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/cocoa/MediaSessionManagerCocoa.mm: Add artwork image to CFDictionary (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): * testing/Internals.cpp: Add private interface to test ArtworkImageLoader class. (WebCore::Internals::~Internals): Reject pending ArtworkImageLoader promise if any. (WebCore::Internals::grabNextMediaStreamTrackFrame): Add missing move. (WebCore::Internals::loadArtworkImage): New method to load an image. * testing/Internals.h: New method. * testing/Internals.idl: New method. LayoutTests: * fast/mediasession/metadata/artworkdownload-expected.txt: Added. * fast/mediasession/metadata/artworkdownload.html: Added. Canonical link: https://commits.webkit.org/235427@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 20:46:52 +00:00
}
bool operator!=(const NowPlayingInfoArtwork& other) const
{
return !(*this == other);
Show media session image artwork in Now Playing information pane. https://bugs.webkit.org/show_bug.cgi?id=223118 <rdar://problem/75360166> Patch by Jean-Yves Avenard <jya@apple.com> on 2021-03-17 Reviewed by Eric Carlson. Source/WebCore: Test: fast/mediasession/metadata/artworkdownload.html Manually tested for Now Playing system integration. * Modules/mediasession/MediaMetadata.cpp: (WebCore::ArtworkImageLoader::ArtworkImageLoader): Implementation of new ArtworkImageLoader class. (WebCore::ArtworkImageLoader::~ArtworkImageLoader): (WebCore::ArtworkImageLoader::requestImageResource): (WebCore::ArtworkImageLoader::notifyFinished): (WebCore::MediaMetadata::setMediaSession): (WebCore::MediaMetadata::resetMediaSession): (WebCore::MediaMetadata::setArtwork): (WebCore::MediaMetadata::refreshArtworkImage): (WebCore::MediaMetadata::setArtworkImage): Make use of new ArtworkImageLoader class. * Modules/mediasession/MediaMetadata.h: Add new ArtworkImageLoader class. Allows to download from a given URL in relation to a given Document. (WebCore::MediaMetadata::artworkSrc const): (WebCore::MediaMetadata::artworkImage const): * Modules/mediasession/MediaSession.cpp: (WebCore::MediaSession::setActionHandler): fix whitespace (automatic). (WebCore::MediaSession::document const): Add method, used by MediaMetadata * Modules/mediasession/MediaSession.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled const): fix whitespace (automatic). (WebCore::MediaElementSession::mediaEngineUpdated): fix whitespace (automatic). (WebCore::MediaElementSession::didReceiveRemoteControlCommand): fix whitespace (automatic). (WebCore::MediaElementSession::nowPlayingInfo const): Add artwork to NowPlayingInfo struct. * html/MediaElementSession.h: Add method, used by MediaMetadata * platform/audio/NowPlayingInfo.h: Add NowPlayingInfoArtwork struct. (WebCore::NowPlayingInfoArtwork::operator== const): (WebCore::NowPlayingInfoArtwork::operator!= const): (WebCore::NowPlayingInfoArtwork::encode const): (WebCore::NowPlayingInfoArtwork::decode): (WebCore::NowPlayingInfo::operator== const): (WebCore::NowPlayingInfo::operator!= const): (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/cocoa/MediaSessionManagerCocoa.mm: Add artwork image to CFDictionary (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): * testing/Internals.cpp: Add private interface to test ArtworkImageLoader class. (WebCore::Internals::~Internals): Reject pending ArtworkImageLoader promise if any. (WebCore::Internals::grabNextMediaStreamTrackFrame): Add missing move. (WebCore::Internals::loadArtworkImage): New method to load an image. * testing/Internals.h: New method. * testing/Internals.idl: New method. LayoutTests: * fast/mediasession/metadata/artworkdownload-expected.txt: Added. * fast/mediasession/metadata/artworkdownload.html: Added. Canonical link: https://commits.webkit.org/235427@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 20:46:52 +00:00
}
template<class Encoder> void encode(Encoder&) const;
Remove WTF::Optional synonym for std::optional, using that class template directly instead https://bugs.webkit.org/show_bug.cgi?id=226433 Reviewed by Chris Dumez. Source/JavaScriptCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py: (ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload): Use auto instead of Optional<>. Also use * instead of value() and nest the definition of the local inside an if statement in the case where it's an optional. * inspector/scripts/tests/expected/*: Regenerated these results. Source/WebCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebCore/PAL: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebDriver: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKit: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * Scripts/webkit/tests: Regenerated expected results, by running the command "python Scripts/webkit/messages_unittest.py -r". (How am I supposed to know to do that?) Source/WebKitLegacy/ios: * WebCoreSupport/WebChromeClientIOS.h: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/mac: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/win: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WTF: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * wtf/Optional.h: Remove WTF::Optional. Tools: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Canonical link: https://commits.webkit.org/238290@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-05-30 16:11:40 +00:00
template<class Decoder> static std::optional<NowPlayingInfoArtwork> decode(Decoder&);
Show media session image artwork in Now Playing information pane. https://bugs.webkit.org/show_bug.cgi?id=223118 <rdar://problem/75360166> Patch by Jean-Yves Avenard <jya@apple.com> on 2021-03-17 Reviewed by Eric Carlson. Source/WebCore: Test: fast/mediasession/metadata/artworkdownload.html Manually tested for Now Playing system integration. * Modules/mediasession/MediaMetadata.cpp: (WebCore::ArtworkImageLoader::ArtworkImageLoader): Implementation of new ArtworkImageLoader class. (WebCore::ArtworkImageLoader::~ArtworkImageLoader): (WebCore::ArtworkImageLoader::requestImageResource): (WebCore::ArtworkImageLoader::notifyFinished): (WebCore::MediaMetadata::setMediaSession): (WebCore::MediaMetadata::resetMediaSession): (WebCore::MediaMetadata::setArtwork): (WebCore::MediaMetadata::refreshArtworkImage): (WebCore::MediaMetadata::setArtworkImage): Make use of new ArtworkImageLoader class. * Modules/mediasession/MediaMetadata.h: Add new ArtworkImageLoader class. Allows to download from a given URL in relation to a given Document. (WebCore::MediaMetadata::artworkSrc const): (WebCore::MediaMetadata::artworkImage const): * Modules/mediasession/MediaSession.cpp: (WebCore::MediaSession::setActionHandler): fix whitespace (automatic). (WebCore::MediaSession::document const): Add method, used by MediaMetadata * Modules/mediasession/MediaSession.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled const): fix whitespace (automatic). (WebCore::MediaElementSession::mediaEngineUpdated): fix whitespace (automatic). (WebCore::MediaElementSession::didReceiveRemoteControlCommand): fix whitespace (automatic). (WebCore::MediaElementSession::nowPlayingInfo const): Add artwork to NowPlayingInfo struct. * html/MediaElementSession.h: Add method, used by MediaMetadata * platform/audio/NowPlayingInfo.h: Add NowPlayingInfoArtwork struct. (WebCore::NowPlayingInfoArtwork::operator== const): (WebCore::NowPlayingInfoArtwork::operator!= const): (WebCore::NowPlayingInfoArtwork::encode const): (WebCore::NowPlayingInfoArtwork::decode): (WebCore::NowPlayingInfo::operator== const): (WebCore::NowPlayingInfo::operator!= const): (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/cocoa/MediaSessionManagerCocoa.mm: Add artwork image to CFDictionary (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): * testing/Internals.cpp: Add private interface to test ArtworkImageLoader class. (WebCore::Internals::~Internals): Reject pending ArtworkImageLoader promise if any. (WebCore::Internals::grabNextMediaStreamTrackFrame): Add missing move. (WebCore::Internals::loadArtworkImage): New method to load an image. * testing/Internals.h: New method. * testing/Internals.idl: New method. LayoutTests: * fast/mediasession/metadata/artworkdownload-expected.txt: Added. * fast/mediasession/metadata/artworkdownload.html: Added. Canonical link: https://commits.webkit.org/235427@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 20:46:52 +00:00
};
template<class Encoder> inline void NowPlayingInfoArtwork::encode(Encoder& encoder) const
{
encoder << src << mimeType << imageData;
}
Remove WTF::Optional synonym for std::optional, using that class template directly instead https://bugs.webkit.org/show_bug.cgi?id=226433 Reviewed by Chris Dumez. Source/JavaScriptCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py: (ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload): Use auto instead of Optional<>. Also use * instead of value() and nest the definition of the local inside an if statement in the case where it's an optional. * inspector/scripts/tests/expected/*: Regenerated these results. Source/WebCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebCore/PAL: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebDriver: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKit: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * Scripts/webkit/tests: Regenerated expected results, by running the command "python Scripts/webkit/messages_unittest.py -r". (How am I supposed to know to do that?) Source/WebKitLegacy/ios: * WebCoreSupport/WebChromeClientIOS.h: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/mac: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/win: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WTF: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * wtf/Optional.h: Remove WTF::Optional. Tools: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Canonical link: https://commits.webkit.org/238290@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-05-30 16:11:40 +00:00
template<class Decoder> inline std::optional<NowPlayingInfoArtwork> NowPlayingInfoArtwork::decode(Decoder& decoder)
Show media session image artwork in Now Playing information pane. https://bugs.webkit.org/show_bug.cgi?id=223118 <rdar://problem/75360166> Patch by Jean-Yves Avenard <jya@apple.com> on 2021-03-17 Reviewed by Eric Carlson. Source/WebCore: Test: fast/mediasession/metadata/artworkdownload.html Manually tested for Now Playing system integration. * Modules/mediasession/MediaMetadata.cpp: (WebCore::ArtworkImageLoader::ArtworkImageLoader): Implementation of new ArtworkImageLoader class. (WebCore::ArtworkImageLoader::~ArtworkImageLoader): (WebCore::ArtworkImageLoader::requestImageResource): (WebCore::ArtworkImageLoader::notifyFinished): (WebCore::MediaMetadata::setMediaSession): (WebCore::MediaMetadata::resetMediaSession): (WebCore::MediaMetadata::setArtwork): (WebCore::MediaMetadata::refreshArtworkImage): (WebCore::MediaMetadata::setArtworkImage): Make use of new ArtworkImageLoader class. * Modules/mediasession/MediaMetadata.h: Add new ArtworkImageLoader class. Allows to download from a given URL in relation to a given Document. (WebCore::MediaMetadata::artworkSrc const): (WebCore::MediaMetadata::artworkImage const): * Modules/mediasession/MediaSession.cpp: (WebCore::MediaSession::setActionHandler): fix whitespace (automatic). (WebCore::MediaSession::document const): Add method, used by MediaMetadata * Modules/mediasession/MediaSession.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled const): fix whitespace (automatic). (WebCore::MediaElementSession::mediaEngineUpdated): fix whitespace (automatic). (WebCore::MediaElementSession::didReceiveRemoteControlCommand): fix whitespace (automatic). (WebCore::MediaElementSession::nowPlayingInfo const): Add artwork to NowPlayingInfo struct. * html/MediaElementSession.h: Add method, used by MediaMetadata * platform/audio/NowPlayingInfo.h: Add NowPlayingInfoArtwork struct. (WebCore::NowPlayingInfoArtwork::operator== const): (WebCore::NowPlayingInfoArtwork::operator!= const): (WebCore::NowPlayingInfoArtwork::encode const): (WebCore::NowPlayingInfoArtwork::decode): (WebCore::NowPlayingInfo::operator== const): (WebCore::NowPlayingInfo::operator!= const): (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/cocoa/MediaSessionManagerCocoa.mm: Add artwork image to CFDictionary (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): * testing/Internals.cpp: Add private interface to test ArtworkImageLoader class. (WebCore::Internals::~Internals): Reject pending ArtworkImageLoader promise if any. (WebCore::Internals::grabNextMediaStreamTrackFrame): Add missing move. (WebCore::Internals::loadArtworkImage): New method to load an image. * testing/Internals.h: New method. * testing/Internals.idl: New method. LayoutTests: * fast/mediasession/metadata/artworkdownload-expected.txt: Added. * fast/mediasession/metadata/artworkdownload.html: Added. Canonical link: https://commits.webkit.org/235427@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 20:46:52 +00:00
{
String src;
if (!decoder.decode(src))
return { };
String mimeType;
if (!decoder.decode(mimeType))
return { };
RefPtr<SharedBuffer> imageData;
if (!decoder.decode(imageData))
return { };
return NowPlayingInfoArtwork { WTFMove(src), WTFMove(mimeType), WTFMove(imageData) };
}
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
struct NowPlayingInfo {
String title;
[Mac] Connect MediaSession with MediaRemote and NowPlaying https://bugs.webkit.org/show_bug.cgi?id=221431 <rdar://problem/74000363> Reviewed by Jer Noble. Source/WebCore: Route all remote control commands to navigator.mediaSession when it has any registered action handlers, and pass navigator.mediaSession.metadata to NowPlaying. Tested with new API tests in Tools/TestWebKitAPI/Tests/WebKitCocoa/MediaSession.mm. * Modules/mediasession/MediaImage.h: (WebCore::MediaImage::encode const): (WebCore::MediaImage::decode): * Modules/mediasession/MediaMetadata.cpp: (WebCore::MediaMetadata::setTitle): (WebCore::MediaMetadata::setArtist): (WebCore::MediaMetadata::setAlbum): (WebCore::MediaMetadata::setArtwork): * Modules/mediasession/MediaMetadata.h: (WebCore::MediaMetadata::title const): (WebCore::MediaMetadata::artist const): (WebCore::MediaMetadata::album const): (WebCore::MediaMetadata::artwork const): (WebCore::MediaMetadata::metadata const): * Modules/mediasession/MediaMetadataInit.h: (WebCore::MediaMetadataInit::encode const): (WebCore::MediaMetadataInit::decode): * Modules/mediasession/MediaSession.cpp: (WebCore::nextLogIdentifier): (WebCore::logChannel): (WebCore::logClassName): (WebCore::platformCommandForMediaSessionAction): (WebCore::MediaSession::MediaSession): (WebCore::MediaSession::setMetadata): (WebCore::MediaSession::setPlaybackState): (WebCore::MediaSession::setActionHandler): (WebCore::MediaSession::setPositionState): * Modules/mediasession/MediaSession.h: (WebCore::MediaSession::hasActiveActionHandlers const): (WebCore::MediaSession::logger const): (WebCore::MediaSession::logIdentifier const): (WTF::LogArgument<WebCore::MediaSessionPlaybackState>::toString): (WTF::LogArgument<WebCore::MediaSessionAction>::toString): * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::didReceiveRemoteControlCommand): * html/MediaElementSession.cpp: (WebCore::MediaElementSession::didReceiveRemoteControlCommand): (WebCore::MediaElementSession::nowPlayingInfo const): * html/MediaElementSession.h: * page/ChromeClient.h: * platform/RemoteCommandListener.cpp: (WebCore::RemoteCommandListener::scheduleSupportedCommandsUpdate): (WebCore::RemoteCommandListener::addSupportedCommand): (WebCore::RemoteCommandListener::removeSupportedCommand): * platform/RemoteCommandListener.h: * platform/audio/NowPlayingInfo.h: (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::convertEnumerationToString): * platform/audio/PlatformMediaSession.h: * platform/audio/PlatformMediaSessionManager.h: (WebCore::PlatformMediaSessionManager::addSupportedCommand): (WebCore::PlatformMediaSessionManager::removeSupportedCommand): * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (WebCore::MediaSessionManagerCocoa::scheduleSessionStatusUpdate): (WebCore::MediaSessionManagerCocoa::sessionCanProduceAudioChanged): (WebCore::MediaSessionManagerCocoa::addSupportedCommand): (WebCore::MediaSessionManagerCocoa::removeSupportedCommand): (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): * platform/mac/MediaRemoteSoftLink.cpp: * platform/mac/MediaRemoteSoftLink.h: * platform/mac/RemoteCommandListenerMac.h: * platform/mac/RemoteCommandListenerMac.mm: (WebCore::mediaRemoteCommandForPlatformCommand): (WebCore::RemoteCommandListenerMac::defaultCommands): (WebCore::isSeekCommand): (WebCore::RemoteCommandListenerMac::updateSupportedCommands): (WebCore::RemoteCommandListenerMac::RemoteCommandListenerMac): Source/WebCore/PAL: * pal/spi/mac/MediaRemoteSPI.h: Source/WebKit: Add a private preference so the new MediaSession API test can enable the feature. * UIProcess/API/Cocoa/WKPreferences.mm: (-[WKPreferences _mediaSessionEnabled]): (-[WKPreferences _setMediaSessionEnabled:]): * UIProcess/API/Cocoa/WKPreferencesPrivate.h: Tools: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebKitCocoa/MediaSession.mm: Added. (TestWebKitAPI::MediaSessionTest::webView): (TestWebKitAPI::MediaSessionTest::webViewPid): (TestWebKitAPI::MediaSessionTest::getNowPlayingClient): (TestWebKitAPI::MediaSessionTest::getNowPlayingClientPid): (TestWebKitAPI::MediaSessionTest::loadPageAndBecomeNowPlaying): (TestWebKitAPI::MediaSessionTest::runScriptWithUserGesture): (TestWebKitAPI::MediaSessionTest::play): (TestWebKitAPI::MediaSessionTest::pause): (TestWebKitAPI::MediaSessionTest::sendMediaRemoteCommand): (TestWebKitAPI::MediaSessionTest::sendMediaRemoteSeekCommand): (TestWebKitAPI::MediaSessionTest::listenForEventMessages): (TestWebKitAPI::MediaSessionTest::eventListenerWasCalled): (TestWebKitAPI::MediaSessionTest::waitForEventListenerToBeCalled): (TestWebKitAPI::MediaSessionTest::listenForSessionHandlerMessages): (TestWebKitAPI::MediaSessionTest::sessionHandlerWasCalled): (TestWebKitAPI::MediaSessionTest::waitForSessionHandlerToBeCalled): (TestWebKitAPI::MediaSessionTest::getSupportedCommands): (TestWebKitAPI::TEST_F): * TestWebKitAPI/Tests/WebKitCocoa/media-remote.html: Added. Canonical link: https://commits.webkit.org/233763@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272445 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-02-05 23:18:55 +00:00
String artist;
String album;
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
String sourceApplicationIdentifier;
double duration { 0 };
double currentTime { 0 };
bool supportsSeeking { false };
Now Playing artwork doesn't update when changed. https://bugs.webkit.org/show_bug.cgi?id=223731 <rdar://problem/75823923> Source/WebCore: Now Playing and Media Remote requires a unique identifier for the currently playing item. If the same identifier is provided for every call to MRMediaRemoteSetNowPlayingInfo, then some updates may be skipped. In earlier changes, the MediaSessionElement identifier was combined with the Media Element identifier which broke Now Playing as the MediaSession identifier never changes for the lifetime of the web content process. So we create a new method HTMLMediaElement::mediaUniqueIdentifier with a new MediaUniqueIdentifier that willthat will be updated whenever the source of a media element changes and stop using the MediaSession identifier when dealing with Now Playing. Patch by Jean-Yves Avenard <jya@apple.com> on 2021-04-01 Reviewed by Eric Carlson. Manually tested, no framework available to test such change. * WebCore.xcodeproj/project.pbxproj: Add MediaUniqueIdentifier.h * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::prepareForLoad): Use setCurrentSrc instead of directly modifying m_currentSrc. (WebCore::HTMLMediaElement::selectMediaResource): Use setCurrentSrc instead of directly modifying m_currentSrc. (WebCore::HTMLMediaElement::loadResource): Use setCurrentSrc instead of directly modifying m_currentSrc. (WebCore::HTMLMediaElement::setCurrentSrc): Add convenience method, generate new MediaUniqueIdentifier each time m_currentSrc is modified. (WebCore::HTMLMediaElement::mediaUniqueIdentifier const): Return unique media identifier. (WebCore::HTMLMediaElement::mediaSessionUniqueIdentifier const): Deleted. * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::nowPlayingInfo const): * platform/audio/NowPlayingInfo.h: Use MediaUniqueIdentifier for uniqueIdentifier member. (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSessionManager.h: Use MediaUniqueIdentifier instead. (WebCore::PlatformMediaSessionManager::lastUpdatedNowPlayingInfoUniqueIdentifier const): set kMRMediaRemoteNowPlayingInfoArtworkIdentifier in CFDictionary to the source of the artwork. Workaround a bug in Media Controller component. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): * platform/mac/MediaRemoteSoftLink.h: Soft-link kMRMediaRemoteNowPlayingInfoArtworkIdentifier symbol. * platform/mac/MediaRemoteSoftLink.mm: * testing/Internals.h: Add missing header. Source/WebCore/PAL: Patch by Jean-Yves Avenard <jya@apple.com> on 2021-04-01 Reviewed by Eric Carlson. * pal/spi/mac/MediaRemoteSPI.h: Canonical link: https://commits.webkit.org/236030@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275359 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-04-01 15:17:27 +00:00
MediaUniqueIdentifier uniqueIdentifier;
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
bool isPlaying { false };
bool allowsNowPlayingControlsVisibility { false };
Remove WTF::Optional synonym for std::optional, using that class template directly instead https://bugs.webkit.org/show_bug.cgi?id=226433 Reviewed by Chris Dumez. Source/JavaScriptCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py: (ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload): Use auto instead of Optional<>. Also use * instead of value() and nest the definition of the local inside an if statement in the case where it's an optional. * inspector/scripts/tests/expected/*: Regenerated these results. Source/WebCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebCore/PAL: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebDriver: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKit: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * Scripts/webkit/tests: Regenerated expected results, by running the command "python Scripts/webkit/messages_unittest.py -r". (How am I supposed to know to do that?) Source/WebKitLegacy/ios: * WebCoreSupport/WebChromeClientIOS.h: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/mac: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/win: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WTF: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * wtf/Optional.h: Remove WTF::Optional. Tools: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Canonical link: https://commits.webkit.org/238290@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-05-30 16:11:40 +00:00
std::optional<NowPlayingInfoArtwork> artwork;
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
[GPU Process] Remote control command should only go to the current NowPlaying session https://bugs.webkit.org/show_bug.cgi?id=222759 <rdar://problem/75053393> Reviewed by Jer Noble. Source/WebCore: Don't register a remote command listener for every web process, or every remote control commands will go to every web process. Instead, register a single listener for the GPU process and route commands to only the current NowPlaying process. Tested manually. * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::didReceiveRemoteControlCommand): Drive-by: SkipForward and SkipBackwards should seek relative to current time. * platform/NowPlayingManager.cpp: (WebCore::NowPlayingManager::setSupportedRemoteCommands): New, pass through to the command listener. * platform/NowPlayingManager.h: * platform/RemoteCommandListener.cpp: (WebCore::RemoteCommandListener::addSupportedCommand): m_registeredCommands -> m_supportedCommands. (WebCore::RemoteCommandListener::removeSupportedCommand): Ditto. (WebCore::RemoteCommandListener::setSupportedCommands): Ditto. Schedule update. (WebCore::RemoteCommandListener::updateSupportedCommands): * platform/RemoteCommandListener.h: * platform/audio/NowPlayingInfo.h: (WebCore::NowPlayingInfo::operator== const): Add operator so we can avoid updating when nothing has changed. (WebCore::NowPlayingInfo::operator!= const): * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): Always set string properties so we don't show stale information after switching to a session that doesn't provide all of the same properties. (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): Only update when we have new state. * platform/mac/MediaRemoteSoftLink.h: * platform/mac/MediaRemoteSoftLink.mm: Soft link kMRMediaRemoteCommandInfoPreferredIntervalsKey. Source/WebKit: * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): Track being the active NowPlaying process. (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): Ditto. (WebKit::GPUConnectionToWebProcess::updateSupportedRemoteCommands): Pass supported commands and seeking to NowPlayingManager so it can pass them to the remote command listener. (WebKit::GPUConnectionToWebProcess::createRemoteCommandListener): We only ever need one listener. (WebKit::GPUConnectionToWebProcess::releaseRemoteCommandListener): Ditto. (WebKit::GPUConnectionToWebProcess::dispatchMessage): Dispatch RemoteRemoteCommandListenerProxy messages. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/media/RemoteRemoteCommandListenerProxy.cpp: (WebKit::RemoteRemoteCommandListenerProxy::RemoteRemoteCommandListenerProxy): Don't create a remote command listener, we only need one for the GPU process. (WebKit::RemoteRemoteCommandListenerProxy::updateSupportedCommands): New. (WebKit::RemoteRemoteCommandListenerProxy::didReceiveRemoteControlCommand): Deleted. * GPUProcess/media/RemoteRemoteCommandListenerProxy.h: (WebKit::RemoteRemoteCommandListenerProxy::create): (WebKit::RemoteRemoteCommandListenerProxy::supportsSeeking const): (WebKit::RemoteRemoteCommandListenerProxy::supportedCommands const): (WebKit::RemoteRemoteCommandListenerProxy::identifier const): * GPUProcess/media/RemoteRemoteCommandListenerProxy.messages.in: * WebProcess/GPU/media/RemoteRemoteCommandListener.cpp: (WebKit::RemoteRemoteCommandListener::RemoteRemoteCommandListener): Use m_process instead of calling WebProcess::singleton(). (WebKit::RemoteRemoteCommandListener::~RemoteRemoteCommandListener): Ditto. (WebKit::RemoteRemoteCommandListener::didReceiveRemoteControlCommand): Use client(), m_client is now private. (WebKit::RemoteRemoteCommandListener::updateSupportedCommands): * WebProcess/GPU/media/RemoteRemoteCommandListener.h: Canonical link: https://commits.webkit.org/234915@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273967 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-05 15:50:23 +00:00
bool operator==(const NowPlayingInfo& other) const
{
return title == other.title
&& artist == other.artist
&& album == other.album
&& sourceApplicationIdentifier == other.sourceApplicationIdentifier
&& duration == other.duration
&& currentTime == other.currentTime
&& supportsSeeking == other.supportsSeeking
&& uniqueIdentifier == other.uniqueIdentifier
&& isPlaying == other.isPlaying
Show media session image artwork in Now Playing information pane. https://bugs.webkit.org/show_bug.cgi?id=223118 <rdar://problem/75360166> Patch by Jean-Yves Avenard <jya@apple.com> on 2021-03-17 Reviewed by Eric Carlson. Source/WebCore: Test: fast/mediasession/metadata/artworkdownload.html Manually tested for Now Playing system integration. * Modules/mediasession/MediaMetadata.cpp: (WebCore::ArtworkImageLoader::ArtworkImageLoader): Implementation of new ArtworkImageLoader class. (WebCore::ArtworkImageLoader::~ArtworkImageLoader): (WebCore::ArtworkImageLoader::requestImageResource): (WebCore::ArtworkImageLoader::notifyFinished): (WebCore::MediaMetadata::setMediaSession): (WebCore::MediaMetadata::resetMediaSession): (WebCore::MediaMetadata::setArtwork): (WebCore::MediaMetadata::refreshArtworkImage): (WebCore::MediaMetadata::setArtworkImage): Make use of new ArtworkImageLoader class. * Modules/mediasession/MediaMetadata.h: Add new ArtworkImageLoader class. Allows to download from a given URL in relation to a given Document. (WebCore::MediaMetadata::artworkSrc const): (WebCore::MediaMetadata::artworkImage const): * Modules/mediasession/MediaSession.cpp: (WebCore::MediaSession::setActionHandler): fix whitespace (automatic). (WebCore::MediaSession::document const): Add method, used by MediaMetadata * Modules/mediasession/MediaSession.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled const): fix whitespace (automatic). (WebCore::MediaElementSession::mediaEngineUpdated): fix whitespace (automatic). (WebCore::MediaElementSession::didReceiveRemoteControlCommand): fix whitespace (automatic). (WebCore::MediaElementSession::nowPlayingInfo const): Add artwork to NowPlayingInfo struct. * html/MediaElementSession.h: Add method, used by MediaMetadata * platform/audio/NowPlayingInfo.h: Add NowPlayingInfoArtwork struct. (WebCore::NowPlayingInfoArtwork::operator== const): (WebCore::NowPlayingInfoArtwork::operator!= const): (WebCore::NowPlayingInfoArtwork::encode const): (WebCore::NowPlayingInfoArtwork::decode): (WebCore::NowPlayingInfo::operator== const): (WebCore::NowPlayingInfo::operator!= const): (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/cocoa/MediaSessionManagerCocoa.mm: Add artwork image to CFDictionary (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): * testing/Internals.cpp: Add private interface to test ArtworkImageLoader class. (WebCore::Internals::~Internals): Reject pending ArtworkImageLoader promise if any. (WebCore::Internals::grabNextMediaStreamTrackFrame): Add missing move. (WebCore::Internals::loadArtworkImage): New method to load an image. * testing/Internals.h: New method. * testing/Internals.idl: New method. LayoutTests: * fast/mediasession/metadata/artworkdownload-expected.txt: Added. * fast/mediasession/metadata/artworkdownload.html: Added. Canonical link: https://commits.webkit.org/235427@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 20:46:52 +00:00
&& allowsNowPlayingControlsVisibility == other.allowsNowPlayingControlsVisibility
&& artwork == other.artwork;
[GPU Process] Remote control command should only go to the current NowPlaying session https://bugs.webkit.org/show_bug.cgi?id=222759 <rdar://problem/75053393> Reviewed by Jer Noble. Source/WebCore: Don't register a remote command listener for every web process, or every remote control commands will go to every web process. Instead, register a single listener for the GPU process and route commands to only the current NowPlaying process. Tested manually. * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::didReceiveRemoteControlCommand): Drive-by: SkipForward and SkipBackwards should seek relative to current time. * platform/NowPlayingManager.cpp: (WebCore::NowPlayingManager::setSupportedRemoteCommands): New, pass through to the command listener. * platform/NowPlayingManager.h: * platform/RemoteCommandListener.cpp: (WebCore::RemoteCommandListener::addSupportedCommand): m_registeredCommands -> m_supportedCommands. (WebCore::RemoteCommandListener::removeSupportedCommand): Ditto. (WebCore::RemoteCommandListener::setSupportedCommands): Ditto. Schedule update. (WebCore::RemoteCommandListener::updateSupportedCommands): * platform/RemoteCommandListener.h: * platform/audio/NowPlayingInfo.h: (WebCore::NowPlayingInfo::operator== const): Add operator so we can avoid updating when nothing has changed. (WebCore::NowPlayingInfo::operator!= const): * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): Always set string properties so we don't show stale information after switching to a session that doesn't provide all of the same properties. (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): Only update when we have new state. * platform/mac/MediaRemoteSoftLink.h: * platform/mac/MediaRemoteSoftLink.mm: Soft link kMRMediaRemoteCommandInfoPreferredIntervalsKey. Source/WebKit: * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): Track being the active NowPlaying process. (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): Ditto. (WebKit::GPUConnectionToWebProcess::updateSupportedRemoteCommands): Pass supported commands and seeking to NowPlayingManager so it can pass them to the remote command listener. (WebKit::GPUConnectionToWebProcess::createRemoteCommandListener): We only ever need one listener. (WebKit::GPUConnectionToWebProcess::releaseRemoteCommandListener): Ditto. (WebKit::GPUConnectionToWebProcess::dispatchMessage): Dispatch RemoteRemoteCommandListenerProxy messages. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/media/RemoteRemoteCommandListenerProxy.cpp: (WebKit::RemoteRemoteCommandListenerProxy::RemoteRemoteCommandListenerProxy): Don't create a remote command listener, we only need one for the GPU process. (WebKit::RemoteRemoteCommandListenerProxy::updateSupportedCommands): New. (WebKit::RemoteRemoteCommandListenerProxy::didReceiveRemoteControlCommand): Deleted. * GPUProcess/media/RemoteRemoteCommandListenerProxy.h: (WebKit::RemoteRemoteCommandListenerProxy::create): (WebKit::RemoteRemoteCommandListenerProxy::supportsSeeking const): (WebKit::RemoteRemoteCommandListenerProxy::supportedCommands const): (WebKit::RemoteRemoteCommandListenerProxy::identifier const): * GPUProcess/media/RemoteRemoteCommandListenerProxy.messages.in: * WebProcess/GPU/media/RemoteRemoteCommandListener.cpp: (WebKit::RemoteRemoteCommandListener::RemoteRemoteCommandListener): Use m_process instead of calling WebProcess::singleton(). (WebKit::RemoteRemoteCommandListener::~RemoteRemoteCommandListener): Ditto. (WebKit::RemoteRemoteCommandListener::didReceiveRemoteControlCommand): Use client(), m_client is now private. (WebKit::RemoteRemoteCommandListener::updateSupportedCommands): * WebProcess/GPU/media/RemoteRemoteCommandListener.h: Canonical link: https://commits.webkit.org/234915@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273967 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-05 15:50:23 +00:00
}
Show media session image artwork in Now Playing information pane. https://bugs.webkit.org/show_bug.cgi?id=223118 <rdar://problem/75360166> Patch by Jean-Yves Avenard <jya@apple.com> on 2021-03-17 Reviewed by Eric Carlson. Source/WebCore: Test: fast/mediasession/metadata/artworkdownload.html Manually tested for Now Playing system integration. * Modules/mediasession/MediaMetadata.cpp: (WebCore::ArtworkImageLoader::ArtworkImageLoader): Implementation of new ArtworkImageLoader class. (WebCore::ArtworkImageLoader::~ArtworkImageLoader): (WebCore::ArtworkImageLoader::requestImageResource): (WebCore::ArtworkImageLoader::notifyFinished): (WebCore::MediaMetadata::setMediaSession): (WebCore::MediaMetadata::resetMediaSession): (WebCore::MediaMetadata::setArtwork): (WebCore::MediaMetadata::refreshArtworkImage): (WebCore::MediaMetadata::setArtworkImage): Make use of new ArtworkImageLoader class. * Modules/mediasession/MediaMetadata.h: Add new ArtworkImageLoader class. Allows to download from a given URL in relation to a given Document. (WebCore::MediaMetadata::artworkSrc const): (WebCore::MediaMetadata::artworkImage const): * Modules/mediasession/MediaSession.cpp: (WebCore::MediaSession::setActionHandler): fix whitespace (automatic). (WebCore::MediaSession::document const): Add method, used by MediaMetadata * Modules/mediasession/MediaSession.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled const): fix whitespace (automatic). (WebCore::MediaElementSession::mediaEngineUpdated): fix whitespace (automatic). (WebCore::MediaElementSession::didReceiveRemoteControlCommand): fix whitespace (automatic). (WebCore::MediaElementSession::nowPlayingInfo const): Add artwork to NowPlayingInfo struct. * html/MediaElementSession.h: Add method, used by MediaMetadata * platform/audio/NowPlayingInfo.h: Add NowPlayingInfoArtwork struct. (WebCore::NowPlayingInfoArtwork::operator== const): (WebCore::NowPlayingInfoArtwork::operator!= const): (WebCore::NowPlayingInfoArtwork::encode const): (WebCore::NowPlayingInfoArtwork::decode): (WebCore::NowPlayingInfo::operator== const): (WebCore::NowPlayingInfo::operator!= const): (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/cocoa/MediaSessionManagerCocoa.mm: Add artwork image to CFDictionary (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): * testing/Internals.cpp: Add private interface to test ArtworkImageLoader class. (WebCore::Internals::~Internals): Reject pending ArtworkImageLoader promise if any. (WebCore::Internals::grabNextMediaStreamTrackFrame): Add missing move. (WebCore::Internals::loadArtworkImage): New method to load an image. * testing/Internals.h: New method. * testing/Internals.idl: New method. LayoutTests: * fast/mediasession/metadata/artworkdownload-expected.txt: Added. * fast/mediasession/metadata/artworkdownload.html: Added. Canonical link: https://commits.webkit.org/235427@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 20:46:52 +00:00
bool operator!=(const NowPlayingInfo& other) const
[GPU Process] Remote control command should only go to the current NowPlaying session https://bugs.webkit.org/show_bug.cgi?id=222759 <rdar://problem/75053393> Reviewed by Jer Noble. Source/WebCore: Don't register a remote command listener for every web process, or every remote control commands will go to every web process. Instead, register a single listener for the GPU process and route commands to only the current NowPlaying process. Tested manually. * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::didReceiveRemoteControlCommand): Drive-by: SkipForward and SkipBackwards should seek relative to current time. * platform/NowPlayingManager.cpp: (WebCore::NowPlayingManager::setSupportedRemoteCommands): New, pass through to the command listener. * platform/NowPlayingManager.h: * platform/RemoteCommandListener.cpp: (WebCore::RemoteCommandListener::addSupportedCommand): m_registeredCommands -> m_supportedCommands. (WebCore::RemoteCommandListener::removeSupportedCommand): Ditto. (WebCore::RemoteCommandListener::setSupportedCommands): Ditto. Schedule update. (WebCore::RemoteCommandListener::updateSupportedCommands): * platform/RemoteCommandListener.h: * platform/audio/NowPlayingInfo.h: (WebCore::NowPlayingInfo::operator== const): Add operator so we can avoid updating when nothing has changed. (WebCore::NowPlayingInfo::operator!= const): * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): Always set string properties so we don't show stale information after switching to a session that doesn't provide all of the same properties. (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): Only update when we have new state. * platform/mac/MediaRemoteSoftLink.h: * platform/mac/MediaRemoteSoftLink.mm: Soft link kMRMediaRemoteCommandInfoPreferredIntervalsKey. Source/WebKit: * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): Track being the active NowPlaying process. (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): Ditto. (WebKit::GPUConnectionToWebProcess::updateSupportedRemoteCommands): Pass supported commands and seeking to NowPlayingManager so it can pass them to the remote command listener. (WebKit::GPUConnectionToWebProcess::createRemoteCommandListener): We only ever need one listener. (WebKit::GPUConnectionToWebProcess::releaseRemoteCommandListener): Ditto. (WebKit::GPUConnectionToWebProcess::dispatchMessage): Dispatch RemoteRemoteCommandListenerProxy messages. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/media/RemoteRemoteCommandListenerProxy.cpp: (WebKit::RemoteRemoteCommandListenerProxy::RemoteRemoteCommandListenerProxy): Don't create a remote command listener, we only need one for the GPU process. (WebKit::RemoteRemoteCommandListenerProxy::updateSupportedCommands): New. (WebKit::RemoteRemoteCommandListenerProxy::didReceiveRemoteControlCommand): Deleted. * GPUProcess/media/RemoteRemoteCommandListenerProxy.h: (WebKit::RemoteRemoteCommandListenerProxy::create): (WebKit::RemoteRemoteCommandListenerProxy::supportsSeeking const): (WebKit::RemoteRemoteCommandListenerProxy::supportedCommands const): (WebKit::RemoteRemoteCommandListenerProxy::identifier const): * GPUProcess/media/RemoteRemoteCommandListenerProxy.messages.in: * WebProcess/GPU/media/RemoteRemoteCommandListener.cpp: (WebKit::RemoteRemoteCommandListener::RemoteRemoteCommandListener): Use m_process instead of calling WebProcess::singleton(). (WebKit::RemoteRemoteCommandListener::~RemoteRemoteCommandListener): Ditto. (WebKit::RemoteRemoteCommandListener::didReceiveRemoteControlCommand): Use client(), m_client is now private. (WebKit::RemoteRemoteCommandListener::updateSupportedCommands): * WebProcess/GPU/media/RemoteRemoteCommandListener.h: Canonical link: https://commits.webkit.org/234915@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273967 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-05 15:50:23 +00:00
{
return !(*this == other);
}
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
template<class Encoder> void encode(Encoder&) const;
Remove WTF::Optional synonym for std::optional, using that class template directly instead https://bugs.webkit.org/show_bug.cgi?id=226433 Reviewed by Chris Dumez. Source/JavaScriptCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py: (ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload): Use auto instead of Optional<>. Also use * instead of value() and nest the definition of the local inside an if statement in the case where it's an optional. * inspector/scripts/tests/expected/*: Regenerated these results. Source/WebCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebCore/PAL: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebDriver: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKit: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * Scripts/webkit/tests: Regenerated expected results, by running the command "python Scripts/webkit/messages_unittest.py -r". (How am I supposed to know to do that?) Source/WebKitLegacy/ios: * WebCoreSupport/WebChromeClientIOS.h: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/mac: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/win: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WTF: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * wtf/Optional.h: Remove WTF::Optional. Tools: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Canonical link: https://commits.webkit.org/238290@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-05-30 16:11:40 +00:00
template<class Decoder> static std::optional<NowPlayingInfo> decode(Decoder&);
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
};
template<class Encoder> inline void NowPlayingInfo::encode(Encoder& encoder) const
{
Show media session image artwork in Now Playing information pane. https://bugs.webkit.org/show_bug.cgi?id=223118 <rdar://problem/75360166> Patch by Jean-Yves Avenard <jya@apple.com> on 2021-03-17 Reviewed by Eric Carlson. Source/WebCore: Test: fast/mediasession/metadata/artworkdownload.html Manually tested for Now Playing system integration. * Modules/mediasession/MediaMetadata.cpp: (WebCore::ArtworkImageLoader::ArtworkImageLoader): Implementation of new ArtworkImageLoader class. (WebCore::ArtworkImageLoader::~ArtworkImageLoader): (WebCore::ArtworkImageLoader::requestImageResource): (WebCore::ArtworkImageLoader::notifyFinished): (WebCore::MediaMetadata::setMediaSession): (WebCore::MediaMetadata::resetMediaSession): (WebCore::MediaMetadata::setArtwork): (WebCore::MediaMetadata::refreshArtworkImage): (WebCore::MediaMetadata::setArtworkImage): Make use of new ArtworkImageLoader class. * Modules/mediasession/MediaMetadata.h: Add new ArtworkImageLoader class. Allows to download from a given URL in relation to a given Document. (WebCore::MediaMetadata::artworkSrc const): (WebCore::MediaMetadata::artworkImage const): * Modules/mediasession/MediaSession.cpp: (WebCore::MediaSession::setActionHandler): fix whitespace (automatic). (WebCore::MediaSession::document const): Add method, used by MediaMetadata * Modules/mediasession/MediaSession.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled const): fix whitespace (automatic). (WebCore::MediaElementSession::mediaEngineUpdated): fix whitespace (automatic). (WebCore::MediaElementSession::didReceiveRemoteControlCommand): fix whitespace (automatic). (WebCore::MediaElementSession::nowPlayingInfo const): Add artwork to NowPlayingInfo struct. * html/MediaElementSession.h: Add method, used by MediaMetadata * platform/audio/NowPlayingInfo.h: Add NowPlayingInfoArtwork struct. (WebCore::NowPlayingInfoArtwork::operator== const): (WebCore::NowPlayingInfoArtwork::operator!= const): (WebCore::NowPlayingInfoArtwork::encode const): (WebCore::NowPlayingInfoArtwork::decode): (WebCore::NowPlayingInfo::operator== const): (WebCore::NowPlayingInfo::operator!= const): (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/cocoa/MediaSessionManagerCocoa.mm: Add artwork image to CFDictionary (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): * testing/Internals.cpp: Add private interface to test ArtworkImageLoader class. (WebCore::Internals::~Internals): Reject pending ArtworkImageLoader promise if any. (WebCore::Internals::grabNextMediaStreamTrackFrame): Add missing move. (WebCore::Internals::loadArtworkImage): New method to load an image. * testing/Internals.h: New method. * testing/Internals.idl: New method. LayoutTests: * fast/mediasession/metadata/artworkdownload-expected.txt: Added. * fast/mediasession/metadata/artworkdownload.html: Added. Canonical link: https://commits.webkit.org/235427@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 20:46:52 +00:00
encoder << title << artist << album << sourceApplicationIdentifier << duration << currentTime << supportsSeeking << uniqueIdentifier << isPlaying << allowsNowPlayingControlsVisibility << artwork;
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
}
Remove WTF::Optional synonym for std::optional, using that class template directly instead https://bugs.webkit.org/show_bug.cgi?id=226433 Reviewed by Chris Dumez. Source/JavaScriptCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py: (ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload): Use auto instead of Optional<>. Also use * instead of value() and nest the definition of the local inside an if statement in the case where it's an optional. * inspector/scripts/tests/expected/*: Regenerated these results. Source/WebCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebCore/PAL: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebDriver: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKit: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * Scripts/webkit/tests: Regenerated expected results, by running the command "python Scripts/webkit/messages_unittest.py -r". (How am I supposed to know to do that?) Source/WebKitLegacy/ios: * WebCoreSupport/WebChromeClientIOS.h: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/mac: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/win: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WTF: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * wtf/Optional.h: Remove WTF::Optional. Tools: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Canonical link: https://commits.webkit.org/238290@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-05-30 16:11:40 +00:00
template<class Decoder> inline std::optional<NowPlayingInfo> NowPlayingInfo::decode(Decoder& decoder)
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
{
String title;
if (!decoder.decode(title))
return { };
[Mac] Connect MediaSession with MediaRemote and NowPlaying https://bugs.webkit.org/show_bug.cgi?id=221431 <rdar://problem/74000363> Reviewed by Jer Noble. Source/WebCore: Route all remote control commands to navigator.mediaSession when it has any registered action handlers, and pass navigator.mediaSession.metadata to NowPlaying. Tested with new API tests in Tools/TestWebKitAPI/Tests/WebKitCocoa/MediaSession.mm. * Modules/mediasession/MediaImage.h: (WebCore::MediaImage::encode const): (WebCore::MediaImage::decode): * Modules/mediasession/MediaMetadata.cpp: (WebCore::MediaMetadata::setTitle): (WebCore::MediaMetadata::setArtist): (WebCore::MediaMetadata::setAlbum): (WebCore::MediaMetadata::setArtwork): * Modules/mediasession/MediaMetadata.h: (WebCore::MediaMetadata::title const): (WebCore::MediaMetadata::artist const): (WebCore::MediaMetadata::album const): (WebCore::MediaMetadata::artwork const): (WebCore::MediaMetadata::metadata const): * Modules/mediasession/MediaMetadataInit.h: (WebCore::MediaMetadataInit::encode const): (WebCore::MediaMetadataInit::decode): * Modules/mediasession/MediaSession.cpp: (WebCore::nextLogIdentifier): (WebCore::logChannel): (WebCore::logClassName): (WebCore::platformCommandForMediaSessionAction): (WebCore::MediaSession::MediaSession): (WebCore::MediaSession::setMetadata): (WebCore::MediaSession::setPlaybackState): (WebCore::MediaSession::setActionHandler): (WebCore::MediaSession::setPositionState): * Modules/mediasession/MediaSession.h: (WebCore::MediaSession::hasActiveActionHandlers const): (WebCore::MediaSession::logger const): (WebCore::MediaSession::logIdentifier const): (WTF::LogArgument<WebCore::MediaSessionPlaybackState>::toString): (WTF::LogArgument<WebCore::MediaSessionAction>::toString): * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::didReceiveRemoteControlCommand): * html/MediaElementSession.cpp: (WebCore::MediaElementSession::didReceiveRemoteControlCommand): (WebCore::MediaElementSession::nowPlayingInfo const): * html/MediaElementSession.h: * page/ChromeClient.h: * platform/RemoteCommandListener.cpp: (WebCore::RemoteCommandListener::scheduleSupportedCommandsUpdate): (WebCore::RemoteCommandListener::addSupportedCommand): (WebCore::RemoteCommandListener::removeSupportedCommand): * platform/RemoteCommandListener.h: * platform/audio/NowPlayingInfo.h: (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::convertEnumerationToString): * platform/audio/PlatformMediaSession.h: * platform/audio/PlatformMediaSessionManager.h: (WebCore::PlatformMediaSessionManager::addSupportedCommand): (WebCore::PlatformMediaSessionManager::removeSupportedCommand): * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (WebCore::MediaSessionManagerCocoa::scheduleSessionStatusUpdate): (WebCore::MediaSessionManagerCocoa::sessionCanProduceAudioChanged): (WebCore::MediaSessionManagerCocoa::addSupportedCommand): (WebCore::MediaSessionManagerCocoa::removeSupportedCommand): (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): * platform/mac/MediaRemoteSoftLink.cpp: * platform/mac/MediaRemoteSoftLink.h: * platform/mac/RemoteCommandListenerMac.h: * platform/mac/RemoteCommandListenerMac.mm: (WebCore::mediaRemoteCommandForPlatformCommand): (WebCore::RemoteCommandListenerMac::defaultCommands): (WebCore::isSeekCommand): (WebCore::RemoteCommandListenerMac::updateSupportedCommands): (WebCore::RemoteCommandListenerMac::RemoteCommandListenerMac): Source/WebCore/PAL: * pal/spi/mac/MediaRemoteSPI.h: Source/WebKit: Add a private preference so the new MediaSession API test can enable the feature. * UIProcess/API/Cocoa/WKPreferences.mm: (-[WKPreferences _mediaSessionEnabled]): (-[WKPreferences _setMediaSessionEnabled:]): * UIProcess/API/Cocoa/WKPreferencesPrivate.h: Tools: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebKitCocoa/MediaSession.mm: Added. (TestWebKitAPI::MediaSessionTest::webView): (TestWebKitAPI::MediaSessionTest::webViewPid): (TestWebKitAPI::MediaSessionTest::getNowPlayingClient): (TestWebKitAPI::MediaSessionTest::getNowPlayingClientPid): (TestWebKitAPI::MediaSessionTest::loadPageAndBecomeNowPlaying): (TestWebKitAPI::MediaSessionTest::runScriptWithUserGesture): (TestWebKitAPI::MediaSessionTest::play): (TestWebKitAPI::MediaSessionTest::pause): (TestWebKitAPI::MediaSessionTest::sendMediaRemoteCommand): (TestWebKitAPI::MediaSessionTest::sendMediaRemoteSeekCommand): (TestWebKitAPI::MediaSessionTest::listenForEventMessages): (TestWebKitAPI::MediaSessionTest::eventListenerWasCalled): (TestWebKitAPI::MediaSessionTest::waitForEventListenerToBeCalled): (TestWebKitAPI::MediaSessionTest::listenForSessionHandlerMessages): (TestWebKitAPI::MediaSessionTest::sessionHandlerWasCalled): (TestWebKitAPI::MediaSessionTest::waitForSessionHandlerToBeCalled): (TestWebKitAPI::MediaSessionTest::getSupportedCommands): (TestWebKitAPI::TEST_F): * TestWebKitAPI/Tests/WebKitCocoa/media-remote.html: Added. Canonical link: https://commits.webkit.org/233763@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272445 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-02-05 23:18:55 +00:00
String artist;
if (!decoder.decode(artist))
return { };
String album;
if (!decoder.decode(album))
return { };
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
String sourceApplicationIdentifier;
if (!decoder.decode(sourceApplicationIdentifier))
return { };
double duration;
if (!decoder.decode(duration))
return { };
double currentTime;
if (!decoder.decode(currentTime))
return { };
bool supportsSeeking;
if (!decoder.decode(supportsSeeking))
return { };
Now Playing artwork doesn't update when changed. https://bugs.webkit.org/show_bug.cgi?id=223731 <rdar://problem/75823923> Source/WebCore: Now Playing and Media Remote requires a unique identifier for the currently playing item. If the same identifier is provided for every call to MRMediaRemoteSetNowPlayingInfo, then some updates may be skipped. In earlier changes, the MediaSessionElement identifier was combined with the Media Element identifier which broke Now Playing as the MediaSession identifier never changes for the lifetime of the web content process. So we create a new method HTMLMediaElement::mediaUniqueIdentifier with a new MediaUniqueIdentifier that willthat will be updated whenever the source of a media element changes and stop using the MediaSession identifier when dealing with Now Playing. Patch by Jean-Yves Avenard <jya@apple.com> on 2021-04-01 Reviewed by Eric Carlson. Manually tested, no framework available to test such change. * WebCore.xcodeproj/project.pbxproj: Add MediaUniqueIdentifier.h * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::prepareForLoad): Use setCurrentSrc instead of directly modifying m_currentSrc. (WebCore::HTMLMediaElement::selectMediaResource): Use setCurrentSrc instead of directly modifying m_currentSrc. (WebCore::HTMLMediaElement::loadResource): Use setCurrentSrc instead of directly modifying m_currentSrc. (WebCore::HTMLMediaElement::setCurrentSrc): Add convenience method, generate new MediaUniqueIdentifier each time m_currentSrc is modified. (WebCore::HTMLMediaElement::mediaUniqueIdentifier const): Return unique media identifier. (WebCore::HTMLMediaElement::mediaSessionUniqueIdentifier const): Deleted. * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::nowPlayingInfo const): * platform/audio/NowPlayingInfo.h: Use MediaUniqueIdentifier for uniqueIdentifier member. (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSessionManager.h: Use MediaUniqueIdentifier instead. (WebCore::PlatformMediaSessionManager::lastUpdatedNowPlayingInfoUniqueIdentifier const): set kMRMediaRemoteNowPlayingInfoArtworkIdentifier in CFDictionary to the source of the artwork. Workaround a bug in Media Controller component. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): * platform/mac/MediaRemoteSoftLink.h: Soft-link kMRMediaRemoteNowPlayingInfoArtworkIdentifier symbol. * platform/mac/MediaRemoteSoftLink.mm: * testing/Internals.h: Add missing header. Source/WebCore/PAL: Patch by Jean-Yves Avenard <jya@apple.com> on 2021-04-01 Reviewed by Eric Carlson. * pal/spi/mac/MediaRemoteSPI.h: Canonical link: https://commits.webkit.org/236030@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275359 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-04-01 15:17:27 +00:00
MediaUniqueIdentifier uniqueIdentifier;
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
if (!decoder.decode(uniqueIdentifier))
return { };
bool isPlaying;
if (!decoder.decode(isPlaying))
return { };
bool allowsNowPlayingControlsVisibility;
if (!decoder.decode(allowsNowPlayingControlsVisibility))
return { };
Remove WTF::Optional synonym for std::optional, using that class template directly instead https://bugs.webkit.org/show_bug.cgi?id=226433 Reviewed by Chris Dumez. Source/JavaScriptCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py: (ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload): Use auto instead of Optional<>. Also use * instead of value() and nest the definition of the local inside an if statement in the case where it's an optional. * inspector/scripts/tests/expected/*: Regenerated these results. Source/WebCore: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebCore/PAL: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebDriver: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKit: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * Scripts/webkit/tests: Regenerated expected results, by running the command "python Scripts/webkit/messages_unittest.py -r". (How am I supposed to know to do that?) Source/WebKitLegacy/ios: * WebCoreSupport/WebChromeClientIOS.h: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/mac: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WebKitLegacy/win: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Source/WTF: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. * wtf/Optional.h: Remove WTF::Optional. Tools: * <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>. Canonical link: https://commits.webkit.org/238290@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-05-30 16:11:40 +00:00
std::optional<NowPlayingInfoArtwork> artwork;
Show media session image artwork in Now Playing information pane. https://bugs.webkit.org/show_bug.cgi?id=223118 <rdar://problem/75360166> Patch by Jean-Yves Avenard <jya@apple.com> on 2021-03-17 Reviewed by Eric Carlson. Source/WebCore: Test: fast/mediasession/metadata/artworkdownload.html Manually tested for Now Playing system integration. * Modules/mediasession/MediaMetadata.cpp: (WebCore::ArtworkImageLoader::ArtworkImageLoader): Implementation of new ArtworkImageLoader class. (WebCore::ArtworkImageLoader::~ArtworkImageLoader): (WebCore::ArtworkImageLoader::requestImageResource): (WebCore::ArtworkImageLoader::notifyFinished): (WebCore::MediaMetadata::setMediaSession): (WebCore::MediaMetadata::resetMediaSession): (WebCore::MediaMetadata::setArtwork): (WebCore::MediaMetadata::refreshArtworkImage): (WebCore::MediaMetadata::setArtworkImage): Make use of new ArtworkImageLoader class. * Modules/mediasession/MediaMetadata.h: Add new ArtworkImageLoader class. Allows to download from a given URL in relation to a given Document. (WebCore::MediaMetadata::artworkSrc const): (WebCore::MediaMetadata::artworkImage const): * Modules/mediasession/MediaSession.cpp: (WebCore::MediaSession::setActionHandler): fix whitespace (automatic). (WebCore::MediaSession::document const): Add method, used by MediaMetadata * Modules/mediasession/MediaSession.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled const): fix whitespace (automatic). (WebCore::MediaElementSession::mediaEngineUpdated): fix whitespace (automatic). (WebCore::MediaElementSession::didReceiveRemoteControlCommand): fix whitespace (automatic). (WebCore::MediaElementSession::nowPlayingInfo const): Add artwork to NowPlayingInfo struct. * html/MediaElementSession.h: Add method, used by MediaMetadata * platform/audio/NowPlayingInfo.h: Add NowPlayingInfoArtwork struct. (WebCore::NowPlayingInfoArtwork::operator== const): (WebCore::NowPlayingInfoArtwork::operator!= const): (WebCore::NowPlayingInfoArtwork::encode const): (WebCore::NowPlayingInfoArtwork::decode): (WebCore::NowPlayingInfo::operator== const): (WebCore::NowPlayingInfo::operator!= const): (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/cocoa/MediaSessionManagerCocoa.mm: Add artwork image to CFDictionary (WebCore::MediaSessionManagerCocoa::setNowPlayingInfo): (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): * testing/Internals.cpp: Add private interface to test ArtworkImageLoader class. (WebCore::Internals::~Internals): Reject pending ArtworkImageLoader promise if any. (WebCore::Internals::grabNextMediaStreamTrackFrame): Add missing move. (WebCore::Internals::loadArtworkImage): New method to load an image. * testing/Internals.h: New method. * testing/Internals.idl: New method. LayoutTests: * fast/mediasession/metadata/artworkdownload-expected.txt: Added. * fast/mediasession/metadata/artworkdownload.html: Added. Canonical link: https://commits.webkit.org/235427@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 20:46:52 +00:00
if (!decoder.decode(artwork))
return { };
return NowPlayingInfo { WTFMove(title), WTFMove(artist), WTFMove(album), WTFMove(sourceApplicationIdentifier), duration, currentTime, supportsSeeking, uniqueIdentifier, isPlaying, allowsNowPlayingControlsVisibility, WTFMove(artwork) };
Export NowPlaying commands to GPUProcess when media playing in GPUProcess is enabled https://bugs.webkit.org/show_bug.cgi?id=208568 Source/WebCore: Reviewed by Eric Carlson. Removed PlatformMediaSessionClient NowPlaying getters since only HTMLMediaElement is eligible. Let MediaElementSession generates its own NowPlayingInfo when requested by the session manager. Use platform strategies to abstract out how to execute NowPlaying orders. Manually tested for NowPlaying functionality. Also covered by existing tests for the refactoring bits. * Headers.cmake: * Modules/webaudio/AudioContext.cpp: (WebCore::AudioContext::sourceApplicationIdentifier const): Deleted. * Modules/webaudio/AudioContext.h: * WebCore.xcodeproj/project.pbxproj: * html/HTMLMediaElement.h: * html/MediaElementSession.cpp: (WebCore::MediaElementSession::allowsPlaybackControlsForAutoplayingAudio const): (WebCore::MediaElementSession::nowPlayingInfo const): (WebCore::MediaElementSession::allowsNowPlayingControlsVisibility const): Deleted. * html/MediaElementSession.h: * platform/MediaStrategy.h: * platform/audio/AudioSession.h: * platform/audio/NowPlayingInfo.h: Added. (WebCore::NowPlayingInfo::encode const): (WebCore::NowPlayingInfo::decode): * platform/audio/PlatformMediaSession.cpp: (WebCore::PlatformMediaSession::nowPlayingInfo const): (WebCore::PlatformMediaSession::uniqueIdentifier const): Deleted. (WebCore::PlatformMediaSession::title const): Deleted. (WebCore::PlatformMediaSession::duration const): Deleted. (WebCore::PlatformMediaSession::currentTime const): Deleted. (WebCore::PlatformMediaSession::sourceApplicationIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionUniqueIdentifier const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionTitle const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionDuration const): Deleted. (WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime const): Deleted. * platform/audio/PlatformMediaSession.h: (WebCore::PlatformMediaSession::allowsNowPlayingControlsVisibility const): Deleted. * platform/audio/cocoa/MediaSessionManagerCocoa.h: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: (MediaSessionManagerCocoa::clearNowPlayingInfo): (MediaSessionManagerCocoa::setNowPlayingInfo): (MediaSessionManagerCocoa::nowPlayingEligibleSession): (MediaSessionManagerCocoa::updateNowPlayingInfo): * platform/audio/ios/MediaSessionManagerIOS.h: * platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary): (WebCore::MediaSessionManageriOS::providePresentingApplicationPID): Source/WebKit: Reviewed by Eric Carlson. Export NowPlaying orders to GPU process through IPC if GPUProcess is turned on. Otherwise use the regular in process implementation. Make sure to sync the hasAudio state so that it gets set properly in WebProcess. Remove the use of a PlatformMediaSessionManager for capture since it is now using platform strategies in two places. Instead use directly static methods of MediaSessionManageriOS to implement pid forwarding and AudioSession to set category and buffer size. A follow-up refactoring should probably rearchitect AudioSession handling. * GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::clearNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::setNowPlayingInfo): (WebKit::GPUConnectionToWebProcess::sessionManager): Deleted. * GPUProcess/GPUConnectionToWebProcess.h: * GPUProcess/GPUConnectionToWebProcess.messages.in: * GPUProcess/media/RemoteMediaPlayerProxy.cpp: (WebKit::RemoteMediaPlayerProxy::updateCachedState): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp: (WebKit::UserMediaCaptureManagerProxy::SourceProxy::SourceProxy): (WebKit::UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy): (WebKit::UserMediaCaptureManagerProxy::createMediaSourceForCaptureDeviceWithConstraints): (WebKit::UserMediaCaptureManagerProxy::clone): * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h: * UIProcess/WebProcessProxy.cpp: * WebProcess/GPU/media/WebMediaStrategy.cpp: (WebKit::WebMediaStrategy::clearNowPlayingInfo): (WebKit::WebMediaStrategy::setNowPlayingInfo): * WebProcess/GPU/media/WebMediaStrategy.h: Source/WebKitLegacy/mac: Reviewed by Eric Carlson. Use in-process now playing implementation. * WebCoreSupport/WebPlatformStrategies.mm: Canonical link: https://commits.webkit.org/221544@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-05 11:53:35 +00:00
}
} // namespace WebCore