[Media in GPU Process][MSE] Add an IPC message BufferedSamplesForTrackId for testing purposes

pliu6 · pliu6 · commit fe0dd871e760 · 2020-12-17T02:19:07.000Z
https://bugs.webkit.org/show_bug.cgi?id=219956 Reviewed by Eric Carlson. Source/WebCore: No new tests, fix a layout test failure. * Modules/mediasource/SourceBuffer.cpp: (WebCore::SourceBuffer::bufferedSamplesForTrackId): (WebCore::SourceBuffer::bufferedSamplesForTrackID): Deleted. * Modules/mediasource/SourceBuffer.h: * platform/graphics/SourceBufferPrivate.cpp: (WebCore::SourceBufferPrivate::bufferedSamplesForTrackId): (WebCore::SourceBufferPrivate::bufferedSamplesForTrackID): Deleted. * platform/graphics/SourceBufferPrivate.h: (WebCore::SourceBufferPrivate::enqueuedSamplesForTrackID): * testing/Internals.cpp: (WebCore::Internals::bufferedSamplesForTrackId): (WebCore::Internals::bufferedSamplesForTrackID): Deleted. * testing/Internals.h: * testing/Internals.idl: Source/WebKit: Implement `SourceBufferPrivateRemote::bufferedSamplesForTrackId()` with a new IPC message. * GPUProcess/media/RemoteSourceBufferProxy.cpp: (WebKit::RemoteSourceBufferProxy::bufferedSamplesForTrackId): * GPUProcess/media/RemoteSourceBufferProxy.h: * GPUProcess/media/RemoteSourceBufferProxy.messages.in: * WebProcess/GPU/media/SourceBufferPrivateRemote.cpp: (WebKit::SourceBufferPrivateRemote::bufferedSamplesForTrackId): * WebProcess/GPU/media/SourceBufferPrivateRemote.h: LayoutTests: The tests using internals.bufferedSamplesForTrackID() need to be updated since the function is asynchronous now. * gpu-process/TestExpectations: * media/media-source/media-source-append-acb-no-frame-lost.html: * media/media-source/media-source-append-acb-tolerance.html: * media/media-source/media-source-append-overlapping-dts.html: * media/media-source/media-source-append-presentation-durations.html: * media/media-source/media-source-append-twice-overlapping-sync-frame.html: * media/media-source/media-source-append-variable-frame-lengths-with-matching-durations.html: * media/media-source/media-source-dropped-iframe.html: * media/media-source/media-source-overlapping-append.html: * media/media-source/media-source-overlapping-decodetime.html: * media/media-source/media-source-range-end-frame-not-removed.html: * media/media-source/media-source-range-start-frame-replaced.html: * media/media-source/media-source-remove-b-frame.html: * media/media-source/media-source-samples-out-of-order.html: * media/media-source/media-source-samples-resolution-change.html: * media/media-source/media-source-sequence-timestamps.html: * media/media-source/media-source-timeoffset.html: * media/media-source/media-source-timestampoffset-rounding-error.html: * media/media-source/media-source-timestampoffset-then-zero.html: Canonical link: https://commits.webkit.org/232545@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270919 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,33 @@
+2020-12-16  Peng Liu  <peng.liu6@apple.com>
+
+        [Media in GPU Process][MSE] Add an IPC message BufferedSamplesForTrackId for testing purposes
+        https://bugs.webkit.org/show_bug.cgi?id=219956
+
+        Reviewed by Eric Carlson.
+
+        The tests using internals.bufferedSamplesForTrackID() need to be updated since the function
+        is asynchronous now.
+
+        * gpu-process/TestExpectations:
+        * media/media-source/media-source-append-acb-no-frame-lost.html:
+        * media/media-source/media-source-append-acb-tolerance.html:
+        * media/media-source/media-source-append-overlapping-dts.html:
+        * media/media-source/media-source-append-presentation-durations.html:
+        * media/media-source/media-source-append-twice-overlapping-sync-frame.html:
+        * media/media-source/media-source-append-variable-frame-lengths-with-matching-durations.html:
+        * media/media-source/media-source-dropped-iframe.html:
+        * media/media-source/media-source-overlapping-append.html:
+        * media/media-source/media-source-overlapping-decodetime.html:
+        * media/media-source/media-source-range-end-frame-not-removed.html:
+        * media/media-source/media-source-range-start-frame-replaced.html:
+        * media/media-source/media-source-remove-b-frame.html:
+        * media/media-source/media-source-samples-out-of-order.html:
+        * media/media-source/media-source-samples-resolution-change.html:
+        * media/media-source/media-source-sequence-timestamps.html:
+        * media/media-source/media-source-timeoffset.html:
+        * media/media-source/media-source-timestampoffset-rounding-error.html:
+        * media/media-source/media-source-timestampoffset-then-zero.html:
+
 2020-12-16  Truitt Savell  <tsavell@apple.com>
 
         Remove LayoutTests/platform/mac-bigsur-wk1
