Remove access from MediaPlayerPrivateMediaSource to MediaSourcePrivat…

…e::buffered https://bugs.webkit.org/show_bug.cgi?id=269560 rdar://problem/123074982 Reviewed by Youenn Fablet. When a MediaSource object is in use, the HTMLMediaElement retrieves the buffered directly from it rather than from the MediaPlayer/MediaPlayerPrivate. As such, we don't need to implement the buffered method for the MediaPlayerPrivateMediaSourceX. No change in observable behaviour, Covered by existing tests. * Source/WebCore/Modules/mediasource/MediaSource.cpp: (WebCore::MediaSource::buffered const): (WebCore::MediaSource::hasBufferedTime): * Source/WebCore/Modules/mediasource/MediaSource.h: * Source/WebCore/html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::mediaPlayerBufferedTimeRangesChanged): * Source/WebCore/platform/graphics/MediaSourcePrivate.cpp: (WebCore::MediaSourcePrivate::hasFutureTime const): (WebCore::MediaSourcePrivate::duration const): (WebCore::MediaSourcePrivate::buffered const): * Source/WebCore/platform/graphics/MediaSourcePrivate.h: * Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm: (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::buffered const): * Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp: (WebCore::MediaPlayerPrivateGStreamerMSE::buffered const): * Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp: (WebCore::MockMediaPlayerMediaSource::buffered const): (WebCore::MockMediaPlayerMediaSource::advanceCurrentTime): Canonical link: https://commits.webkit.org/274824@main
WebKit · Feb 16, 2024 · 06c2726 · 06c2726
1 parent 6619d9b
commit 06c2726
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/Source/WebCore/Modules/mediasource/MediaSource.cpp b/Source/WebCore/Modules/mediasource/MediaSource.cpp
@@ -202,7 +202,7 @@ MediaTime MediaSource::currentTime() const
     return m_private->currentTime();
 }
 
-const PlatformTimeRanges& MediaSource::buffered() const
+PlatformTimeRanges MediaSource::buffered() const
 {
     assertIsCurrent(m_dispatcher);
 
@@ -404,7 +404,7 @@ bool MediaSource::hasBufferedTime(const MediaTime& time)
     if (time > duration())
         return false;
 
-    auto& ranges = m_private->buffered();
+    auto ranges = m_private->buffered();
     if (!ranges.length())
         return false;
 

diff --git a/Source/WebCore/Modules/mediasource/MediaSource.h b/Source/WebCore/Modules/mediasource/MediaSource.h
@@ -87,7 +87,7 @@ class MediaSource
     bool isEnded() const;
     void sourceBufferDidChangeActiveState(SourceBuffer&, bool);
     MediaTime duration() const;
-    const PlatformTimeRanges& buffered() const;
+    PlatformTimeRanges buffered() const;
 
     enum class EndOfStreamError { Network, Decode };
     void streamEndedWithError(std::optional<EndOfStreamError>);

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -8033,13 +8033,11 @@ void HTMLMediaElement::mediaPlayerBufferedTimeRangesChanged()
             if (!track->shouldPurgeCuesFromUnbufferedRanges())
                 continue;
 
-            auto& buffered =
+            track->removeCuesNotInTimeRanges(
 #if ENABLE(MEDIA_SOURCE)
                 m_mediaSource ? m_mediaSource->buffered() :
 #endif
-                m_player->buffered();
-
-            track->removeCuesNotInTimeRanges(buffered);
+                m_player->buffered());
         }
     });
 }

diff --git a/Source/WebCore/platform/graphics/MediaSourcePrivate.cpp b/Source/WebCore/platform/graphics/MediaSourcePrivate.cpp
@@ -39,7 +39,7 @@ bool MediaSourcePrivate::hasFutureTime(const MediaTime& currentTime) const
     if (currentTime >= duration())
         return false;
 
-    auto& ranges = buffered();
+    auto ranges = buffered();
     MediaTime nearest = ranges.nearest(currentTime);
     if (abs(nearest - currentTime) > timeFudgeFactor())
         return false;
@@ -73,7 +73,7 @@ RefPtr<MediaSourcePrivateClient> MediaSourcePrivate::client() const
     return m_client.get();
 }
 
-const MediaTime& MediaSourcePrivate::duration() const
+MediaTime MediaSourcePrivate::duration() const
 {
     Locker locker { m_lock };
 
@@ -163,7 +163,7 @@ void MediaSourcePrivate::bufferedChanged(const PlatformTimeRanges& buffered)
     m_buffered = buffered;
 }
 
-const PlatformTimeRanges& MediaSourcePrivate::buffered() const
+PlatformTimeRanges MediaSourcePrivate::buffered() const
 {
     Locker locker { m_lock };
 

diff --git a/Source/WebCore/platform/graphics/MediaSourcePrivate.h b/Source/WebCore/platform/graphics/MediaSourcePrivate.h
@@ -95,8 +95,8 @@ class WEBCORE_EXPORT MediaSourcePrivate
     virtual void setTimeFudgeFactor(const MediaTime& fudgeFactor) { m_timeFudgeFactor = fudgeFactor; }
     MediaTime timeFudgeFactor() const { return m_timeFudgeFactor; }
 
-    const MediaTime& duration() const;
-    const PlatformTimeRanges& buffered() const;
+    MediaTime duration() const;
+    PlatformTimeRanges buffered() const;
 
     bool hasFutureTime(const MediaTime& currentTime) const;
     bool hasAudio() const;

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
@@ -672,7 +672,8 @@ void getSupportedTypes(HashSet<String>& types) const final
 
 const PlatformTimeRanges& MediaPlayerPrivateMediaSourceAVFObjC::buffered() const
 {
-    return m_mediaSourcePrivate ? m_mediaSourcePrivate->buffered() : PlatformTimeRanges::emptyRanges();
+    ASSERT_NOT_REACHED();
+    return PlatformTimeRanges::emptyRanges();
 }
 
 bool MediaPlayerPrivateMediaSourceAVFObjC::didLoadingProgress() const

diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp
@@ -300,8 +300,7 @@ void MediaPlayerPrivateGStreamerMSE::didPreroll()
 
 const PlatformTimeRanges& MediaPlayerPrivateGStreamerMSE::buffered() const
 {
-    if (m_mediaSourcePrivate)
-        return m_mediaSourcePrivate->buffered();
+    ASSERT_NOT_REACHED();
     return PlatformTimeRanges::emptyRanges();
 }
 

diff --git a/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp b/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp
@@ -177,7 +177,8 @@ MediaTime MockMediaPlayerMediaSource::maxTimeSeekable() const
 
 const PlatformTimeRanges& MockMediaPlayerMediaSource::buffered() const
 {
-    return m_mediaSourcePrivate ? m_mediaSourcePrivate->buffered() : PlatformTimeRanges::emptyRanges();
+    ASSERT_NOT_REACHED();
+    return PlatformTimeRanges::emptyRanges();
 }
 
 bool MockMediaPlayerMediaSource::didLoadingProgress() const
@@ -247,7 +248,7 @@ void MockMediaPlayerMediaSource::advanceCurrentTime()
     if (!m_mediaSourcePrivate)
         return;
 
-    auto& buffered = m_mediaSourcePrivate->buffered();
+    auto buffered = m_mediaSourcePrivate->buffered();
     size_t pos = buffered.find(m_currentTime);
     if (pos == notFound)
         return;