Title: [270987] trunk
Revision
270987
Author
[email protected]
Date
2020-12-18 13:10:53 -0800 (Fri, 18 Dec 2020)

Log Message

[Media in GPU Process][MSE] SourceBufferPrivateRemote needs to override some track buffer related functions of SourceBufferPrivate
https://bugs.webkit.org/show_bug.cgi?id=219998

Reviewed by Jer Noble.

Source/WebCore:

No new tests, fix layout test failures.

* platform/graphics/SourceBufferPrivate.h:
(WebCore::SourceBufferPrivate::setTimestampOffset):
(WebCore::SourceBufferPrivate::setAppendWindowStart):
(WebCore::SourceBufferPrivate::setAppendWindowEnd):
(WebCore::SourceBufferPrivate::hasVideo const):
(WebCore::SourceBufferPrivate::timestampOffset const):
Change these functions to virtual because `SourceBufferPrivateRemote` needs to override them.

Source/WebKit:

Implement some track buffer related functions of `SourceBufferPrivateRemote` with new IPC messages.

* GPUProcess/media/RemoteSourceBufferProxy.cpp:
(WebKit::RemoteSourceBufferProxy::resetTrackBuffers):
(WebKit::RemoteSourceBufferProxy::clearTrackBuffers):
(WebKit::RemoteSourceBufferProxy::resetTimestampOffsetInTrackBuffers):
(WebKit::RemoteSourceBufferProxy::setTimestampOffset):
(WebKit::RemoteSourceBufferProxy::setAppendWindowStart):
(WebKit::RemoteSourceBufferProxy::setAppendWindowEnd):
(WebKit::RemoteSourceBufferProxy::updateTrackIds):
* GPUProcess/media/RemoteSourceBufferProxy.h:
* GPUProcess/media/RemoteSourceBufferProxy.messages.in:

* WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
(WebKit::MediaPlayerPrivateRemote::addRemoteAudioTrack):
(WebKit::MediaPlayerPrivateRemote::addRemoteTextTrack):
(WebKit::MediaPlayerPrivateRemote::addRemoteVideoTrack):
`MediaSource` manages the track information for the MSE media player, so we should not call
`MediaPlayer::addAudioTrack()`, `MediaPlayer::addTextTrack()` and `MediaPlayer::addVideoTrack()`.

* WebProcess/GPU/media/SourceBufferPrivateRemote.cpp:
(WebKit::SourceBufferPrivateRemote::resetTrackBuffers):
(WebKit::SourceBufferPrivateRemote::clearTrackBuffers):
(WebKit::SourceBufferPrivateRemote::resetTimestampOffsetInTrackBuffers):
(WebKit::SourceBufferPrivateRemote::setTimestampOffset):
(WebKit::SourceBufferPrivateRemote::setAppendWindowStart):
(WebKit::SourceBufferPrivateRemote::setAppendWindowEnd):
(WebKit::SourceBufferPrivateRemote::updateTrackIds):
* WebProcess/GPU/media/SourceBufferPrivateRemote.h:

LayoutTests:

* gpu-process/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (270986 => 270987)


--- trunk/LayoutTests/ChangeLog	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/LayoutTests/ChangeLog	2020-12-18 21:10:53 UTC (rev 270987)
@@ -1,3 +1,12 @@
+2020-12-18  Peng Liu  <[email protected]>
+
+        [Media in GPU Process][MSE] SourceBufferPrivateRemote needs to override some track buffer related functions of SourceBufferPrivate
+        https://bugs.webkit.org/show_bug.cgi?id=219998
+
+        Reviewed by Jer Noble.
+
+        * gpu-process/TestExpectations:
+
 2020-12-18  Ryan Haddad  <[email protected]>
 
         [Mojave] webanimations/accelerated-transform-related-animation-property-order.html is failing

Modified: trunk/LayoutTests/gpu-process/TestExpectations (270986 => 270987)


--- trunk/LayoutTests/gpu-process/TestExpectations	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/LayoutTests/gpu-process/TestExpectations	2020-12-18 21:10:53 UTC (rev 270987)
@@ -200,8 +200,6 @@
 
 media/controls [ Skip ]
 