diff --git a/LayoutTests/gpu-process/TestExpectations b/LayoutTests/gpu-process/TestExpectations
@@ -200,7 +200,6 @@ inspector/layers/layers-compositing-reasons.html [ Skip ]
 
 media/controls [ Skip ]
 
-media/media-source/media-source-samples-resolution-change.html [ Failure ]
 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 ]
diff --git a/LayoutTests/media/media-source/media-source-append-acb-no-frame-lost.html b/LayoutTests/media/media-source/media-source-append-acb-no-frame-lost.html
@@ -52,7 +52,7 @@
         run('sourceBuffer.appendBuffer(syncSampleRun(10, 20))');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         enqueuedSamples = internals.enqueuedSamplesForTrackID(sourceBuffer, 1);
 
         // 30 samples were appended in total. All of them should have ended up in buffered samples and in the decode queue.
diff --git a/LayoutTests/media/media-source/media-source-append-acb-tolerance.html b/LayoutTests/media/media-source/media-source-append-acb-tolerance.html
@@ -64,7 +64,7 @@
         run('sourceBuffer.appendBuffer(impreciseSampleRun(5, 10))');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         enqueuedSamples = internals.enqueuedSamplesForTrackID(sourceBuffer, 1);
 
         // 30 samples were appended in total. All of them should have ended up in buffered samples and in the decode queue.
diff --git a/LayoutTests/media/media-source/media-source-append-overlapping-dts.html b/LayoutTests/media/media-source/media-source-append-overlapping-dts.html
@@ -48,7 +48,7 @@
         run('sourceBuffer.appendBuffer(samples)');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 9);
         bufferedSamples.forEach(consoleWrite);
         endTest();
diff --git a/LayoutTests/media/media-source/media-source-append-presentation-durations.html b/LayoutTests/media/media-source/media-source-append-presentation-durations.html
@@ -50,7 +50,8 @@
         await waitFor(sourceBuffer, 'updateend');
 
         consoleWrite("Buffered:");
-        internals.bufferedSamplesForTrackID(sourceBuffer, 1).forEach(consoleWrite);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
+        bufferedSamples.forEach(consoleWrite);
         consoleWrite("Enqueued:");
         internals.enqueuedSamplesForTrackID(sourceBuffer, 1).forEach(consoleWrite);
 
diff --git a/LayoutTests/media/media-source/media-source-append-twice-overlapping-sync-frame.html b/LayoutTests/media/media-source/media-source-append-twice-overlapping-sync-frame.html
@@ -47,7 +47,7 @@
         run('sourceBuffer.appendBuffer(sampleRun(2))');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         consoleWrite(bufferedSamples.join("<br/>"));
 
         endTest();
diff --git a/LayoutTests/media/media-source/media-source-append-variable-frame-lengths-with-matching-durations.html b/LayoutTests/media/media-source/media-source-append-variable-frame-lengths-with-matching-durations.html
@@ -35,7 +35,7 @@
         run('sourceBuffer.appendBuffer(samples)');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 3);
         bufferedSamples.forEach(consoleWrite);
         endTest();
diff --git a/LayoutTests/media/media-source/media-source-dropped-iframe.html b/LayoutTests/media/media-source/media-source-dropped-iframe.html
@@ -44,7 +44,7 @@
         run('sourceBuffer.appendBuffer(samples)');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         enqueuedSamples = internals.enqueuedSamplesForTrackID(sourceBuffer, 1);
 
         consoleWrite("Buffered:");
