sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-06-29 05:39:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix unintentional new sessions after player release in stats listener.

Browse source 
PlaybackStatsListener has a method whose original intention was to be
called when the player is releaed to finish all pending sessions.
However, this also meant that later events (e.g. onVideoDecoderDisabled)
could create new sessions because the old one was already finished.

Use the new onPlayerReleased callback to implement this properly and to
fix the unintentional new session creation.

PiperOrigin-RevId: 347809527
This commit is contained in:
tonihei 2020-12-16 14:16:18 +00:00 committed by Christos Tsilopoulos
parent e95e2e0f73
commit 3b277b2810
2 changed files with 6 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
View file

@ -147,28 +147,6 @@ public final class PlaybackStatsListener
return activeStatsTracker == null ? null : activeStatsTracker.build(/* isFinal= */ false);
}
/**
* Finishes all pending playback sessions. Should be called when the listener is removed from the
* player or when the player is released.
*/
public void finishAllSessions() {
// TODO: Add AnalyticsListener.onAttachedToPlayer and onDetachedFromPlayer to auto-release with
// an actual EventTime. Should also simplify other cases where the listener needs to be released
// separately from the player.
sessionManager.finishAllSessions(
new EventTime(
SystemClock.elapsedRealtime(),
Timeline.EMPTY,
/* windowIndex= */ 0,
/* mediaPeriodId= */ null,
/* eventPlaybackPositionMs= */ 0,
Timeline.EMPTY,
/* currentWindowIndex= */ 0,
/* currentMediaPeriodId= */ null,
/* currentPlaybackPositionMs= */ 0,
/* totalBufferedDurationMs= */ 0));
}
// PlaybackSessionManager.Listener implementation.
@Override
@ -309,6 +287,9 @@ public final class PlaybackStatsListener
onSeekStartedEventTime = null;
videoFormat = null;
audioFormat = null;
if (events.contains(AnalyticsListener.EVENT_PLAYER_RELEASED)) {
sessionManager.finishAllSessions(events.getEventTime(EVENT_PLAYER_RELEASED));
}
}
private void maybeAddSessions(Player player, Events events) {

24
library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java
View file

@ -152,7 +152,7 @@ public final class PlaybackStatsListenerTest {
}
@Test
public void finishAllSessions_callsAllPendingCallbacks() throws Exception {
public void playerRelease_callsAllPendingCallbacks() throws Exception {
PlaybackStatsListener.Callback callback = mock(PlaybackStatsListener.Callback.class);
PlaybackStatsListener playbackStatsListener =
new PlaybackStatsListener(/* keepHistory= */ true, callback);
@ -167,7 +167,8 @@ public final class PlaybackStatsListenerTest {
TestPlayerRunHelper.playUntilPosition(
player, /* windowIndex= */ 0, /* positionMs= */ player.getDuration());
runMainLooperToNextTask();
playbackStatsListener.finishAllSessions();
player.release();
runMainLooperToNextTask();
ArgumentCaptor<AnalyticsListener.EventTime> eventTimeCaptor =
ArgumentCaptor.forClass(AnalyticsListener.EventTime.class);
@ -178,23 +179,4 @@ public final class PlaybackStatsListenerTest {
.collect(Collectors.toList()))
.containsExactly(0, 1);
}
@Test
public void finishAllSessions_doesNotCallCallbackAgainWhenSessionWouldBeAutomaticallyFinished() {
PlaybackStatsListener.Callback callback = mock(PlaybackStatsListener.Callback.class);
PlaybackStatsListener playbackStatsListener =
new PlaybackStatsListener(/* keepHistory= */ true, callback);
player.addAnalyticsListener(playbackStatsListener);
player.setMediaItem(MediaItem.fromUri("http://test.org"));
runMainLooperToNextTask();
playbackStatsListener.finishAllSessions();
// Simulate removing the playback item to ensure the session would finish if it hadn't already.
player.clearMediaItems();
runMainLooperToNextTask();
// Verify the callback was called once only.
verify(callback).onPlaybackStatsReady(any(), any());
}
}