-media/media-source/media-source-trackid-change.html [ Failure ]
-media/media-source/media-source-webm-init-inside-segment.html [ Failure ]
 media/media-source/media-source-resize.html [ Timeout ]
 media/media-source/media-source-webm.html [ Timeout ]
 
@@ -379,11 +377,8 @@
 imported/w3c/web-platform-tests/mediacapture-fromelement/idlharness.html [ Skip ]
 imported/w3c/web-platform-tests/mediacapture-record [ Skip ]
 imported/w3c/web-platform-tests/mediacapture-streams [ Skip ]
-imported/w3c/web-platform-tests/media-source/mediasource-activesourcebuffers.html [ Failure ]
-imported/w3c/web-platform-tests/media-source/mediasource-avtracks.html [ Failure ]
 imported/w3c/web-platform-tests/media-source/mediasource-buffered.html [ Failure ]
 imported/w3c/web-platform-tests/media-source/mediasource-changetype.html [ Failure ]
-imported/w3c/web-platform-tests/media-source/mediasource-config-change-webm-v-bitrate.html [ Failure ]
 imported/w3c/web-platform-tests/media-source/mediasource-config-change-webm-v-framesize.html [ Failure ]
 imported/w3c/web-platform-tests/media-source/mediasource-duration-boundaryconditions.html [ Failure ]
 imported/w3c/web-platform-tests/media-source/mediasource-remove.html [ Failure ]

Modified: trunk/Source/WebCore/ChangeLog (270986 => 270987)


--- trunk/Source/WebCore/ChangeLog	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/Source/WebCore/ChangeLog	2020-12-18 21:10:53 UTC (rev 270987)
@@ -1,3 +1,20 @@
+2020-12-18  Peng Liu  <[email protected]>
+
+        [Media in GPU Process][MSE] SourceBufferPrivateRemote needs to override some track buffer related functions of SourceBufferPrivate
+        https://bugs.webkit.org/show_bug.cgi?id=219998
+
+        Reviewed by Jer Noble.
+
+        No new tests, fix layout test failures.
+
+        * platform/graphics/SourceBufferPrivate.h:
+        (WebCore::SourceBufferPrivate::setTimestampOffset):
+        (WebCore::SourceBufferPrivate::setAppendWindowStart):
+        (WebCore::SourceBufferPrivate::setAppendWindowEnd):
+        (WebCore::SourceBufferPrivate::hasVideo const):
+        (WebCore::SourceBufferPrivate::timestampOffset const):
+        Change these functions to virtual because `SourceBufferPrivateRemote` needs to override them.
+
 2020-12-18  Sihui Liu  <[email protected]>
 
         SpeechRecognitionRemoteRealtimeMediaSourceManager should not issue sandbox extension for mocked devices

Modified: trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.h (270986 => 270987)


--- trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.h	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.h	2020-12-18 21:10:53 UTC (rev 270987)
@@ -77,29 +77,29 @@
 
     virtual void reenqueueMediaIfNeeded(const MediaTime& currentMediaTime, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize);
     virtual void addTrackBuffer(const AtomString& trackId, RefPtr<MediaDescription>&&);
+    virtual void resetTrackBuffers();
+    virtual void clearTrackBuffers();
     virtual void trySignalAllSamplesInTrackEnqueued();
     WEBCORE_EXPORT virtual void updateBufferedFromTrackBuffers(bool sourceIsEnded);
     WEBCORE_EXPORT virtual void evictCodedFrames(uint64_t newDataSize, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize, const MediaTime& currentTime, const MediaTime& duration, bool isEnded);
+    virtual void resetTimestampOffsetInTrackBuffers();
+    virtual void setTimestampOffset(const MediaTime& timestampOffset) { m_timestampOffset = timestampOffset; }
+    virtual void setAppendWindowStart(const MediaTime& appendWindowStart) { m_appendWindowStart = appendWindowStart;}
+    virtual void setAppendWindowEnd(const MediaTime& appendWindowEnd) { m_appendWindowEnd = appendWindowEnd; }
     virtual void seekToTime(const MediaTime&);
+    virtual void updateTrackIds(Vector<std::pair<AtomString, AtomString>>&& trackIdPairs);
 
     void setClient(SourceBufferPrivateClient* client) { m_client = client; }
     void setIsAttached(bool flag) { m_isAttached = flag; }