diff --git a/LayoutTests/media/media-source/media-source-overlapping-append.html b/LayoutTests/media/media-source/media-source-overlapping-append.html
@@ -45,9 +45,9 @@
         run('sourceBuffer.appendBuffer(samples)');
     }
 
-    function loadMoreOrderedSamples()
+    async function loadMoreOrderedSamples()
     {
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 6);
         bufferedSamples.forEach(consoleWrite);
 
@@ -63,9 +63,9 @@
         run('sourceBuffer.appendBuffer(samples)');
     }
 
-    function loadUnorderedSamples()
+    async function loadUnorderedSamples()
     {
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 6);
         bufferedSamples.forEach(consoleWrite);
 
@@ -81,9 +81,9 @@
         run('sourceBuffer.appendBuffer(samples)');
     }
 
-     function samplesAdded()
+    async function samplesAdded()
     {
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 6);
         bufferedSamples.forEach(consoleWrite);
 
diff --git a/LayoutTests/media/media-source/media-source-overlapping-decodetime.html b/LayoutTests/media/media-source/media-source-overlapping-decodetime.html
@@ -56,9 +56,9 @@
         run('sourceBuffer.appendBuffer(samples)');
     }
 
-     function samplesAdded()
+    async function samplesAdded()
     {
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 7);
         bufferedSamples.forEach(consoleWrite);
 
diff --git a/LayoutTests/media/media-source/media-source-range-end-frame-not-removed.html b/LayoutTests/media/media-source/media-source-range-end-frame-not-removed.html
@@ -53,9 +53,9 @@
         run('sourceBuffer.appendBuffer(samples)');
     }
 
-    function samplesAdded()
+    async function samplesAdded()
     {
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 6);
         bufferedSamples.forEach(consoleWrite);
 
diff --git a/LayoutTests/media/media-source/media-source-range-start-frame-replaced.html b/LayoutTests/media/media-source/media-source-range-start-frame-replaced.html
@@ -51,9 +51,9 @@
         run('sourceBuffer.appendBuffer(samples)');
     }
 
-    function samplesAdded()
+    async function samplesAdded()
     {
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         bufferedSamples.forEach(consoleWrite);
 
         testExpected("sourceBuffer.buffered.length", 1);
diff --git a/LayoutTests/media/media-source/media-source-remove-b-frame.html b/LayoutTests/media/media-source/media-source-remove-b-frame.html
@@ -55,7 +55,8 @@
         consoleWrite("The frame with presentation time [1, 2) should have been deleted from the buffered samples and " +
             "a reenqueue must have happened. That frame should not have been enqueued.");
         consoleWrite("Buffered:");
-        internals.bufferedSamplesForTrackID(sourceBuffer, 1).forEach(consoleWrite);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
+        bufferedSamples.forEach(consoleWrite);
         consoleWrite("Enqueued:");
         internals.enqueuedSamplesForTrackID(sourceBuffer, 1).forEach(consoleWrite);
 
diff --git a/LayoutTests/media/media-source/media-source-samples-out-of-order.html b/LayoutTests/media/media-source/media-source-samples-out-of-order.html
@@ -31,7 +31,7 @@
         run('sourceBuffer.appendBuffer(mediaSegment)');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 3);
         bufferedSamples.forEach(consoleWrite);
 
@@ -43,7 +43,7 @@
         run('sourceBuffer.appendBuffer(mediaSegment)');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 3);
         bufferedSamples.forEach(consoleWrite);
 
diff --git a/LayoutTests/media/media-source/media-source-samples-resolution-change.html b/LayoutTests/media/media-source/media-source-samples-resolution-change.html
@@ -64,7 +64,7 @@
         consoleWrite("Replaced first 3 seconds with 480x360");
 
         const trackId = sourceBuffer.videoTracks.item(0).id;
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, trackId);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, trackId);
         consoleWrite(bufferedSamples.map(simplifySampleDescription).join("<br>"));
 
         endTest();
diff --git a/LayoutTests/media/media-source/media-source-sequence-timestamps.html b/LayoutTests/media/media-source/media-source-sequence-timestamps.html
@@ -50,9 +50,9 @@
         run('sourceBuffer.appendBuffer(samples)');
     }
 
