sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reset isLoading when calling SimpleBasePlayer.stop/release

Browse source 
isLoading is not allowed to be true when IDLE, so we have to set to
false when stopping in case it was set to true before.

PiperOrigin-RevId: 494975405
(cherry picked from commit 6e7de583bb)
This commit is contained in:
tonihei 2022-12-13 11:37:20 +00:00 committed by christosts
parent cdc07e2175
commit 11bd727ac5
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/common/src/main/java/androidx/media3/common/SimpleBasePlayer.java
View file

@ -2200,6 +2200,7 @@ public abstract class SimpleBasePlayer extends BasePlayer {
.setTotalBufferedDurationMs(PositionSupplier.ZERO) .setTotalBufferedDurationMs(PositionSupplier.ZERO)
.setContentBufferedPositionMs(state.contentPositionMsSupplier) .setContentBufferedPositionMs(state.contentPositionMsSupplier)
.setAdBufferedPositionMs(state.adPositionMsSupplier) .setAdBufferedPositionMs(state.adPositionMsSupplier)
.setIsLoading(false)
.build()); .build());
} }
@ -2231,6 +2232,7 @@ public abstract class SimpleBasePlayer extends BasePlayer {
.setTotalBufferedDurationMs(PositionSupplier.ZERO) .setTotalBufferedDurationMs(PositionSupplier.ZERO)
.setContentBufferedPositionMs(state.contentPositionMsSupplier) .setContentBufferedPositionMs(state.contentPositionMsSupplier)
.setAdBufferedPositionMs(state.adPositionMsSupplier) .setAdBufferedPositionMs(state.adPositionMsSupplier)
.setIsLoading(false)
.build(); .build();
} }

9
libraries/common/src/test/java/androidx/media3/common/SimpleBasePlayerTest.java
View file

@ -2095,6 +2095,7 @@ public class SimpleBasePlayerTest {
.setPlaylist( .setPlaylist(
ImmutableList.of( ImmutableList.of(
new SimpleBasePlayer.MediaItemData.Builder(/* uid= */ new Object()).build())) new SimpleBasePlayer.MediaItemData.Builder(/* uid= */ new Object()).build()))
.setIsLoading(true)
.build(); .build();
// Additionally set the repeat mode to see a difference between the placeholder and new state. // Additionally set the repeat mode to see a difference between the placeholder and new state.
State updatedState = State updatedState =
@ -2102,6 +2103,7 @@ public class SimpleBasePlayerTest {
.buildUpon() .buildUpon()
.setPlaybackState(Player.STATE_IDLE) .setPlaybackState(Player.STATE_IDLE)
.setRepeatMode(Player.REPEAT_MODE_ALL) .setRepeatMode(Player.REPEAT_MODE_ALL)
.setIsLoading(false)
.build(); .build();
SettableFuture<?> future = SettableFuture.create(); SettableFuture<?> future = SettableFuture.create();
SimpleBasePlayer player = SimpleBasePlayer player =
@ -2124,9 +2126,12 @@ public class SimpleBasePlayerTest {
// Verify placeholder state and listener calls. // Verify placeholder state and listener calls.
assertThat(player.getPlaybackState()).isEqualTo(Player.STATE_IDLE); assertThat(player.getPlaybackState()).isEqualTo(Player.STATE_IDLE);
assertThat(player.getRepeatMode()).isEqualTo(Player.REPEAT_MODE_OFF); assertThat(player.getRepeatMode()).isEqualTo(Player.REPEAT_MODE_OFF);
assertThat(player.isLoading()).isFalse();
verify(listener).onPlaybackStateChanged(Player.STATE_IDLE); verify(listener).onPlaybackStateChanged(Player.STATE_IDLE);
verify(listener) verify(listener)
.onPlayerStateChanged(/* playWhenReady= */ false, /* playbackState= */ Player.STATE_IDLE); .onPlayerStateChanged(/* playWhenReady= */ false, /* playbackState= */ Player.STATE_IDLE);
verify(listener).onIsLoadingChanged(false);
verify(listener).onLoadingChanged(false);
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
future.set(null); future.set(null);
@ -2211,6 +2216,7 @@ public class SimpleBasePlayerTest {
.setPlaylist( .setPlaylist(
ImmutableList.of( ImmutableList.of(
new SimpleBasePlayer.MediaItemData.Builder(/* uid= */ new Object()).build())) new SimpleBasePlayer.MediaItemData.Builder(/* uid= */ new Object()).build()))
.setIsLoading(true)
.build(); .build();
// Additionally set the repeat mode to see a difference between the placeholder and new state. // Additionally set the repeat mode to see a difference between the placeholder and new state.
State updatedState = state.buildUpon().setRepeatMode(Player.REPEAT_MODE_ALL).build(); State updatedState = state.buildUpon().setRepeatMode(Player.REPEAT_MODE_ALL).build();
@ -2232,8 +2238,9 @@ public class SimpleBasePlayerTest {
player.release(); player.release();
// Verify initial change to IDLE without listener call. // Verify initial change to IDLE and !isLoading without listener call.
assertThat(player.getPlaybackState()).isEqualTo(Player.STATE_IDLE); assertThat(player.getPlaybackState()).isEqualTo(Player.STATE_IDLE);
assertThat(player.isLoading()).isFalse();
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
future.set(null); future.set(null);