+
     bool hasAudio() const { return m_hasAudio; }
     bool hasVideo() const { return m_hasVideo; }
-    void setAppendWindowStart(const MediaTime& appendWindowStart) { m_appendWindowStart = appendWindowStart;}
-    void setAppendWindowEnd(const MediaTime& appendWindowEnd) { m_appendWindowEnd = appendWindowEnd; }
     bool bufferFull() const { return m_bufferFull; }
 
-    void setBufferedDirty(bool);
-    void resetTrackBuffers();
-    void clearTrackBuffers();
-    void resetTimestampOffsetInTrackBuffers();
     MediaTime timestampOffset() const { return m_timestampOffset; }
-    void setTimestampOffset(const MediaTime& timestampOffset) { m_timestampOffset = timestampOffset; }
     MediaTime highestPresentationTimestamp() const;
     void startChangingType() { m_pendingInitializationSegmentForChangeType = true; }
     void removeCodedFrames(const MediaTime& start, const MediaTime& end, const MediaTime& currentMediaTime, bool isEnded);
-    void updateTrackIds(Vector<std::pair<AtomString, AtomString>>&& trackIdPairs);
     void setAllTrackBuffersNeedRandomAccess();
     void setShouldGenerateTimestamps(bool flag) { m_shouldGenerateTimestamps = flag; }
     void setMode(SourceBufferAppendMode mode) { m_appendMode = mode; }
@@ -172,6 +172,7 @@
     bool validateInitializationSegment(const SourceBufferPrivateClient::InitializationSegment&);
     void provideMediaData(TrackBuffer&, const AtomString& trackID);
     void setBufferedRanges(const PlatformTimeRanges&);
+    void setBufferedDirty(bool);
 
     bool m_isAttached { false };
     bool m_hasAudio { false };

Modified: trunk/Source/WebKit/ChangeLog (270986 => 270987)


--- trunk/Source/WebKit/ChangeLog	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/Source/WebKit/ChangeLog	2020-12-18 21:10:53 UTC (rev 270987)
@@ -1,3 +1,40 @@
+2020-12-18  Peng Liu  <[email protected]>
+
+        [Media in GPU Process][MSE] SourceBufferPrivateRemote needs to override some track buffer related functions of SourceBufferPrivate
+        https://bugs.webkit.org/show_bug.cgi?id=219998
+
+        Reviewed by Jer Noble.
+
+        Implement some track buffer related functions of `SourceBufferPrivateRemote` with new IPC messages.
+
+        * GPUProcess/media/RemoteSourceBufferProxy.cpp:
+        (WebKit::RemoteSourceBufferProxy::resetTrackBuffers):
+        (WebKit::RemoteSourceBufferProxy::clearTrackBuffers):
+        (WebKit::RemoteSourceBufferProxy::resetTimestampOffsetInTrackBuffers):
+        (WebKit::RemoteSourceBufferProxy::setTimestampOffset):
+        (WebKit::RemoteSourceBufferProxy::setAppendWindowStart):
+        (WebKit::RemoteSourceBufferProxy::setAppendWindowEnd):
+        (WebKit::RemoteSourceBufferProxy::updateTrackIds):
+        * GPUProcess/media/RemoteSourceBufferProxy.h:
+        * GPUProcess/media/RemoteSourceBufferProxy.messages.in:
+
+        * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+        (WebKit::MediaPlayerPrivateRemote::addRemoteAudioTrack):
+        (WebKit::MediaPlayerPrivateRemote::addRemoteTextTrack):
+        (WebKit::MediaPlayerPrivateRemote::addRemoteVideoTrack):
+        `MediaSource` manages the track information for the MSE media player, so we should not call
+        `MediaPlayer::addAudioTrack()`, `MediaPlayer::addTextTrack()` and `MediaPlayer::addVideoTrack()`.
+
+        * WebProcess/GPU/media/SourceBufferPrivateRemote.cpp:
+        (WebKit::SourceBufferPrivateRemote::resetTrackBuffers):
+        (WebKit::SourceBufferPrivateRemote::clearTrackBuffers):
+        (WebKit::SourceBufferPrivateRemote::resetTimestampOffsetInTrackBuffers):
+        (WebKit::SourceBufferPrivateRemote::setTimestampOffset):
+        (WebKit::SourceBufferPrivateRemote::setAppendWindowStart):
+        (WebKit::SourceBufferPrivateRemote::setAppendWindowEnd):
+        (WebKit::SourceBufferPrivateRemote::updateTrackIds):
+        * WebProcess/GPU/media/SourceBufferPrivateRemote.h:
+
 2020-12-18  Sihui Liu  <[email protected]>
 
         SpeechRecognitionRemoteRealtimeMediaSourceManager should not issue sandbox extension for mocked devices

