Changeset 258024 in webkit

Timestamp:

Mar 6, 2020 12:52:52 PM (4 years ago)

Author:

youenn@apple.com

Message:

Use ObjectIdentifier to identify media sessions
​https://bugs.webkit.org/show_bug.cgi?id=208710

Reviewed by Eric Carlson.

Source/WebCore:

No change of behavior, except that the identifier is now stable over time and unique per process.

• Headers.cmake:
• WebCore.xcodeproj/project.pbxproj:
• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::HTMLMediaElement):
(WebCore::HTMLMediaElement::mediaSessionUniqueIdentifier const):

• html/HTMLMediaElement.h:
• platform/audio/NowPlayingInfo.h:

(WebCore::NowPlayingInfo::decode):

• platform/audio/PlatformMediaSessionManager.h:

(WebCore::PlatformMediaSessionManager::lastUpdatedNowPlayingInfoUniqueIdentifier const):

• platform/audio/cocoa/MediaSessionManagerCocoa.h:
• platform/audio/cocoa/MediaSessionManagerCocoa.mm:

(MediaSessionManagerCocoa::setNowPlayingInfo):
(MediaSessionManagerCocoa::updateNowPlayingInfo):

• testing/Internals.cpp:

(WebCore::Internals::nowPlayingState const):

Source/WebKit:

• WebProcess/WebPage/Cocoa/WebPageCocoa.mm:

(WebKit::WebPage::requestActiveNowPlayingSessionInfo):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Headers.cmake (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)
• WebCore/html/HTMLMediaElement.h (modified) (3 diffs)
• WebCore/platform/MediaSessionIdentifier.h (added)
• WebCore/platform/audio/NowPlayingInfo.h (modified) (3 diffs)
• WebCore/platform/audio/PlatformMediaSessionManager.h (modified) (2 diffs)
• WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.h (modified) (2 diffs)
• WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm (modified) (2 diffs)
• WebCore/testing/Internals.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-06  Youenn Fablet  <youenn@apple.com>
+
+        Use ObjectIdentifier to identify media sessions
+        https://bugs.webkit.org/show_bug.cgi?id=208710
+
+        Reviewed by Eric Carlson.
+
+        No change of behavior, except that the identifier is now stable over time and unique per process.
+
+        * Headers.cmake:
+        * WebCore.xcodeproj/project.pbxproj:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement):
+        (WebCore::HTMLMediaElement::mediaSessionUniqueIdentifier const):
+        * html/HTMLMediaElement.h:
+        * platform/audio/NowPlayingInfo.h:
+        (WebCore::NowPlayingInfo::decode):
+        * platform/audio/PlatformMediaSessionManager.h:
+        (WebCore::PlatformMediaSessionManager::lastUpdatedNowPlayingInfoUniqueIdentifier const):
+        * platform/audio/cocoa/MediaSessionManagerCocoa.h:
+        * platform/audio/cocoa/MediaSessionManagerCocoa.mm:
+        (MediaSessionManagerCocoa::setNowPlayingInfo):
+        (MediaSessionManagerCocoa::updateNowPlayingInfo):
+        * testing/Internals.cpp:
+        (WebCore::Internals::nowPlayingState const):
+
 2020-03-06  Jason Lawrence  <lawrence.j@apple.com>
 

trunk/Source/WebCore/Headers.cmake

@@ -951 +951 @@
     platform/MediaSample.h
     platform/MediaSelectionOption.h
+    platform/MediaSessionIdentifier.h
     platform/MediaStrategy.h
     platform/NowPlayingManager.h

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1056 +1056 @@
                 413CCD4A20DE034F0065A21A /* MockMediaDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 413CCD4820DE013C0065A21A /* MockMediaDevice.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 413E00791DB0E4F2002341D2 /* MemoryRelease.h in Headers */ = {isa = PBXBuildFile; fileRef = 413E00781DB0E4DE002341D2 /* MemoryRelease.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                414460A22412994500814BE7 /* MediaSessionIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 414460A02412994100814BE7 /* MediaSessionIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 414598C223C8D177002B9CC8 /* LocalSampleBufferDisplayLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 414598C123C8AD79002B9CC8 /* LocalSampleBufferDisplayLayer.mm */; };
                 414B82051D6DF0E50077EBE3 /* StructuredClone.h in Headers */ = {isa = PBXBuildFile; fileRef = 414B82031D6DF0D90077EBE3 /* StructuredClone.h */; };