-    function samplesAdded()
+    async function samplesAdded()
     {
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 6);
         bufferedSamples.forEach(consoleWrite);
 
diff --git a/LayoutTests/media/media-source/media-source-timeoffset.html b/LayoutTests/media/media-source/media-source-timeoffset.html
@@ -46,9 +46,9 @@
         run('sourceBuffer.appendBuffer(samples)');
     }
 
-    function samplesAdded()
+    async function samplesAdded()
     {
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         testExpected("bufferedSamples.length", 6);
         bufferedSamples.forEach(consoleWrite);
 
diff --git a/LayoutTests/media/media-source/media-source-timestampoffset-rounding-error.html b/LayoutTests/media/media-source/media-source-timestampoffset-rounding-error.html
@@ -41,21 +41,21 @@
         run('sourceBuffer.appendBuffer(makeVideo(0, 6))');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         enqueuedSamples = internals.enqueuedSamplesForTrackID(sourceBuffer, 1);
 
         run("sourceBuffer.timestampOffset = 1");
         run('sourceBuffer.appendBuffer(makeVideo(1, 6))');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         enqueuedSamples = internals.enqueuedSamplesForTrackID(sourceBuffer, 1);
 
         run("sourceBuffer.timestampOffset = 1.5");
         run('sourceBuffer.appendBuffer(makeVideo(2, 5))');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         enqueuedSamples = internals.enqueuedSamplesForTrackID(sourceBuffer, 1);
 
         consoleWrite("Buffered:");
diff --git a/LayoutTests/media/media-source/media-source-timestampoffset-then-zero.html b/LayoutTests/media/media-source/media-source-timestampoffset-then-zero.html
@@ -40,15 +40,15 @@
         run('sourceBuffer.appendBuffer(makeSimpleAudio(0, 20, 0))');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         consoleWrite("After first append:");
         bufferedSamples.forEach(consoleWrite);
 
         run('sourceBuffer.timestampOffset = 0');
         run('sourceBuffer.appendBuffer(makeSimpleAudio(0, 20, 1))');
         await waitFor(sourceBuffer, 'updateend');
 
-        bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);
+        bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);
         consoleWrite("After second append:");
         bufferedSamples.forEach(consoleWrite);
 
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2020-12-16  Peng Liu  <peng.liu6@apple.com>
+
+        [Media in GPU Process][MSE] Add an IPC message BufferedSamplesForTrackId for testing purposes
+        https://bugs.webkit.org/show_bug.cgi?id=219956
+
+        Reviewed by Eric Carlson.
+
+        No new tests, fix a layout test failure.
+
+        * Modules/mediasource/SourceBuffer.cpp:
+        (WebCore::SourceBuffer::bufferedSamplesForTrackId):
+        (WebCore::SourceBuffer::bufferedSamplesForTrackID): Deleted.
+        * Modules/mediasource/SourceBuffer.h:
+        * platform/graphics/SourceBufferPrivate.cpp:
+        (WebCore::SourceBufferPrivate::bufferedSamplesForTrackId):
+        (WebCore::SourceBufferPrivate::bufferedSamplesForTrackID): Deleted.
+        * platform/graphics/SourceBufferPrivate.h:
+        (WebCore::SourceBufferPrivate::enqueuedSamplesForTrackID):
+        * testing/Internals.cpp:
+        (WebCore::Internals::bufferedSamplesForTrackId):
+        (WebCore::Internals::bufferedSamplesForTrackID): Deleted.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2020-12-16  Kate Cheney  <katherine_cheney@apple.com>
 
         Still can't login to my.playstation.com
diff --git a/Source/WebCore/Modules/mediasource/SourceBuffer.cpp b/Source/WebCore/Modules/mediasource/SourceBuffer.cpp
@@ -1218,9 +1218,9 @@ void SourceBuffer::reportExtraMemoryAllocated(uint64_t extraMemory)
     scriptExecutionContext()->vm().heap.deprecatedReportExtraMemory(extraMemoryCostDelta);
 }
 
