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

Fix flakiness in ExoPlayerTest

Browse Source 
The two affected tests where playing until a specific
position to enable the player to read ahead. The method
pauses at exactly the target position, but then has
temporarily undetermined behavior because the playback
thread uses player.getClock().onThreadBlocked() that lets
the playback thread make progress in parallel to the test
thread. The tests were flaky because they sometimes made
so much progress that they ended playback before we could
query the updated renderer state.

This can be fixed by using
run(player).untilBackgroundThreadCondition instead, which
is guaranteed to be fully deterministic, but may not be able
to stop at exactly the desired position (which we don't
really need anyway for this test).

PiperOrigin-RevId: 634699752
This commit is contained in:
tonihei 2024-05-17 03:31:55 -07:00 committed by Copybara-Service
parent 2b5bb945e1
commit 34792f7b11
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13559,11 +13559,11 @@ public class ExoPlayerTest {
player.prepare();
// Play a bit until the second renderer has been enabled, but not yet started.
run(player).untilPosition(/* mediaItemIndex= */ 0, /* positionMs= */ 5000);
play(player).untilBackgroundThreadCondition(() -> player.getCurrentPosition() >= 5000);
@Renderer.State int videoState1 = videoRenderer.getState();
@Renderer.State int audioState1 = audioRenderer.getState();
// Play until we reached the start of the second item.
run(player).untilStartOfMediaItem(/* mediaItemIndex= */ 1);
run(player).untilBackgroundThreadCondition(() -> player.getCurrentMediaItemIndex() == 1);
run(player).untilPendingCommandsAreFullyHandled();
@Renderer.State int videoState2 = videoRenderer.getState();
@Renderer.State int audioState2 = audioRenderer.getState();
@ -13592,7 +13592,7 @@ public class ExoPlayerTest {
player.prepare();
// Play until the second renderer has been enabled, but has not yet started.
run(player).untilPosition(/* mediaItemIndex= */ 0, /* positionMs= */ 5000);
play(player).untilBackgroundThreadCondition(() -> player.getCurrentPosition() >= 5000);
// Pause in this "Read Ahead" state.
player.pause();
run(player).untilPendingCommandsAreFullyHandled();
@ -13604,7 +13604,7 @@ public class ExoPlayerTest {
@Renderer.State int videoState2 = videoRenderer.getState();
@Renderer.State int audioState2 = audioRenderer.getState();
// Play until the start of the second item.
run(player).untilStartOfMediaItem(/* mediaItemIndex= */ 1);
run(player).untilBackgroundThreadCondition(() -> player.getCurrentMediaItemIndex() == 1);
run(player).untilPendingCommandsAreFullyHandled();
@Renderer.State int videoState3 = videoRenderer.getState();
@Renderer.State int audioState3 = audioRenderer.getState();