Title: [270919] trunk
Revision
270919
Author
[email protected]
Date
2020-12-16 18:19:07 -0800 (Wed, 16 Dec 2020)

Log Message

[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.

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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (270918 => 270919)


--- trunk/LayoutTests/ChangeLog	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/ChangeLog	2020-12-17 02:19:07 UTC (rev 270919)
@@ -1,3 +1,33 @@
+2020-12-16  Peng Liu  <[email protected]>
+
+        [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  <[email protected]>
 
         Remove LayoutTests/platform/mac-bigsur-wk1

Modified: trunk/LayoutTests/gpu-process/TestExpectations (270918 => 270919)


--- trunk/LayoutTests/gpu-process/TestExpectations	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/gpu-process/TestExpectations	2020-12-17 02:19:07 UTC (rev 270919)
@@ -200,7 +200,6 @@
 
 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 ]

Modified: trunk/LayoutTests/media/media-source/media-source-append-acb-no-frame-lost.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-append-acb-no-frame-lost.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-append-acb-no-frame-lost.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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.

Modified: trunk/LayoutTests/media/media-source/media-source-append-acb-tolerance.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-append-acb-tolerance.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-append-acb-tolerance.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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.

Modified: trunk/LayoutTests/media/media-source/media-source-append-overlapping-dts.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-append-overlapping-dts.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-append-overlapping-dts.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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();

Modified: trunk/LayoutTests/media/media-source/media-source-append-presentation-durations.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-append-presentation-durations.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-append-presentation-durations.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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);
 

Modified: trunk/LayoutTests/media/media-source/media-source-append-twice-overlapping-sync-frame.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-append-twice-overlapping-sync-frame.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-append-twice-overlapping-sync-frame.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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();

Modified: trunk/LayoutTests/media/media-source/media-source-append-variable-frame-lengths-with-matching-durations.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-append-variable-frame-lengths-with-matching-durations.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-append-variable-frame-lengths-with-matching-durations.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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();

Modified: trunk/LayoutTests/media/media-source/media-source-dropped-iframe.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-dropped-iframe.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-dropped-iframe.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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:");

Modified: trunk/LayoutTests/media/media-source/media-source-overlapping-append.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-overlapping-append.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-overlapping-append.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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);
 

Modified: trunk/LayoutTests/media/media-source/media-source-overlapping-decodetime.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-overlapping-decodetime.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-overlapping-decodetime.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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);
 

Modified: trunk/LayoutTests/media/media-source/media-source-range-end-frame-not-removed.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-range-end-frame-not-removed.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-range-end-frame-not-removed.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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);
 

Modified: trunk/LayoutTests/media/media-source/media-source-range-start-frame-replaced.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-range-start-frame-replaced.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-range-start-frame-replaced.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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);

Modified: trunk/LayoutTests/media/media-source/media-source-remove-b-frame.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-remove-b-frame.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-remove-b-frame.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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);
 

Modified: trunk/LayoutTests/media/media-source/media-source-samples-out-of-order.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-samples-out-of-order.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-samples-out-of-order.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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);
 

Modified: trunk/LayoutTests/media/media-source/media-source-samples-resolution-change.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-samples-resolution-change.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-samples-resolution-change.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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();

Modified: trunk/LayoutTests/media/media-source/media-source-sequence-timestamps.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-sequence-timestamps.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-sequence-timestamps.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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);
 

Modified: trunk/LayoutTests/media/media-source/media-source-timeoffset.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-timeoffset.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-timeoffset.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -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);
 

Modified: trunk/LayoutTests/media/media-source/media-source-timestampoffset-rounding-error.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-timestampoffset-rounding-error.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-timestampoffset-rounding-error.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -41,7 +41,7 @@
         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");
@@ -48,7 +48,7 @@
         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");
@@ -55,7 +55,7 @@
         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:");

Modified: trunk/LayoutTests/media/media-source/media-source-timestampoffset-then-zero.html (270918 => 270919)


--- trunk/LayoutTests/media/media-source/media-source-timestampoffset-then-zero.html	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/LayoutTests/media/media-source/media-source-timestampoffset-then-zero.html	2020-12-17 02:19:07 UTC (rev 270919)
@@ -40,7 +40,7 @@
         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);
 
@@ -48,7 +48,7 @@
         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);
 

Modified: trunk/Source/WebCore/ChangeLog (270918 => 270919)


--- trunk/Source/WebCore/ChangeLog	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebCore/ChangeLog	2020-12-17 02:19:07 UTC (rev 270919)
@@ -1,3 +1,27 @@
+2020-12-16  Peng Liu  <[email protected]>
+
+        [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  <[email protected]>
 
         Still can't login to my.playstation.com

Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (270918 => 270919)


--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp	2020-12-17 02:19:07 UTC (rev 270919)
@@ -1218,9 +1218,9 @@
     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)

Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h (270918 => 270919)


--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h	2020-12-17 02:19:07 UTC (rev 270919)
@@ -201,7 +201,7 @@
     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);

Modified: trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp (270918 => 270919)


--- trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp	2020-12-17 02:19:07 UTC (rev 270919)
@@ -201,11 +201,11 @@
     }
 }
 