-Vector<String> SourceBuffer::bufferedSamplesForTrackID(const AtomString& trackID)
+void SourceBuffer::bufferedSamplesForTrackId(const AtomString& trackID, CompletionHandler<void(Vector<String>&&)>&& completionHandler)
 {
-    return m_private->bufferedSamplesForTrackID(trackID);
+    m_private->bufferedSamplesForTrackId(trackID, WTFMove(completionHandler));
 }
 
 Vector<String> SourceBuffer::enqueuedSamplesForTrackID(const AtomString& trackID)
diff --git a/Source/WebCore/Modules/mediasource/SourceBuffer.h b/Source/WebCore/Modules/mediasource/SourceBuffer.h
@@ -201,7 +201,7 @@ class SourceBuffer final
     void rangeRemoval(const MediaTime&, const MediaTime&);
 
     friend class Internals;
-    WEBCORE_EXPORT Vector<String> bufferedSamplesForTrackID(const AtomString&);
+    WEBCORE_EXPORT void bufferedSamplesForTrackId(const AtomString&, CompletionHandler<void(Vector<String>&&)>&&);
     WEBCORE_EXPORT Vector<String> enqueuedSamplesForTrackID(const AtomString&);
     WEBCORE_EXPORT MediaTime minimumUpcomingPresentationTimeForTrackID(const AtomString&);
     WEBCORE_EXPORT void setMaximumQueueDepthForTrackID(const AtomString&, uint64_t);
diff --git a/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp b/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp
@@ -201,18 +201,18 @@ void SourceBufferPrivate::clearTrackBuffers()
     }
 }
 
-Vector<String> SourceBufferPrivate::bufferedSamplesForTrackID(const AtomString& trackID)
+void SourceBufferPrivate::bufferedSamplesForTrackId(const AtomString& trackId, CompletionHandler<void(Vector<String>&&)>&& completionHandler)
 {
-    auto it = m_trackBufferMap.find(trackID);
+    auto it = m_trackBufferMap.find(trackId);
     if (it == m_trackBufferMap.end())
-        return { };
+        completionHandler({ });
 
     auto& trackBuffer = it->value;
     Vector<String> sampleDescriptions;
     for (auto& pair : trackBuffer.samples.decodeOrder())
         sampleDescriptions.append(toString(*pair.second));
 
-    return sampleDescriptions;
+    completionHandler(WTFMove(sampleDescriptions));
 }
 
 MediaTime SourceBufferPrivate::fastSeekTimeForMediaTime(const MediaTime& targetTime, const MediaTime& negativeThreshold, const MediaTime& positiveThreshold)
diff --git a/Source/WebCore/platform/graphics/SourceBufferPrivate.h b/Source/WebCore/platform/graphics/SourceBufferPrivate.h
@@ -131,8 +131,8 @@ class SourceBufferPrivate
     };
 
     // Internals Utility methods
+    WEBCORE_EXPORT virtual void bufferedSamplesForTrackId(const AtomString&, CompletionHandler<void(Vector<String>&&)>&&);
     virtual Vector<String> enqueuedSamplesForTrackID(const AtomString&) { return { }; }
-    Vector<String> bufferedSamplesForTrackID(const AtomString&);
     virtual MediaTime minimumUpcomingPresentationTimeForTrackID(const AtomString&) { return MediaTime::invalidTime(); }
     virtual void setMaximumQueueDepthForTrackID(const AtomString&, uint64_t) { }
     WEBCORE_EXPORT MediaTime fastSeekTimeForMediaTime(const MediaTime& targetTime, const MediaTime& negativeThreshold, const MediaTime& positiveThreshold);
diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
@@ -4067,9 +4067,11 @@ void Internals::initializeMockMediaSource()
     MediaPlayerFactorySupport::callRegisterMediaEngine(MockMediaPlayerMediaSource::registerMediaEngine);
 }
 
-Vector<String> Internals::bufferedSamplesForTrackID(SourceBuffer& buffer, const AtomString& trackID)
+void Internals::bufferedSamplesForTrackId(SourceBuffer& buffer, const AtomString& trackId, BufferedSamplesPromise&& promise)
 {
-    return buffer.bufferedSamplesForTrackID(trackID);
+    buffer.bufferedSamplesForTrackId(trackId, [promise = WTFMove(promise)](auto&& samples) mutable {
+        promise.resolve(WTFMove(samples));
+    });
 }
 
 Vector<String> Internals::enqueuedSamplesForTrackID(SourceBuffer& buffer, const AtomString& trackID)
diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h
@@ -657,7 +657,8 @@ class Internals final : public RefCounted<Internals>, private ContextDestruction
 
 #if ENABLE(MEDIA_SOURCE)
     WEBCORE_TESTSUPPORT_EXPORT void initializeMockMediaSource();
-    Vector<String> bufferedSamplesForTrackID(SourceBuffer&, const AtomString&);
+    using BufferedSamplesPromise = DOMPromiseDeferred<IDLSequence<IDLDOMString>>;
+    void bufferedSamplesForTrackId(SourceBuffer&, const AtomString&, BufferedSamplesPromise&&);
     Vector<String> enqueuedSamplesForTrackID(SourceBuffer&, const AtomString&);
     double minimumUpcomingPresentationTimeForTrackID(SourceBuffer&, const AtomString&);
     void setShouldGenerateTimestamps(SourceBuffer&, bool);
diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl
@@ -684,7 +684,7 @@ enum TreeType {
     undefined setSelectionWithoutValidation(Node baseNode, unsigned long baseOffset, Node? extentNode, unsigned long extentOffset);
 
     [Conditional=MEDIA_SOURCE] undefined initializeMockMediaSource();
-    [Conditional=MEDIA_SOURCE] sequence<DOMString> bufferedSamplesForTrackID(SourceBuffer buffer, DOMString trackID);
+    [Conditional=MEDIA_SOURCE] Promise<sequence<DOMString>> bufferedSamplesForTrackId(SourceBuffer buffer, DOMString trackId);
     [Conditional=MEDIA_SOURCE] sequence<DOMString> enqueuedSamplesForTrackID(SourceBuffer buffer, DOMString trackID);
     [Conditional=MEDIA_SOURCE] undefined setShouldGenerateTimestamps(SourceBuffer buffer, boolean flag);
     [Conditional=MEDIA_SOURCE] double minimumUpcomingPresentationTimeForTrackID(SourceBuffer buffer, DOMString trackID);
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
diff --git a/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.cpp b/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.cpp
diff --git a/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.h b/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.h
diff --git a/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.messages.in b/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.messages.in
diff --git a/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp b/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp
diff --git a/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.h b/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.h

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,9 @@`
`45`	`45`	`run('sourceBuffer.appendBuffer(samples)');`
`46`	`46`	`}`
`47`	`47`
`48`		`- function loadMoreOrderedSamples()`
	`48`	`+ async function loadMoreOrderedSamples()`
`49`	`49`	`{`
`50`		`- bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);`
	`50`	`+ bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);`
`51`	`51`	`testExpected("bufferedSamples.length", 6);`
`52`	`52`	`bufferedSamples.forEach(consoleWrite);`
`53`	`53`
`@@ -63,9 +63,9 @@`
`63`	`63`	`run('sourceBuffer.appendBuffer(samples)');`
`64`	`64`	`}`
`65`	`65`
`66`		`- function loadUnorderedSamples()`
	`66`	`+ async function loadUnorderedSamples()`
`67`	`67`	`{`
`68`		`- bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);`
	`68`	`+ bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);`
`69`	`69`	`testExpected("bufferedSamples.length", 6);`
`70`	`70`	`bufferedSamples.forEach(consoleWrite);`
`71`	`71`
`@@ -81,9 +81,9 @@`
`81`	`81`	`run('sourceBuffer.appendBuffer(samples)');`
`82`	`82`	`}`
`83`	`83`
`84`		`- function samplesAdded()`
	`84`	`+ async function samplesAdded()`
`85`	`85`	`{`
`86`		`- bufferedSamples = internals.bufferedSamplesForTrackID(sourceBuffer, 1);`
	`86`	`+ bufferedSamples = await internals.bufferedSamplesForTrackId(sourceBuffer, 1);`
`87`	`87`	`testExpected("bufferedSamples.length", 6);`
`88`	`88`	`bufferedSamples.forEach(consoleWrite);`
`89`	`89`