Move duplicated methods from MediaSourcePrivate/SourceBufferPrivate t…

…o base class

https://bugs.webkit.org/show_bug.cgi?id=264142
rdar://117892834

Reviewed by Jer Noble.

We have three MSE implementations in our tree:
- Cocoa/AVFObjC
- Mock
- GStreamer

In a lot of instances, all three duplicate the same code. It makes it harder to maintain and too easy to introduce discrepancy between the three implementations.

So we move to their respective base classes what can be moved.

Covered by existing tests.

* Source/WebCore/platform/graphics/MediaSourcePrivate.cpp:
(WebCore::MediaSourcePrivate::~MediaSourcePrivate):
(WebCore::MediaSourcePrivate::removeSourceBuffer):
(WebCore::MediaSourcePrivate::sourceBufferPrivateDidChangeActiveState):
(WebCore::MediaSourcePrivate::hasAudio const):
(WebCore::MediaSourcePrivate::hasVideo const):
(WebCore::MediaSourcePrivate::setCDMSession):
* Source/WebCore/platform/graphics/MediaSourcePrivate.h:
(WebCore::MediaSourcePrivate::bufferedChanged): Deleted.
(WebCore::MediaSourcePrivate::setTimeFudgeFactor): Deleted.
(WebCore::MediaSourcePrivate::timeFudgeFactor const): Deleted.
* Source/WebCore/platform/graphics/SourceBufferPrivate.cpp:
(WebCore::SourceBufferPrivate::SourceBufferPrivate):
(WebCore::SourceBufferPrivate::removedFromMediaSource):
(WebCore::SourceBufferPrivate::currentMediaTime const):
(WebCore::SourceBufferPrivate::duration const):
(WebCore::SourceBufferPrivate::setActive):
* Source/WebCore/platform/graphics/SourceBufferPrivate.h:
(WebCore::SourceBufferPrivate::clearMediaSource):
(WebCore::SourceBufferPrivate::didReceiveInitializationSegment const):
(WebCore::SourceBufferPrivate::setCDMSession):
(WebCore::SourceBufferPrivate::setCDMInstance):
(WebCore::SourceBufferPrivate::waitingForKey const):
(WebCore::SourceBufferPrivate::attemptToDecrypt):
(WebCore::SourceBufferPrivate::isActive const):
(WebCore::SourceBufferPrivate::isSeeking const):
(WebCore::SourceBufferPrivate::currentMediaTime const): Deleted.
(WebCore::SourceBufferPrivate::duration const): Deleted.
* Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::shouldEnsureLayer const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setCDMSession):
* Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm:
(WebCore::MediaSourcePrivateAVFObjC::MediaSourcePrivateAVFObjC):
(WebCore::MediaSourcePrivateAVFObjC::~MediaSourcePrivateAVFObjC):
(WebCore::MediaSourcePrivateAVFObjC::addSourceBuffer):
(WebCore::MediaSourcePrivateAVFObjC::removeSourceBuffer):
(WebCore::MediaSourcePrivateAVFObjC::notifyActiveSourceBuffersChanged):
(WebCore::MediaSourcePrivateAVFObjC::markEndOfStream):
(WebCore::MediaSourcePrivateAVFObjC::hasSelectedVideo const):
(WebCore::MediaSourcePrivateAVFObjC::willSeek):
(WebCore::MediaSourcePrivateAVFObjC::naturalSize const):
(WebCore::MediaSourcePrivateAVFObjC::flushActiveSourceBuffersIfNeeded):
(WebCore::MediaSourcePrivateAVFObjC::needsVideoLayer const):
(WebCore::MediaSourcePrivateAVFObjC::unmarkEndOfStream): Deleted.
(WebCore::MediaSourcePrivateAVFObjC::sourceBufferPrivateDidChangeActiveState): Deleted.
(WebCore::MediaSourcePrivateAVFObjCHasAudio): Deleted.
(WebCore::MediaSourcePrivateAVFObjC::hasAudio const): Deleted.
(WebCore::MediaSourcePrivateAVFObjC::hasVideo const): Deleted.
* Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
(isType):
* Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::SourceBufferPrivateAVFObjC::create):
(WebCore::SourceBufferPrivateAVFObjC::SourceBufferPrivateAVFObjC):
(WebCore::m_logIdentifier):
(WebCore::SourceBufferPrivateAVFObjC::didProvideContentKeyRequestInitializationDataForTrackID):
(WebCore::SourceBufferPrivateAVFObjC::trackDidChangeSelected):
(WebCore::SourceBufferPrivateAVFObjC::trackDidChangeEnabled):
(WebCore::SourceBufferPrivateAVFObjC::setCDMSession):
(WebCore::SourceBufferPrivateAVFObjC::outputObscuredDueToInsufficientExternalProtectionChanged):
(WebCore::SourceBufferPrivateAVFObjC::player const):
(WebCore::SourceBufferPrivateAVFObjC::removedFromMediaSource): Deleted.
(WebCore::SourceBufferPrivateAVFObjC::setActive): Deleted.
(WebCore::SourceBufferPrivateAVFObjC::isActive const): Deleted.
(WebCore::SourceBufferPrivateAVFObjC::currentMediaTime const): Deleted.
(WebCore::SourceBufferPrivateAVFObjC::duration const): Deleted.
* Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.cpp:
(WebCore::MediaSourcePrivateGStreamer::~MediaSourcePrivateGStreamer):
(WebCore::MediaSourcePrivateGStreamer::addSourceBuffer):
(WebCore::MediaSourcePrivateGStreamer::markEndOfStream):
(WebCore::MediaSourcePrivateGStreamer::startPlaybackIfHasAllTracks):
(WebCore::MediaSourcePrivateGStreamer::removeSourceBuffer): Deleted.
(WebCore::MediaSourcePrivateGStreamer::unmarkEndOfStream): Deleted.
(WebCore::MediaSourcePrivateGStreamer::sourceBufferPrivateDidChangeActiveState): Deleted.
* Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h:
* Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp:
(WebCore::SourceBufferPrivateGStreamer::create):
(WebCore::SourceBufferPrivateGStreamer::SourceBufferPrivateGStreamer):
(WebCore::SourceBufferPrivateGStreamer::removedFromMediaSource):
(WebCore::SourceBufferPrivateGStreamer::flush):
(WebCore::SourceBufferPrivateGStreamer::didReceiveInitializationSegment):
(WebCore::SourceBufferPrivateGStreamer::setActive): Deleted.
(WebCore::SourceBufferPrivateGStreamer::isActive const): Deleted.
(WebCore::SourceBufferPrivateGStreamer::currentMediaTime const): Deleted.
(WebCore::SourceBufferPrivateGStreamer::duration const): Deleted.
* Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.h:
(isType):
* Source/WebCore/platform/mock/mediasource/MockMediaSourcePrivate.cpp:
(WebCore::MockMediaSourcePrivate::addSourceBuffer):
(WebCore::MockMediaSourcePrivate::duration const):
(WebCore::MockMediaSourcePrivate::markEndOfStream):
(WebCore::MockMediaSourcePrivate::notifyActiveSourceBuffersChanged):
(WebCore::MockMediaSourcePrivate::~MockMediaSourcePrivate): Deleted.
(WebCore::MockMediaSourcePrivate::removeSourceBuffer): Deleted.
(WebCore::MockMediaSourcePrivate::duration): Deleted.
(WebCore::MockMediaSourcePrivate::unmarkEndOfStream): Deleted.
(WebCore::MockMediaSourcePrivate::sourceBufferPrivateDidChangeActiveState): Deleted.
(WebCore::MockSourceBufferPrivateHasAudio): Deleted.
(WebCore::MockMediaSourcePrivate::hasAudio const): Deleted.
(WebCore::MockSourceBufferPrivateHasVideo): Deleted.
(WebCore::MockMediaSourcePrivate::hasVideo const): Deleted.
* Source/WebCore/platform/mock/mediasource/MockMediaSourcePrivate.h:
* Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp:
(WebCore::MockSourceBufferPrivate::create):
(WebCore::MockSourceBufferPrivate::MockSourceBufferPrivate):
(WebCore::MockSourceBufferPrivate::mediaSourcePrivate const):
(WebCore::MockSourceBufferPrivate::readyState const):
(WebCore::MockSourceBufferPrivate::setReadyState):
(WebCore::MockSourceBufferPrivate::enqueueSample):
(WebCore::MockSourceBufferPrivate::removedFromMediaSource): Deleted.
(WebCore::MockSourceBufferPrivate::setActive): Deleted.
(WebCore::MockSourceBufferPrivate::isActive const): Deleted.
(WebCore::MockSourceBufferPrivate::currentMediaTime const): Deleted.
(WebCore::MockSourceBufferPrivate::duration const): Deleted.
* Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.h:
* Source/WebKit/WebProcess/GPU/media/MediaSourcePrivateRemote.cpp:
(WebKit::MediaSourcePrivateRemote::markEndOfStream):
(WebKit::MediaSourcePrivateRemote::unmarkEndOfStream):
(WebKit::MediaSourcePrivateRemote::isEnded const): Deleted.
* Source/WebKit/WebProcess/GPU/media/MediaSourcePrivateRemote.h:
* Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp:
(WebKit::SourceBufferPrivateRemote::create):
(WebKit::SourceBufferPrivateRemote::SourceBufferPrivateRemote):
(WebKit::SourceBufferPrivateRemote::setReadyState):
(WebKit::SourceBufferPrivateRemote::setActive):
* Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.h:

