Remove MediaSourcePrivateClient::seeked()

https://bugs.webkit.org/show_bug.cgi?id=273390 rdar://127218331 Reviewed by Jer Noble. Remove method and instead use MediaPlayerClient::mediaPlayerSeeked method to achieve the same behaviour. * Source/WebCore/Modules/mediasource/MediaSource.cpp: (WebCore::MediaSource::seeked): Deleted. * Source/WebCore/Modules/mediasource/MediaSource.h: * Source/WebCore/html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::mediaPlayerSeeked): * Source/WebCore/html/HTMLMediaElement.h: * Source/WebCore/platform/graphics/MediaSourcePrivate.cpp: (WebCore::MediaSourcePrivate::seeked): Deleted. * Source/WebCore/platform/graphics/MediaSourcePrivate.h: * Source/WebCore/platform/graphics/MediaSourcePrivateClient.h: * Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h: * Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm: (WebCore::MediaSourcePrivateAVFObjC::seeked): Deleted. * Source/WebKit/GPUProcess/media/RemoteMediaSourceProxy.h: * Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp: (WebKit::MediaPlayerPrivateRemote::seeked): Canonical link: https://commits.webkit.org/278667@main
WebKit · May 13, 2024 · f729bf5 · f729bf5
1 parent c0cc24b
commit f729bf5
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 41 deletions.
diff --git a/Source/WebCore/Modules/mediasource/MediaSource.cpp b/Source/WebCore/Modules/mediasource/MediaSource.cpp
@@ -165,13 +165,6 @@ class MediaSourceClientImpl final : public MediaSourcePrivateClient {
         });
     }
 
-    void seeked(const MediaTime& time)
-    {
-        ensureWeakOnDispatcher([time = time](MediaSource& parent) {
-            parent.seeked(time);
-        });
-    }
-
 #if !RELEASE_LOG_DISABLED
     void setLogIdentifier(const void* identifier)
     {
@@ -1481,15 +1474,6 @@ void MediaSource::failedToCreateRenderer(RendererType type)
         context->addConsoleMessage(MessageSource::JS, MessageLevel::Error, makeString("MediaSource ", type == RendererType::Video ? "video" : "audio", " renderer creation failed."));
 }
 
