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

Replace overrides of deprecated AnalyticsListener#onPlayerStateChanged

Browse Source 
Also remove some duplicate logging from ExoHostedTest - EventLogger
logs the same info already.

PiperOrigin-RevId: 321366052
This commit is contained in:
ibaker 2020-07-15 16:35:53 +01:00 committed by Oliver Woodman
parent 422f451cf9
commit f55526f7bc
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
View File

@ -1889,8 +1889,17 @@ public final class ExoPlayerTest {
AnalyticsListener listener = AnalyticsListener listener =
new AnalyticsListener() { new AnalyticsListener() {
@Override @Override
public void onPlayerStateChanged( public void onPlaybackStateChanged(EventTime eventTime, @Player.State int state) {
EventTime eventTime, boolean playWhenReady, int playbackState) { if (eventTime.mediaPeriodId != null) {
reportedWindowSequenceNumbers.add(eventTime.mediaPeriodId.windowSequenceNumber);
}
}
@Override
public void onPlayWhenReadyChanged(
EventTime eventTime,
boolean playWhenReady,
@Player.PlayWhenReadyChangeReason int reason) {
if (eventTime.mediaPeriodId != null) { if (eventTime.mediaPeriodId != null) {
reportedWindowSequenceNumbers.add(eventTime.mediaPeriodId.windowSequenceNumber); reportedWindowSequenceNumbers.add(eventTime.mediaPeriodId.windowSequenceNumber);
} }

16
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
View File

@ -39,7 +39,6 @@ import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.EventLogger; import com.google.android.exoplayer2.util.EventLogger;
import com.google.android.exoplayer2.util.HandlerWrapper; import com.google.android.exoplayer2.util.HandlerWrapper;
import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf; import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@ -74,7 +73,6 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
private @MonotonicNonNull ExoPlaybackException playerError; private @MonotonicNonNull ExoPlaybackException playerError;
private boolean playerWasPrepared; private boolean playerWasPrepared;
private boolean playing;
private long totalPlayingTimeMs; private long totalPlayingTimeMs;
private long lastPlayingStartTimeMs; private long lastPlayingStartTimeMs;
private long sourceDurationMs; private long sourceDurationMs;
@ -186,21 +184,21 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
// AnalyticsListener // AnalyticsListener
@Override @Override
public final void onPlayerStateChanged( public final void onPlaybackStateChanged(EventTime eventTime, @Player.State int playbackState) {
EventTime eventTime, boolean playWhenReady, @Player.State int playbackState) {
Log.d(tag, "state [" + playWhenReady + ", " + playbackState + "]");
playerWasPrepared |= playbackState != Player.STATE_IDLE; playerWasPrepared |= playbackState != Player.STATE_IDLE;
if (playbackState == Player.STATE_ENDED if (playbackState == Player.STATE_ENDED
|| (playbackState == Player.STATE_IDLE && playerWasPrepared)) { || (playbackState == Player.STATE_IDLE && playerWasPrepared)) {
stopTest(); stopTest();
} }
boolean playing = playWhenReady && playbackState == Player.STATE_READY; }
if (!this.playing && playing) {
@Override
public void onIsPlayingChanged(EventTime eventTime, boolean playing) {
if (playing) {
lastPlayingStartTimeMs = SystemClock.elapsedRealtime(); lastPlayingStartTimeMs = SystemClock.elapsedRealtime();
} else if (this.playing && !playing) { } else {
totalPlayingTimeMs += SystemClock.elapsedRealtime() - lastPlayingStartTimeMs; totalPlayingTimeMs += SystemClock.elapsedRealtime() - lastPlayingStartTimeMs;
} }
this.playing = playing;
} }
@Override @Override