Modified: trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.cpp (270986 => 270987)


--- trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.cpp	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.cpp	2020-12-18 21:10:53 UTC (rev 270987)
@@ -202,6 +202,16 @@
     m_sourceBufferPrivate->addTrackBuffer(m_trackIds.get(trackPrivateRemoteIdentifier), m_mediaDescriptions.get(trackPrivateRemoteIdentifier));
 }
 
+void RemoteSourceBufferProxy::resetTrackBuffers()
+{
+    m_sourceBufferPrivate->resetTrackBuffers();
+}
+
+void RemoteSourceBufferProxy::clearTrackBuffers()
+{
+    m_sourceBufferPrivate->clearTrackBuffers();
+}
+
 void RemoteSourceBufferProxy::reenqueueMediaIfNeeded(const MediaTime& currentMediaTime, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize)
 {
     m_sourceBufferPrivate->reenqueueMediaIfNeeded(currentMediaTime, pendingAppendDataCapacity, maximumBufferSize);
@@ -212,11 +222,48 @@
     m_sourceBufferPrivate->trySignalAllSamplesInTrackEnqueued();
 }
 
+void RemoteSourceBufferProxy::resetTimestampOffsetInTrackBuffers()
+{
+    m_sourceBufferPrivate->resetTimestampOffsetInTrackBuffers();
+}
+
+void RemoteSourceBufferProxy::setTimestampOffset(const MediaTime& timestampOffset)
+{
+    m_sourceBufferPrivate->setTimestampOffset(timestampOffset);
+}
+
+void RemoteSourceBufferProxy::setAppendWindowStart(const MediaTime& appendWindowStart)
+{
+    m_sourceBufferPrivate->setAppendWindowStart(appendWindowStart);
+}
+
+void RemoteSourceBufferProxy::setAppendWindowEnd(const MediaTime& appendWindowEnd)
+{
+    m_sourceBufferPrivate->setAppendWindowEnd(appendWindowEnd);
+}
+
 void RemoteSourceBufferProxy::seekToTime(const MediaTime& mediaTime)
 {
     m_sourceBufferPrivate->seekToTime(mediaTime);
 }
 