@@ -7318 +7319 @@
                 413E007B1DB0E707002341D2 /* MemoryReleaseCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MemoryReleaseCocoa.mm; sourceTree = "<group>"; };
                 413FC4CD1FD1DD8C00541C4B /* ServiceWorkerClientQueryOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServiceWorkerClientQueryOptions.h; sourceTree = "<group>"; };
+                414460A02412994100814BE7 /* MediaSessionIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSessionIdentifier.h; sourceTree = "<group>"; };
                 414598BE23C8AAB8002B9CC8 /* SampleBufferDisplayLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SampleBufferDisplayLayer.h; sourceTree = "<group>"; };
                 414598C023C8AD78002B9CC8 /* LocalSampleBufferDisplayLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalSampleBufferDisplayLayer.h; sourceTree = "<group>"; };
@@ -25969 +25971 @@
                                 CD641EC7181ED60100EE4C41 /* MediaSample.h */,
                                 A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */,
+                                414460A02412994100814BE7 /* MediaSessionIdentifier.h */,
                                 9B1229C623FE4D5F008CA751 /* MediaStrategy.h */,
                                 BC772C4C0C4EB3040083285F /* MIMETypeRegistry.cpp */,
@@ -32795 +32798 @@
                                 93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,
                                 A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */,
+                                414460A22412994500814BE7 /* MediaSessionIdentifier.h in Headers */,
                                 448B1B7A0F3A2F9B0047A9E2 /* TextSizeAdjustment.h in Headers */,
                                 9759E94014EF1CF80026A2DD /* TextTrack.h in Headers */,

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -465 +465 @@
     , m_logIdentifier(uniqueLogIdentifier())
 #endif
+    , m_mediaSessionIdentifier(MediaSessionIdentifier::generate())
 {
     allMediaElements().add(this);
@@ -7648 +7649 @@
 }
 
-uint64_t HTMLMediaElement::mediaSessionUniqueIdentifier() const
-{
-    auto& url = m_currentSrc.string();
-    return url.impl() ? url.impl()->hash() : 0;
+MediaSessionIdentifier HTMLMediaElement::mediaSessionUniqueIdentifier() const
+{
+    return m_mediaSessionIdentifier;
 }
 

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -39 +39 @@
 #include "MediaPlayer.h"
 #include "MediaProducer.h"
+#include "MediaSessionIdentifier.h"
 #include "VisibilityChangeClient.h"
 #include <wtf/Function.h>
@@ -593 +594 @@
     void applicationDidBecomeActive();
 
-    uint64_t mediaSessionUniqueIdentifier() const;
+    MediaSessionIdentifier mediaSessionUniqueIdentifier() const;
     String mediaSessionTitle() const;
     String sourceApplicationIdentifier() const;
@@ -1212 +1213 @@
     bool m_playingOnSecondScreen { false };
     bool m_removedBehaviorRestrictionsAfterFirstUserGesture { false };
+    MediaSessionIdentifier m_mediaSessionIdentifier;
 };
 

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

@@ -26 +26 @@
 #pragma once
 
+#include "MediaSessionIdentifier.h"
 #include <wtf/text/WTFString.h>
 
@@ -36 +37 @@
     double currentTime { 0 };
     bool supportsSeeking { false };
-    uint64_t uniqueIdentifier { 0 };
+    MediaSessionIdentifier uniqueIdentifier;
     bool isPlaying { false };
     bool allowsNowPlayingControlsVisibility { false };
@@ -71 +72 @@
         return { };
 
-    uint64_t uniqueIdentifier;
+    MediaSessionIdentifier uniqueIdentifier;
     if (!decoder.decode(uniqueIdentifier))
         return { };

trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h

@@ -28 +28 @@
 
 #include "DocumentIdentifier.h"
+#include "MediaSessionIdentifier.h"
 #include "PlatformMediaSession.h"
 #include "Timer.h"
@@ -69 +70 @@
     virtual double lastUpdatedNowPlayingDuration() const { return NAN; }
     virtual double lastUpdatedNowPlayingElapsedTime() const { return NAN; }
-    virtual uint64_t lastUpdatedNowPlayingInfoUniqueIdentifier() const { return 0; }
+    virtual MediaSessionIdentifier lastUpdatedNowPlayingInfoUniqueIdentifier() const { return { }; }
     virtual bool registeredAsNowPlayingApplication() const { return false; }
     virtual void prepareToSendUserMediaPermissionRequest() { }

trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.h

@@ -54 +54 @@
     double lastUpdatedNowPlayingDuration() const final { return m_lastUpdatedNowPlayingDuration; }
     double lastUpdatedNowPlayingElapsedTime() const final { return m_lastUpdatedNowPlayingElapsedTime; }