Canonical link: https://commits.webkit.org/270354@main

Source/WebCore/platform/graphics/MediaSourcePrivate.cpp

@@ -29,6 +29,7 @@
 #if ENABLE(MEDIA_SOURCE)
 
 #include "PlatformTimeRanges.h"
+#include "SourceBufferPrivate.h"
 
 namespace WebCore {
 
@@ -52,6 +53,62 @@ bool MediaSourcePrivate::hasFutureTime(const MediaTime& currentTime, const Media
     return localEnd - currentTime > timeFudgeFactor();
 }
 
+MediaSourcePrivate::~MediaSourcePrivate()
+{
+    for (auto& sourceBuffer : m_sourceBuffers)
+        sourceBuffer->clearMediaSource();
+}
+
+void MediaSourcePrivate::removeSourceBuffer(SourceBufferPrivate& sourceBuffer)
+{
+    ASSERT(m_sourceBuffers.contains(&sourceBuffer));
+
+    size_t pos = m_activeSourceBuffers.find(&sourceBuffer);
+    if (pos != notFound) {
+        m_activeSourceBuffers.remove(pos);
+        notifyActiveSourceBuffersChanged();
+    }
+    m_sourceBuffers.removeFirst(&sourceBuffer);
+}
+
+void MediaSourcePrivate::sourceBufferPrivateDidChangeActiveState(SourceBufferPrivate& sourceBuffer, bool active)
+{
+    size_t position = m_activeSourceBuffers.find(&sourceBuffer);
+    if (active && position == notFound) {
+        m_activeSourceBuffers.append(&sourceBuffer);
+        notifyActiveSourceBuffersChanged();
+        return;
+    }
+
+    if (active || position == notFound)
+        return;
+
+    m_activeSourceBuffers.remove(position);
+    notifyActiveSourceBuffersChanged();
+}
+
+bool MediaSourcePrivate::hasAudio() const
+{
+    return std::any_of(m_activeSourceBuffers.begin(), m_activeSourceBuffers.end(), [] (SourceBufferPrivate* sourceBuffer) {
+        return sourceBuffer->hasAudio();
+    });
+}
+
+bool MediaSourcePrivate::hasVideo() const
+{
+    return std::any_of(m_activeSourceBuffers.begin(), m_activeSourceBuffers.end(), [] (SourceBufferPrivate* sourceBuffer) {
+        return sourceBuffer->hasVideo();
+    });
+}
+
+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
+void MediaSourcePrivate::setCDMSession(LegacyCDMSession* session)
+{
+    for (auto& sourceBuffer : m_sourceBuffers)
+        sourceBuffer->setCDMSession(session);
+}
+#endif
+
 } // namespace WebCore
 
 #endif

