Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 71b6d3a51a9e0df507c3ddb7cb63afe1914a709d
https://github.com/WebKit/WebKit/commit/71b6d3a51a9e0df507c3ddb7cb63afe1914a709d
Author: Jer Noble <[email protected]>
Date: 2025-05-09 (Fri, 09 May 2025)
Changed paths:
M Source/JavaScriptCore/inspector/protocol/DOM.json
M Source/WTF/wtf/Forward.h
M Source/WTF/wtf/JSONValues.cpp
M Source/WTF/wtf/JSONValues.h
M Source/WTF/wtf/Logger.h
M Source/WebCore/Headers.cmake
M Source/WebCore/Modules/encryptedmedia/NavigatorEME.cpp
M Source/WebCore/WebCore.xcodeproj/project.pbxproj
M Source/WebCore/html/HTMLMediaElement.cpp
M Source/WebCore/html/HTMLMediaElement.h
M Source/WebCore/html/MediaElementSession.cpp
M Source/WebCore/html/MediaElementSession.h
M Source/WebCore/html/track/AudioTrack.cpp
M Source/WebCore/html/track/AudioTrackClient.h
M Source/WebCore/html/track/VideoTrack.cpp
M Source/WebCore/html/track/VideoTrackClient.h
M Source/WebCore/html/track/VideoTrackConfiguration.cpp
M Source/WebCore/html/track/VideoTrackConfiguration.h
M Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
M Source/WebCore/platform/cocoa/PlaybackSessionModel.h
M Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.h
M Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm
M Source/WebCore/platform/graphics/MediaPlayer.cpp
M Source/WebCore/platform/graphics/PlatformVideoTrackConfiguration.h
A Source/WebCore/platform/graphics/VideoProjectionMetadata.h
M Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h
M Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
M
Source/WebCore/platform/graphics/avfoundation/FormatDescriptionUtilities.cpp
M Source/WebCore/platform/graphics/avfoundation/FormatDescriptionUtilities.h
M
Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm
M
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h
M
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
M
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp
M
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.h
M
Source/WebCore/platform/graphics/avfoundation/objc/TextTrackPrivateMediaSourceAVFObjC.cpp
M
Source/WebCore/platform/graphics/avfoundation/objc/TextTrackPrivateMediaSourceAVFObjC.h
M
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp
M
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h
M
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.h
M
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm
M Source/WebCore/platform/graphics/cocoa/NullVideoPresentationInterface.h
M Source/WebCore/platform/graphics/cocoa/VideoTrackPrivateWebM.cpp
M Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
M Source/WebInspectorUI/UserInterface/Views/MediaDetailsSidebarPanel.js
M Source/WebKit/Platform/ios/PlaybackSessionInterfaceLMK.h
M Source/WebKit/Platform/ios/PlaybackSessionInterfaceLMK.mm
M Source/WebKit/Shared/WTFArgumentCoders.serialization.in
M Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
M Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.h
M Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in
M Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm
M Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.h
M Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm
Log Message:
-----------
Add logging and Web Inspector support for spatial and projection metadata
rdar://150615061
https://bugs.webkit.org/show_bug.cgi?id=292507
Reviewed by Jean-Yves Avenard.
Add an enumerated list of projection types, and pass that metadata as well
as spatialVideoMetadata through to the Web Inspector, as well as the UIProcess.
Drive-by fixes:
- Add a change observer to VideoTrackConfiguration to allow clients to be
notified
of changes to the configuration without requiring a Client superclass.
- Make AVTrackPrivateAVFObjCImpl reference-counted.
- Compare AVAssetTrack.mediaType and AVMediaSelectionOption.mediaType with
-isEqualToString:
rather than pointer equality.
* Source/JavaScriptCore/inspector/protocol/DOM.json:
* Source/WTF/wtf/Forward.h:
* Source/WTF/wtf/Logger.h:
(WTF::LogArgument<std::optional<T>>::toString):
* Source/WebCore/Modules/encryptedmedia/NavigatorEME.cpp:
(WTF::LogArgument<std::optional<T>>::toString): Deleted.
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::audioTrackConfigurationChanged):
(WebCore::HTMLMediaElement::videoTrackConfigurationChanged):
(WebCore::HTMLMediaElement::addAudioTrack):
(WebCore::HTMLMediaElement::addVideoTrack):
(WebCore::HTMLMediaElement::removeAudioTrack):
(WebCore::HTMLMediaElement::removeVideoTrack):
* Source/WebCore/html/HTMLMediaElement.h:
* Source/WebCore/html/MediaElementSession.cpp:
(WebCore::MediaElementSession::descriptionForTrack):
(WebCore::MediaElementSession::description const):
* Source/WebCore/html/MediaElementSession.h:
* Source/WebCore/html/track/AudioTrack.cpp:
(WebCore::AudioTrack::configurationChanged):
* Source/WebCore/html/track/AudioTrackClient.h:
(WebCore::AudioTrackClient::audioTrackConfigurationChanged):
* Source/WebCore/html/track/VideoTrack.cpp:
(WebCore::VideoTrack::configurationChanged):
* Source/WebCore/html/track/VideoTrackClient.h:
(WebCore::VideoTrackClient::videoTrackConfigurationChanged):
* Source/WebCore/html/track/VideoTrackConfiguration.cpp:
(WebCore::VideoTrackConfiguration::setState):
(WebCore::VideoTrackConfiguration::setCodec):
(WebCore::VideoTrackConfiguration::setWidth):
(WebCore::VideoTrackConfiguration::setHeight):
(WebCore::VideoTrackConfiguration::setColorSpace):
(WebCore::VideoTrackConfiguration::setFramerate):
(WebCore::VideoTrackConfiguration::setBitrate):
(WebCore::VideoTrackConfiguration::setSpatialVideoMetadata):
(WebCore::VideoTrackConfiguration::setVideoProjectionMetadata):
(WebCore::VideoTrackConfiguration::notifyObservers):
(WebCore::VideoTrackConfiguration::toJSON const):
* Source/WebCore/html/track/VideoTrackConfiguration.h:
(WebCore::VideoTrackConfiguration::videoProjectionMetadata const):
(WebCore::VideoTrackConfiguration::setState): Deleted.
(WebCore::VideoTrackConfiguration::setCodec): Deleted.
(WebCore::VideoTrackConfiguration::setWidth): Deleted.
(WebCore::VideoTrackConfiguration::setHeight): Deleted.
(WebCore::VideoTrackConfiguration::setColorSpace): Deleted.
(WebCore::VideoTrackConfiguration::setFramerate): Deleted.
(WebCore::VideoTrackConfiguration::setBitrate): Deleted.
(WebCore::VideoTrackConfiguration::setSpatialVideoMetadata): Deleted.
(WebCore::VideoTrackConfiguration::isImmersiveVideo const): Deleted.
(WebCore::VideoTrackConfiguration::setIsImmersiveVideo): Deleted.
* Source/WebCore/inspector/agents/InspectorDOMAgent.cpp:
(WebCore::videoProjectionMetadataKind):
(WebCore::InspectorDOMAgent::getMediaStats):
* Source/WebCore/platform/cocoa/PlaybackSessionModel.h:
(WebCore::PlaybackSessionModelClient::supportsLinearMediaPlayerChanged):
(WebCore::PlaybackSessionModelClient::spatialVideoMetadataChanged):
(WebCore::PlaybackSessionModelClient::videoProjectionMetadataChanged):
(WebCore::PlaybackSessionModelClient::isImmersiveVideoChanged): Deleted.
* Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.h:
* Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm:
(WebCore::PlaybackSessionModelMediaElement::videoTrackConfigurationChanged):
(WebCore::PlaybackSessionModelMediaElement::maybeUpdateVideoMetadata):
(WebCore::PlaybackSessionModelMediaElement::seekableRanges const):
(WebCore::PlaybackSessionModelMediaElement::isInWindowFullscreenActive const):
(WebCore::PlaybackSessionModelMediaElement::logIdentifier const):
* Source/WebCore/platform/graphics/MediaPlayer.cpp:
(WebCore::convertEnumerationToString):
(WebCore::convertVideoProjectionMetadataToString):
* Source/WebCore/platform/graphics/PlatformVideoTrackConfiguration.h:
* Source/WebCore/platform/graphics/VideoProjectionMetadata.h: Copied from
Source/WebCore/html/track/VideoTrackClient.h.
(WTF::LogArgument<WebCore::VideoProjectionMetadata>::toString):
* Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h:
* Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm:
(WebCore::AVTrackPrivateAVFObjCImpl::initializeAssetTrack):
(WebCore::AVTrackPrivateAVFObjCImpl::initializationCompleted):
(WebCore::AVTrackPrivateAVFObjCImpl::readyState const):
(WebCore::AVTrackPrivateAVFObjCImpl::videoTrackConfiguration const):
(WebCore::AVTrackPrivateAVFObjCImpl::spatialVideoMetadata const):
(WebCore::AVTrackPrivateAVFObjCImpl::videoProjectionMetadata const):
(WebCore::AVTrackPrivateAVFObjCImpl::isImmersiveVideo const): Deleted.
* Source/WebCore/platform/graphics/avfoundation/FormatDescriptionUtilities.cpp:
(WebCore::spatialVideoMetadataFromFormatDescription):
(WebCore::videoProjectionMetadataFromFormatDescription):
(WebCore::videoMetadataFromFormatDescription): Deleted.
* Source/WebCore/platform/graphics/avfoundation/FormatDescriptionUtilities.h:
* Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm:
(WebCore::AudioTrackPrivateAVFObjC::AudioTrackPrivateAVFObjC):
(WebCore::AudioTrackPrivateAVFObjC::resetPropertiesFromTrack):
*
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp:
(WebCore::AudioTrackPrivateMediaSourceAVFObjC::AudioTrackPrivateMediaSourceAVFObjC):
*
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/TextTrackPrivateMediaSourceAVFObjC.cpp:
(WebCore::m_impl):
*
Source/WebCore/platform/graphics/avfoundation/objc/TextTrackPrivateMediaSourceAVFObjC.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp:
(WebCore::VideoTrackPrivateAVFObjC::VideoTrackPrivateAVFObjC):
(WebCore::VideoTrackPrivateAVFObjC::resetPropertiesFromTrack):
* Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm:
(WebCore::VideoTrackPrivateMediaSourceAVFObjC::VideoTrackPrivateMediaSourceAVFObjC):
* Source/WebCore/platform/graphics/cocoa/NullVideoPresentationInterface.h:
* Source/WebCore/platform/graphics/cocoa/VideoTrackPrivateWebM.cpp:
(WebCore::VideoTrackPrivateWebM::updateConfiguration):
* Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:
* Source/WebInspectorUI/UserInterface/Views/MediaDetailsSidebarPanel.js:
(WI.MediaDetailsSidebarPanel):
(WI.MediaDetailsSidebarPanel.prototype.layout):
(WI.MediaDetailsSidebarPanel.prototype.initialLayout):
(WI.MediaDetailsSidebarPanel.prototype.localizedVideoProjectionMetadataKindString):
(WI.MediaDetailsSidebarPanel.prototype.setVideo):
* Source/WebKit/Platform/IPC/ArgumentCoders.cpp:
(IPC::ArgumentCoder<JSON::Value>::encode):
(IPC::ArgumentCoder<JSON::Value>::decode):
* Source/WebKit/Platform/IPC/ArgumentCoders.h:
* Source/WebKit/Platform/ios/PlaybackSessionInterfaceLMK.h:
* Source/WebKit/Platform/ios/PlaybackSessionInterfaceLMK.mm:
(WebKit::PlaybackSessionInterfaceLMK::videoProjectionMetadataChanged):
(WebKit::PlaybackSessionInterfaceLMK::isImmersiveVideoChanged): Deleted.
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
* Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.h:
* Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in:
* Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm:
(WebKit::PlaybackSessionModelContext::spatialVideoMetadataChanged):
(WebKit::PlaybackSessionModelContext::videoProjectionMetadataChanged):
(WebKit::PlaybackSessionManagerProxy::videoProjectionMetadataChanged):
(WebKit::PlaybackSessionModelContext::isImmersiveVideoChanged): Deleted.
(WebKit::PlaybackSessionManagerProxy::isImmersiveVideoChanged): Deleted.
* Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.h:
* Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm:
(WebKit::PlaybackSessionInterfaceContext::videoProjectionMetadataChanged):
(WebKit::PlaybackSessionManager::videoProjectionMetadataChanged):
(WebKit::PlaybackSessionInterfaceContext::isImmersiveVideoChanged): Deleted.
(WebKit::PlaybackSessionManager::isImmersiveVideoChanged): Deleted.
Canonical link: https://commits.webkit.org/294733@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