-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;
@@ -212,7 +212,7 @@
     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)

Modified: trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.h (270918 => 270919)


--- trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.h	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.h	2020-12-17 02:19:07 UTC (rev 270919)
@@ -131,8 +131,8 @@
     };
 
     // 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);

Modified: trunk/Source/WebCore/testing/Internals.cpp (270918 => 270919)


--- trunk/Source/WebCore/testing/Internals.cpp	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebCore/testing/Internals.cpp	2020-12-17 02:19:07 UTC (rev 270919)
@@ -4067,9 +4067,11 @@
     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)

Modified: trunk/Source/WebCore/testing/Internals.h (270918 => 270919)


--- trunk/Source/WebCore/testing/Internals.h	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebCore/testing/Internals.h	2020-12-17 02:19:07 UTC (rev 270919)
@@ -657,7 +657,8 @@
 
 #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);

Modified: trunk/Source/WebCore/testing/Internals.idl (270918 => 270919)


--- trunk/Source/WebCore/testing/Internals.idl	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebCore/testing/Internals.idl	2020-12-17 02:19:07 UTC (rev 270919)
@@ -684,7 +684,7 @@
     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);

Modified: trunk/Source/WebKit/ChangeLog (270918 => 270919)


--- trunk/Source/WebKit/ChangeLog	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebKit/ChangeLog	2020-12-17 02:19:07 UTC (rev 270919)
@@ -1,3 +1,20 @@
+2020-12-16  Peng Liu  <[email protected]>
+
+        [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.
+
+        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:
+
 2020-12-16  Jiewen Tan  <[email protected]>
 
         Unreviewed, a build fix for the latest Internal SDK

Modified: trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.cpp (270918 => 270919)


--- trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.cpp	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.cpp	2020-12-17 02:19:07 UTC (rev 270919)
@@ -217,6 +217,13 @@
     m_sourceBufferPrivate->seekToTime(mediaTime);
 }
 
+void RemoteSourceBufferProxy::bufferedSamplesForTrackId(TrackPrivateRemoteIdentifier trackPrivateRemoteIdentifier, CompletionHandler<void(Vector<String>&&)>&& completionHandler)
+{
+    ASSERT(m_trackIds.contains(trackPrivateRemoteIdentifier));
+    ASSERT(m_mediaDescriptions.contains(trackPrivateRemoteIdentifier));
+    m_sourceBufferPrivate->bufferedSamplesForTrackId(m_trackIds.get(trackPrivateRemoteIdentifier), WTFMove(completionHandler));
+}
+
 } // namespace WebKit
 
 #endif // ENABLE(GPU_PROCESS) && ENABLE(MEDIA_SOURCE)

Modified: trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.h (270918 => 270919)


--- trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.h	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.h	2020-12-17 02:19:07 UTC (rev 270919)
@@ -94,6 +94,7 @@
     void reenqueueMediaIfNeeded(const MediaTime& currentMediaTime, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize);
     void trySignalAllSamplesInTrackEnqueued();
     void seekToTime(const MediaTime&);
+    void bufferedSamplesForTrackId(TrackPrivateRemoteIdentifier, CompletionHandler<void(Vector<String>&&)>&&);
 
     GPUConnectionToWebProcess& m_connectionToWebProcess;
     RemoteSourceBufferIdentifier m_identifier;

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


--- trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.messages.in	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteSourceBufferProxy.messages.in	2020-12-17 02:19:07 UTC (rev 270919)
@@ -38,6 +38,7 @@
     ReenqueueMediaIfNeeded(MediaTime currentMediaTime, uint64_t pendingAppendDataCapacity, uint64_t maximumBufferSize)
     TrySignalAllSamplesInTrackEnqueued()
     SeekToTime(MediaTime mediaTime)
+    BufferedSamplesForTrackId(WebKit::TrackPrivateRemoteIdentifier trackId) -> (Vector<String> samples) Async
 }
 
 #endif

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


--- trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp	2020-12-17 02:19:07 UTC (rev 270919)
@@ -158,6 +158,13 @@
     m_gpuProcessConnection.connection().send(Messages::RemoteSourceBufferProxy::SeekToTime(mediaTime), 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 {
+        completionHandler(WTFMove(samples));
+    }, m_remoteSourceBufferIdentifier);
+}
+
 void SourceBufferPrivateRemote::sourceBufferPrivateDidReceiveInitializationSegment(InitializationSegmentInfo&& segmentInfo, CompletionHandler<void()>&& completionHandler)
 {
     if (!m_client || !m_mediaPlayerPrivate) {

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


--- trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.h	2020-12-17 02:18:58 UTC (rev 270918)
+++ trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.h	2020-12-17 02:19:07 UTC (rev 270919)
@@ -89,6 +89,9 @@
 
     bool isActive() const final { return m_isActive; }
 
+    // Internals Utility methods
+    void bufferedSamplesForTrackId(const AtomString&, CompletionHandler<void(Vector<String>&&)>&&) final;
+
     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
     void sourceBufferPrivateDidReceiveInitializationSegment(InitializationSegmentInfo&&, CompletionHandler<void()>&&);
     void sourceBufferPrivateStreamEndedWithDecodeError();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to