+void RemoteSourceBufferProxy::updateTrackIds(Vector<std::pair<TrackPrivateRemoteIdentifier, TrackPrivateRemoteIdentifier>>&& identifierPairs)
+{
+    Vector<std::pair<AtomString, AtomString>> trackIdPairs;
+
+    for (auto& identifierPair : identifierPairs) {
+        ASSERT(m_trackIds.contains(identifierPair.first));
+        ASSERT(m_trackIds.contains(identifierPair.second));
+
+        auto oldId = m_trackIds.take(identifierPair.first);
+        auto newId = m_trackIds.get(identifierPair.second);
+        trackIdPairs.append(std::make_pair(oldId, newId));
+    }
+
+    if (!trackIdPairs.isEmpty())
+        m_sourceBufferPrivate->updateTrackIds(WTFMove(trackIdPairs));
+}
+
 void RemoteSourceBufferProxy::bufferedSamplesForTrackId(TrackPrivateRemoteIdentifier trackPrivateRemoteIdentifier, CompletionHandler<void(Vector<String>&&)>&& completionHandler)
 {
     ASSERT(m_trackIds.contains(trackPrivateRemoteIdentifier));

Modified: trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.h (270986 => 270987)


--- trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.h	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.h	2020-12-18 21:10:53 UTC (rev 270987)
@@ -91,9 +91,16 @@
     void updateBufferedFromTrackBuffers(bool sourceIsEnded);
     void evictCodedFrames(uint64_t newDataSize, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize, const MediaTime& currentTime, const MediaTime& duration, bool isEnded);
     void addTrackBuffer(TrackPrivateRemoteIdentifier);
+    void resetTrackBuffers();
+    void clearTrackBuffers();
     void reenqueueMediaIfNeeded(const MediaTime& currentMediaTime, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize);
     void trySignalAllSamplesInTrackEnqueued();
+    void resetTimestampOffsetInTrackBuffers();
+    void setTimestampOffset(const MediaTime&);
+    void setAppendWindowStart(const MediaTime&);
+    void setAppendWindowEnd(const MediaTime&);
     void seekToTime(const MediaTime&);
+    void updateTrackIds(Vector<std::pair<TrackPrivateRemoteIdentifier, TrackPrivateRemoteIdentifier>>&&);
     void bufferedSamplesForTrackId(TrackPrivateRemoteIdentifier, CompletionHandler<void(Vector<String>&&)>&&);
 
     GPUConnectionToWebProcess& m_connectionToWebProcess;

Modified: trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.messages.in (270986 => 270987)


--- trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.messages.in	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.messages.in	2020-12-18 21:10:53 UTC (rev 270987)
@@ -34,11 +34,18 @@
     SetReadyState(WebCore::MediaPlayer::ReadyState state)
     UpdateBufferedFromTrackBuffers(bool sourceIsEnded)
     EvictCodedFrames(uint64_t newDataSize, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize, MediaTime currentTime, MediaTime duration, bool isEnded)
-    AddTrackBuffer(WebKit::TrackPrivateRemoteIdentifier trackId)
+    AddTrackBuffer(WebKit::TrackPrivateRemoteIdentifier remoteIdentifier)
+    ResetTrackBuffers()
+    ClearTrackBuffers()
     ReenqueueMediaIfNeeded(MediaTime currentMediaTime, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize)
     TrySignalAllSamplesInTrackEnqueued()
+    ResetTimestampOffsetInTrackBuffers()
+    SetTimestampOffset(MediaTime timestampOffset)
+    SetAppendWindowStart(MediaTime appendWindowStart)
+    SetAppendWindowEnd(MediaTime appendWindowEnd)
     SeekToTime(MediaTime mediaTime)
-    BufferedSamplesForTrackId(WebKit::TrackPrivateRemoteIdentifier trackId) -> (Vector<String> samples) Async
+    UpdateTrackIds(Vector<std::pair<WebKit::TrackPrivateRemoteIdentifier, WebKit::TrackPrivateRemoteIdentifier>> identifierPairs)
+    BufferedSamplesForTrackId(WebKit::TrackPrivateRemoteIdentifier remoteIdentifier) -> (Vector<String> samples) Async
 }
 
 #endif

Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (270986 => 270987)


--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp	2020-12-18 21:10:53 UTC (rev 270987)
@@ -470,6 +470,11 @@
     if (!addResult.isNewEntry)
         return;
 
+#if ENABLE(MEDIA_SOURCE)
+    if (m_mediaSourcePrivate)
+        return;
+#endif
+
     m_player->addAudioTrack(addResult.iterator->value);
 }
 
@@ -501,6 +506,11 @@
     if (!addResult.isNewEntry)
         return;
 
+#if ENABLE(MEDIA_SOURCE)
+    if (m_mediaSourcePrivate)
+        return;
+#endif
+
     m_player->addTextTrack(addResult.iterator->value);
 }
 
@@ -614,6 +624,11 @@
     if (!addResult.isNewEntry)
         return;
 
+#if ENABLE(MEDIA_SOURCE)
+    if (m_mediaSourcePrivate)
+        return;
+#endif
+
     m_player->addVideoTrack(addResult.iterator->value);
 }
 

Modified: trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp (270986 => 270987)


--- trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp	2020-12-18 21:10:53 UTC (rev 270987)
@@ -143,6 +143,16 @@
     m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::AddTrackBuffer(m_trackIdentifierMap.get(trackId)), m_remoteSourceBufferIdentifier);
 }
 
+void SourceBufferPrivateRemote::resetTrackBuffers()
+{
+    m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::ResetTrackBuffers(), m_remoteSourceBufferIdentifier);
+}
+
+void SourceBufferPrivateRemote::clearTrackBuffers()
+{
+    m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::ClearTrackBuffers(), m_remoteSourceBufferIdentifier);
+}
+
 void SourceBufferPrivateRemote::reenqueueMediaIfNeeded(const MediaTime& currentMediaTime, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize)
 {
     m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::ReenqueueMediaIfNeeded(currentMediaTime, pendingAppendDataCapacity, maximumBufferSize), m_remoteSourceBufferIdentifier);