-    uint64_t lastUpdatedNowPlayingInfoUniqueIdentifier() const final { return m_lastUpdatedNowPlayingInfoUniqueIdentifier; }
+    MediaSessionIdentifier lastUpdatedNowPlayingInfoUniqueIdentifier() const final { return m_lastUpdatedNowPlayingInfoUniqueIdentifier; }
     bool registeredAsNowPlayingApplication() const final { return m_registeredAsNowPlayingApplication; }
     void prepareToSendUserMediaPermissionRequest() final;
@@ -104 +104 @@
     double m_lastUpdatedNowPlayingDuration { NAN };
     double m_lastUpdatedNowPlayingElapsedTime { NAN };
-    uint64_t m_lastUpdatedNowPlayingInfoUniqueIdentifier { 0 };
+    MediaSessionIdentifier m_lastUpdatedNowPlayingInfoUniqueIdentifier;
 
     GenericTaskQueue<Timer> m_nowPlayingUpdateTaskQueue;

trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm

@@ -244 +244 @@
     CFDictionarySetValue(info.get(), kMRMediaRemoteNowPlayingInfoPlaybackRate, cfRate.get());
 
-    auto lastUpdatedNowPlayingInfoUniqueIdentifier = nowPlayingInfo.uniqueIdentifier;
+    auto lastUpdatedNowPlayingInfoUniqueIdentifier = nowPlayingInfo.uniqueIdentifier.toUInt64();
     auto cfIdentifier = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberLongLongType, &lastUpdatedNowPlayingInfoUniqueIdentifier));
     CFDictionarySetValue(info.get(), kMRMediaRemoteNowPlayingInfoUniqueIdentifier, cfIdentifier.get());
@@ -302 +302 @@
         m_lastUpdatedNowPlayingDuration = NAN;
         m_lastUpdatedNowPlayingElapsedTime = NAN;
-        m_lastUpdatedNowPlayingInfoUniqueIdentifier = 0;
+        m_lastUpdatedNowPlayingInfoUniqueIdentifier = { };
 
         return;
     }
 
-    ALWAYS_LOG(LOGIDENTIFIER, "title = \"", nowPlayingInfo->title, "\", isPlaying = ", nowPlayingInfo->isPlaying, ", duration = ", nowPlayingInfo->duration, ", now = ", nowPlayingInfo->currentTime, ", id = ", nowPlayingInfo->uniqueIdentifier, ", registered = ", m_registeredAsNowPlayingApplication);
+    ALWAYS_LOG(LOGIDENTIFIER, "title = \"", nowPlayingInfo->title, "\", isPlaying = ", nowPlayingInfo->isPlaying, ", duration = ", nowPlayingInfo->duration, ", now = ", nowPlayingInfo->currentTime, ", id = ", nowPlayingInfo->uniqueIdentifier.toUInt64(), ", registered = ", m_registeredAsNowPlayingApplication);
 
     platformStrategies()->mediaStrategy().setNowPlayingInfo(!m_registeredAsNowPlayingApplication, *nowPlayingInfo);

trunk/Source/WebCore/testing/Internals.cpp

@@ -4166 +4166 @@
         PlatformMediaSessionManager::sharedManager().lastUpdatedNowPlayingDuration(),
         PlatformMediaSessionManager::sharedManager().lastUpdatedNowPlayingElapsedTime(),
-        PlatformMediaSessionManager::sharedManager().lastUpdatedNowPlayingInfoUniqueIdentifier(),
+        PlatformMediaSessionManager::sharedManager().lastUpdatedNowPlayingInfoUniqueIdentifier().toUInt64(),
         PlatformMediaSessionManager::sharedManager().hasActiveNowPlayingSession(),
         PlatformMediaSessionManager::sharedManager().registeredAsNowPlayingApplication()

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-03-06  Youenn Fablet  <youenn@apple.com>
+
+        Use ObjectIdentifier to identify media sessions
+        https://bugs.webkit.org/show_bug.cgi?id=208710
+
+        Reviewed by Eric Carlson.
+
+        * WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
+        (WebKit::WebPage::requestActiveNowPlayingSessionInfo):
+
 2020-03-05  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm

@@ -71 +71 @@
         duration = sharedManager->lastUpdatedNowPlayingDuration();
         elapsedTime = sharedManager->lastUpdatedNowPlayingElapsedTime();
-        uniqueIdentifier = sharedManager->lastUpdatedNowPlayingInfoUniqueIdentifier();
+        uniqueIdentifier = sharedManager->lastUpdatedNowPlayingInfoUniqueIdentifier().toUInt64();
         registeredAsNowPlayingApplication = sharedManager->registeredAsNowPlayingApplication();
     }