Source/WebCore/platform/graphics/MediaSourcePrivate.h

@@ -41,29 +41,40 @@ namespace WebCore {
 
 class ContentType;
 class SourceBufferPrivate;
+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
+class LegacyCDMSession;
+#endif
 
-class MediaSourcePrivate : public RefCounted<MediaSourcePrivate> {
+class WEBCORE_EXPORT MediaSourcePrivate
+    : public RefCounted<MediaSourcePrivate>
+    , public CanMakeWeakPtr<MediaSourcePrivate> {
 public:
     typedef Vector<String> CodecsArray;
 
     MediaSourcePrivate() = default;
-    virtual ~MediaSourcePrivate() = default;
+    virtual ~MediaSourcePrivate();
 
     enum class AddStatus : uint8_t {
         Ok,
         NotSupported,
         ReachedIdLimit
     };
     virtual AddStatus addSourceBuffer(const ContentType&, bool webMParserEnabled, RefPtr<SourceBufferPrivate>&) = 0;
+    virtual void removeSourceBuffer(SourceBufferPrivate&);
+    void sourceBufferPrivateDidChangeActiveState(SourceBufferPrivate&, bool active);
+    virtual void notifyActiveSourceBuffersChanged() = 0;
     virtual void durationChanged(const MediaTime&) = 0;
     virtual void bufferedChanged(const PlatformTimeRanges&) { }
+
     enum EndOfStreamStatus { EosNoError, EosNetworkError, EosDecodeError };
-    virtual void markEndOfStream(EndOfStreamStatus) = 0;
-    virtual void unmarkEndOfStream() = 0;
-    virtual bool isEnded() const = 0;
+    virtual void markEndOfStream(EndOfStreamStatus) { m_isEnded = true; }
+    virtual void unmarkEndOfStream() { m_isEnded = false; }
+    bool isEnded() const { return m_isEnded; }
 
     virtual MediaPlayer::ReadyState readyState() const = 0;
     virtual void setReadyState(MediaPlayer::ReadyState) = 0;
+    virtual MediaTime currentMediaTime() const = 0;
+    virtual MediaTime duration() const = 0;
 
     virtual void waitForTarget(const SeekTarget&, CompletionHandler<void(const MediaTime&)>&&) = 0;
     virtual void seekToTime(const MediaTime&, CompletionHandler<void()>&&) = 0;
@@ -72,6 +83,17 @@ class MediaSourcePrivate : public RefCounted<MediaSourcePrivate> {
     MediaTime timeFudgeFactor() const { return m_timeFudgeFactor; }
 
     bool hasFutureTime(const MediaTime& currentTime, const MediaTime& duration, const PlatformTimeRanges&) const;
+    bool hasAudio() const;
+    bool hasVideo() const;
+
+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
+    void setCDMSession(LegacyCDMSession*);
+#endif
+
+protected:
+    Vector<RefPtr<SourceBufferPrivate>> m_sourceBuffers;
+    Vector<SourceBufferPrivate*> m_activeSourceBuffers;
+    bool m_isEnded { false };
 
 private:
     MediaTime m_timeFudgeFactor;

Source/WebCore/platform/graphics/SourceBufferPrivate.cpp

@@ -32,6 +32,7 @@
 #include "Logging.h"
 #include "MediaDescription.h"
 #include "MediaSample.h"
+#include "MediaSourcePrivate.h"
 #include "PlatformTimeRanges.h"
 #include "SampleMap.h"
 #include "SharedBuffer.h"
@@ -58,13 +59,45 @@ static const MediaTime discontinuityTolerance = MediaTime(1, 1);
 static const unsigned evictionAlgorithmInitialTimeChunk = 30000;
 static const unsigned evictionAlgorithmTimeChunkLowThreshold = 3000;
 
-SourceBufferPrivate::SourceBufferPrivate() = default;
+SourceBufferPrivate::SourceBufferPrivate(MediaSourcePrivate& parent)
+    : m_mediaSource(&parent)
+{
+}
 
 SourceBufferPrivate::~SourceBufferPrivate()
 {
     abortPendingOperations();
 }
 
+void SourceBufferPrivate::removedFromMediaSource()
+{
+    ALWAYS_LOG(LOGIDENTIFIER);
+
+    Ref<SourceBufferPrivate> protectedThis { *this };
+
+    // m_mediaSource may hold the last reference to ourselves.
+    if (m_mediaSource)
+        m_mediaSource->removeSourceBuffer(*this);
+
+    clearMediaSource();
+}
+
+MediaTime SourceBufferPrivate::currentMediaTime() const
+{
+    if (!m_mediaSource)
+        return { };
+
+    return m_mediaSource->currentMediaTime();
+}
+
+MediaTime SourceBufferPrivate::duration() const
+{
+    if (!m_mediaSource)
+        return { };
+
+    return m_mediaSource->duration();
+}
+
 void SourceBufferPrivate::resetTimestampOffsetInTrackBuffers()
 {
     for (auto& trackBuffer : m_trackBufferMap.values())
@@ -767,15 +800,16 @@ void SourceBufferPrivate::processInitOperation(InitOperation&& initOperation)
                 return;
             }
 
-            completionHandler(result);
-
             if (!m_errored) {
                 rewindOperationState();
                 m_didReceiveInitializationSegmentErrored |= result != ReceiveResult::Succeeded;
 
                 m_receivedFirstInitializationSegment = true;
                 m_pendingInitializationSegmentForChangeType = false;
             }
+
+            completionHandler(result);
+
             processPendingOperations();
         };
         if (!m_client || !m_client->isAsync()) {
@@ -1329,6 +1363,15 @@ bool SourceBufferPrivate::evictFrames(uint64_t newDataSize, uint64_t maximumBuff
     return isBufferFull;
 }
 
+void SourceBufferPrivate::setActive(bool isActive)
+{
+    ALWAYS_LOG(LOGIDENTIFIER, isActive);
+
+    m_isActive = isActive;
+    if (m_mediaSource)
+        m_mediaSource->sourceBufferPrivateDidChangeActiveState(*this, isActive);
+}
+
 } // namespace WebCore
 
 #endif

Source/WebCore/platform/graphics/SourceBufferPrivate.h

@@ -53,10 +53,18 @@
 
 namespace WebCore {
 
+class MediaSourcePrivate;
 class SharedBuffer;
 class TrackBuffer;
 class TimeRanges;
 
+#if ENABLE(ENCRYPTED_MEDIA)
+class CDMInstance;
+#endif
+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
+class LegacyCDMSession;
+#endif
+
 enum class SourceBufferAppendMode : uint8_t {
     Segments,
     Sequence
@@ -70,15 +78,27 @@ class SourceBufferPrivate
 #endif
 {
 public:
-    WEBCORE_EXPORT SourceBufferPrivate();
+    WEBCORE_EXPORT SourceBufferPrivate(MediaSourcePrivate&);
     WEBCORE_EXPORT virtual ~SourceBufferPrivate();
 
-    virtual void setActive(bool) = 0;
+    enum class PlatformType {
+        Mock,
+        AVFObjC,
+        GStreamer,
+        Remote
+    };
+    virtual constexpr PlatformType platformType() const = 0;
+
+    WEBCORE_EXPORT virtual void setActive(bool);
+
     WEBCORE_EXPORT virtual void append(Ref<SharedBuffer>&&);
+
     virtual void abort();
     // Overrides must call the base class.
     virtual void resetParserState();
-    virtual void removedFromMediaSource() = 0;
+    virtual void removedFromMediaSource();
+    void clearMediaSource() { m_mediaSource = nullptr; }
+
     virtual MediaPlayer::ReadyState readyState() const = 0;
     virtual void setReadyState(MediaPlayer::ReadyState) = 0;
     WEBCORE_EXPORT virtual void clientReadyStateChanged(bool endOfStream);
@@ -118,6 +138,7 @@ class SourceBufferPrivate
     // Methods used by MediaSourcePrivate
     bool hasAudio() const { return m_hasAudio; }
     bool hasVideo() const { return m_hasVideo; }
+    bool hasReceivedFirstInitializationSegment() const { return m_receivedFirstInitializationSegment; }
 
     MediaTime timestampOffset() const { return m_timestampOffset; }
 
@@ -137,6 +158,15 @@ class SourceBufferPrivate
     virtual const void* sourceBufferLogIdentifier() = 0;
 #endif
 
+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
+    virtual void setCDMSession(LegacyCDMSession*) { }
+#endif
+#if ENABLE(ENCRYPTED_MEDIA)
+    virtual void setCDMInstance(CDMInstance*) { }
+    virtual bool waitingForKey() const { return false; }
+    virtual void attemptToDecrypt() { }
+#endif
+
 protected:
     WEBCORE_EXPORT void updateBufferedFromTrackBuffers(const Vector<PlatformTimeRanges>&, bool sourceIsEnded, CompletionHandler<void()>&& = [] { });
 
@@ -160,13 +190,14 @@ class SourceBufferPrivate
     using Operation = std::variant<AppendBufferOperation, InitOperation, SamplesVector, ResetParserOperation, AppendCompletedOperation, ErrorOperation>;
     void queueOperation(Operation&&);
 
+    MediaTime currentMediaTime() const;
+    MediaTime duration() const;
+
     virtual void appendInternal(Ref<SharedBuffer>&&) = 0;
     virtual void resetParserStateInternal() = 0;
     virtual MediaTime timeFudgeFactor() const { return PlatformTimeRanges::timeFudgeFactor(); }
-    virtual bool isActive() const { return false; }
+    bool isActive() const { return m_isActive; }
     virtual bool isSeeking() const { return false; }
-    virtual MediaTime currentMediaTime() const { return { }; }
-    virtual MediaTime duration() const { return { }; }
     virtual void flush(const AtomString&) { }
     virtual void enqueueSample(Ref<MediaSample>&&, const AtomString&) { }
     virtual void allSamplesInTrackEnqueued(const AtomString&) { }
@@ -194,6 +225,8 @@ class SourceBufferPrivate
 
     WeakPtr<SourceBufferPrivateClient> m_client;
 
+    WeakPtr<MediaSourcePrivate> m_mediaSource { nullptr };
+
 private:
     void updateHighestPresentationTimestamp();
     void updateMinimumUpcomingPresentationTime(TrackBuffer&, const AtomString& trackID);
@@ -210,6 +243,7 @@ class SourceBufferPrivate
 
     bool m_hasAudio { false };
     bool m_hasVideo { false };
+    bool m_isActive { false };
 
     MemoryCompactRobinHoodHashMap<AtomString, UniqueRef<TrackBuffer>> m_trackBufferMap;
 

Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm

@@ -806,9 +806,7 @@ void getSupportedTypes(HashSet<String>& types) const final
         return true;
 #if HAVE(AVSAMPLEBUFFERDISPLAYLAYER_COPYDISPLAYEDPIXELBUFFER)
     return isCopyDisplayedPixelBufferAvailable() && [&] {
-        if (m_mediaSourcePrivate && anyOf(m_mediaSourcePrivate->sourceBuffers(), [] (auto& sourceBuffer) {
-            return sourceBuffer->needsVideoLayer();
-        }))
+        if (m_mediaSourcePrivate && m_mediaSourcePrivate->needsVideoLayer())
             return true;
         auto player = m_player.get();
         return player && player->renderingCanBeAccelerated();
@@ -1190,8 +1188,7 @@ void getSupportedTypes(HashSet<String>& types) const final
     if (!m_mediaSourcePrivate)
         return;
 
-    for (auto& sourceBuffer : m_mediaSourcePrivate->sourceBuffers())
-        sourceBuffer->setCDMSession(m_session.get());
+    m_mediaSourcePrivate->setCDMSession(session);
 }
 #endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)