@@ -153,11 +163,48 @@
     m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::TrySignalAllSamplesInTrackEnqueued(), m_remoteSourceBufferIdentifier);
 }
 
+void SourceBufferPrivateRemote::resetTimestampOffsetInTrackBuffers()
+{
+    m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::ResetTimestampOffsetInTrackBuffers(), m_remoteSourceBufferIdentifier);
+}
+
+void SourceBufferPrivateRemote::setTimestampOffset(const MediaTime& timestampOffset)
+{
+    SourceBufferPrivate::setTimestampOffset(timestampOffset);
+    m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::SetTimestampOffset(timestampOffset), m_remoteSourceBufferIdentifier);
+}
+
+void SourceBufferPrivateRemote::setAppendWindowStart(const MediaTime& appendWindowStart)
+{
+    m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::SetAppendWindowStart(appendWindowStart), m_remoteSourceBufferIdentifier);
+}
+
+void SourceBufferPrivateRemote::setAppendWindowEnd(const MediaTime& appendWindowEnd)
+{
+    m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::SetAppendWindowEnd(appendWindowEnd), m_remoteSourceBufferIdentifier);
+}
+
 void SourceBufferPrivateRemote::seekToTime(const MediaTime& mediaTime)
 {
     m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::SeekToTime(mediaTime), m_remoteSourceBufferIdentifier);
 }
 
+void SourceBufferPrivateRemote::updateTrackIds(Vector<std::pair<AtomString, AtomString>>&& trackIdPairs)
+{
+    Vector<std::pair<TrackPrivateRemoteIdentifier, TrackPrivateRemoteIdentifier>> identifierPairs;
+
+    for (auto& trackIdPair : trackIdPairs) {
+        ASSERT(m_trackIdentifierMap.contains(trackIdPair.first));
+        ASSERT(m_trackIdentifierMap.contains(trackIdPair.second));
+
+        auto oldIdentifier = m_trackIdentifierMap.take(trackIdPair.first);
+        auto newIdentifier = m_trackIdentifierMap.get(trackIdPair.second);
+        identifierPairs.append(std::make_pair(oldIdentifier, newIdentifier));
+    }
+
+    m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::UpdateTrackIds(identifierPairs), m_remoteSourceBufferIdentifier);
+}
+
 void SourceBufferPrivateRemote::bufferedSamplesForTrackId(const AtomString& trackId, CompletionHandler<void(Vector<String>&&)>&& completionHandler)
 {
     m_gpuProcessConnection.connection().sendWithAsyncReply(Messages::RemoteSourceBufferProxy::BufferedSamplesForTrackId(m_trackIdentifierMap.get(trackId)), [completionHandler = WTFMove(completionHandler)](auto&& samples) mutable {

Modified: trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.h (270986 => 270987)


--- trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.h	2020-12-18 20:32:02 UTC (rev 270986)
+++ trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.h	2020-12-18 21:10:53 UTC (rev 270987)
@@ -82,10 +82,17 @@
     bool canSwitchToType(const WebCore::ContentType&) final;
     void reenqueueMediaIfNeeded(const MediaTime& currentMediaTime, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize) final;
     void addTrackBuffer(const AtomString& trackId, RefPtr<WebCore::MediaDescription>&&) final;
+    void resetTrackBuffers() final;
+    void clearTrackBuffers() final;
     void trySignalAllSamplesInTrackEnqueued() final;
     void updateBufferedFromTrackBuffers(bool sourceIsEnded) final;
     void evictCodedFrames(uint64_t newDataSize, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize, const MediaTime& currentTime, const MediaTime& duration, bool isEnded) final;
+    void resetTimestampOffsetInTrackBuffers() final;
+    void setTimestampOffset(const MediaTime&) final;
+    void setAppendWindowStart(const MediaTime&) final;
+    void setAppendWindowEnd(const MediaTime&) final;
     void seekToTime(const MediaTime&) final;
+    void updateTrackIds(Vector<std::pair<AtomString, AtomString>>&&) final;
 
     bool isActive() const final { return m_isActive; }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to