-void MediaSource::seeked(const MediaTime& time)
-{
-    ALWAYS_LOG(LOGIDENTIFIER, time);
-#if RELEASE_LOG_DISABLED
-    UNUSED_PARAM(time);
-#endif
-    monitorSourceBuffers();
-}
-
 void MediaSource::sourceBufferReceivedFirstInitializationSegmentChanged()
 {
     if (m_private && m_private->mediaPlayerReadyState() == MediaPlayer::ReadyState::HaveNothing) {

diff --git a/Source/WebCore/Modules/mediasource/MediaSource.h b/Source/WebCore/Modules/mediasource/MediaSource.h
@@ -201,7 +201,6 @@ class MediaSource
     Ref<MediaPromise> seekToTime(const MediaTime&);
     using RendererType = MediaSourcePrivateClient::RendererType;
     void failedToCreateRenderer(RendererType);
-    void seeked(const MediaTime&);
 
     void refEventTarget() final { ref(); }
     void derefEventTarget() final { deref(); }

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -5788,6 +5788,16 @@ void HTMLMediaElement::mediaPlayerMuteChanged()
     endProcessingMediaPlayerCallback();
 }
 
+void HTMLMediaElement::mediaPlayerSeeked(const MediaTime&)
+{
+    ALWAYS_LOG(LOGIDENTIFIER);
+
+#if ENABLE(MEDIA_SOURCE)
+    if (m_mediaSource)
+        m_mediaSource->monitorSourceBuffers(); // Update readyState.
+#endif
+}
+
 void HTMLMediaElement::mediaPlayerDurationChanged()
 {
     beginProcessingMediaPlayerCallback();

diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h
@@ -730,6 +730,7 @@ class HTMLMediaElement
     void mediaPlayerTimeChanged() final;
     void mediaPlayerVolumeChanged() final;
     void mediaPlayerMuteChanged() final;
+    void mediaPlayerSeeked(const MediaTime&) final;
     void mediaPlayerDurationChanged() final;
     void mediaPlayerRateChanged() final;
     void mediaPlayerPlaybackStateChanged() final;

diff --git a/Source/WebCore/platform/graphics/MediaSourcePrivate.cpp b/Source/WebCore/platform/graphics/MediaSourcePrivate.cpp
@@ -109,12 +109,6 @@ Ref<MediaPromise> MediaSourcePrivate::seekToTime(const MediaTime& time)
     return MediaPromise::createAndReject(PlatformMediaError::ClientDisconnected);
 }
 
-void MediaSourcePrivate::seeked(const MediaTime& time)
-{
-    if (RefPtr client = this->client())
-        return client->seeked(time);
-}
-
 void MediaSourcePrivate::removeSourceBuffer(SourceBufferPrivate& sourceBuffer)
 {
     assertIsCurrent(m_dispatcher);

diff --git a/Source/WebCore/platform/graphics/MediaSourcePrivate.h b/Source/WebCore/platform/graphics/MediaSourcePrivate.h
@@ -98,7 +98,6 @@ class WEBCORE_EXPORT MediaSourcePrivate
 
     Ref<MediaTimePromise> waitForTarget(const SeekTarget&);
     Ref<MediaPromise> seekToTime(const MediaTime&);
-    void seeked(const MediaTime&);
 
     virtual void setTimeFudgeFactor(const MediaTime& fudgeFactor) { m_timeFudgeFactor = fudgeFactor; }
     MediaTime timeFudgeFactor() const { return m_timeFudgeFactor; }

diff --git a/Source/WebCore/platform/graphics/MediaSourcePrivateClient.h b/Source/WebCore/platform/graphics/MediaSourcePrivateClient.h
@@ -45,7 +45,6 @@ class MediaSourcePrivateClient : public ThreadSafeRefCountedAndCanMakeThreadSafe
     virtual void setPrivateAndOpen(Ref<MediaSourcePrivate>&&) = 0;
     virtual Ref<MediaTimePromise> waitForTarget(const SeekTarget&) = 0;
     virtual Ref<MediaPromise> seekToTime(const MediaTime&) = 0;
-    virtual void seeked(const MediaTime&) = 0;
 
 #if !RELEASE_LOG_DISABLED
     virtual void setLogIdentifier(const void*) = 0;

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h
@@ -78,7 +78,6 @@ class MediaSourcePrivateAVFObjC final
     bool hasSelectedVideo() const;
 
     void willSeek();
-    void seeked(const MediaTime&);
 
     FloatSize naturalSize() const;
 

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm
@@ -173,12 +173,6 @@
         downcast<SourceBufferPrivateAVFObjC>(sourceBuffer)->willSeek();
 }
 
-void MediaSourcePrivateAVFObjC::seeked(const MediaTime& time)
-{
-    if (RefPtr client = this->client())
-        client->seeked(time);
-}
-
 FloatSize MediaSourcePrivateAVFObjC::naturalSize() const
 {
     FloatSize result;

diff --git a/Source/WebKit/GPUProcess/media/RemoteMediaSourceProxy.h b/Source/WebKit/GPUProcess/media/RemoteMediaSourceProxy.h
@@ -66,9 +66,6 @@ class RemoteMediaSourceProxy final
     Ref<WebCore::MediaTimePromise> waitForTarget(const WebCore::SeekTarget&) final;
     Ref<WebCore::MediaPromise> seekToTime(const MediaTime&) final;
 
-    // Handled by MediaPlayerPrivateRemote:
-    void seeked(const MediaTime&) final { };
-
 #if !RELEASE_LOG_DISABLED
     void setLogIdentifier(const void*) final;
 #endif

diff --git a/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp b/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp
@@ -508,12 +508,6 @@ void MediaPlayerPrivateRemote::seeked(MediaTimeUpdateData&& timeData)
     m_currentTimeEstimator.setTime(timeData);
     if (auto player = m_player.get())
         player->seeked(timeData.currentTime);
-#if ENABLE(MEDIA_SOURCE)
-    // This message may well have been handled by the MediaSource object before
-    // theis message, which would result in the wrong
-    if (RefPtr mediaSourcePrivate = m_mediaSourcePrivate)
-        return mediaSourcePrivate->seeked(timeData.currentTime);
-#endif
 }
 
 void MediaPlayerPrivateRemote::timeChanged(RemoteMediaPlayerState&& state, MediaTimeUpdateData&& timeData)