loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix flakiness in ExoPlayerTest

Browse Source 
In the flaky test `ExoPlayerTest.loading_withLargeAllocationCausingOom_playsRemainingMediaAndThenThrows`, it is indeterministic that when the message `MSG_IO_EXCEPTION` from the loader thread will arrive on the playback looper. If it arrives after `MSG_PERIOD_PREPARED`, then the period can continue loading and get the three samples written to the `SampleQueue` before the intentional OOM surfacing to the `ExoPlayerImplInternal`, otherwise, the OOM will be detected by `ExoPlayerImplInternal` very early and the player disallows to load three samples, which will cause the assertion to fail.

As we are expecting the three samples to play until the playback fails, we should assume that the `Loader` encounters the OOM after those samples loaded, thus we need to put this trigger a bit later until the `SampleStreamItem`s are handled by the `FakeSampleStream`. This could be checked by the return value of `FakeMediaPeriod.continueLoading` (super class implementation). However, `FakeMediaPeriod.continueLoading` originally always returns `true`, which is not aligned with the javadoc of `MediaPeriod.continueLoading`:

"return `true` if progress was made, meaning that `getNextLoadPositionUs()` will return a different value than prior to the call, `false` otherwise."

then we should also modify that logic.

PiperOrigin-RevId: 668438316
This commit is contained in:
tianyifeng 2024-08-28 07:13:31 -07:00 committed by Copybara-Service
parent 9c5ea4f1ba
commit c2e81052e8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java
View File

@ -9449,8 +9449,8 @@ public class ExoPlayerTest {
@Override
public boolean continueLoading(LoadingInfo loadingInfo) {
super.continueLoading(loadingInfo);
if (!loader.isLoading()) {
boolean progressMade = super.continueLoading(loadingInfo);
if (progressMade && !loader.isLoading()) {
loader.startLoading(
loadable, new FakeLoaderCallback(), /* defaultMinRetryCount= */ 1);
}

4
libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMediaPeriod.java
View File

@ -363,10 +363,12 @@ public class FakeMediaPeriod implements MediaPeriod {
@Override
public boolean continueLoading(LoadingInfo loadingInfo) {
boolean progressMade = false;
for (FakeSampleStream sampleStream : sampleStreams) {
sampleStream.writeData(loadingInfo.playbackPositionUs);
progressMade = true;
}
return true;
return progressMade;
}
@Override