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

Enable nullness checking for DefaultMediaClock

Browse source 
PiperOrigin-RevId: 322542289
This commit is contained in:
ibaker 2020-07-22 11:37:44 +01:00 committed by Oliver Woodman
parent 0efec5f6c1
commit 6e751c35c7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
View file

@ -16,6 +16,7 @@
package com.google.android.exoplayer2; package com.google.android.exoplayer2;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.MediaClock; import com.google.android.exoplayer2.util.MediaClock;
import com.google.android.exoplayer2.util.StandaloneMediaClock; import com.google.android.exoplayer2.util.StandaloneMediaClock;
@ -133,7 +134,9 @@ import com.google.android.exoplayer2.util.StandaloneMediaClock;
@Override @Override
public long getPositionUs() { public long getPositionUs() {
return isUsingStandaloneClock ? standaloneClock.getPositionUs() : rendererClock.getPositionUs(); return isUsingStandaloneClock
? standaloneClock.getPositionUs()
: Assertions.checkNotNull(rendererClock).getPositionUs();
} }
@Override @Override
@ -160,6 +163,9 @@ import com.google.android.exoplayer2.util.StandaloneMediaClock;
} }
return; return;
} }
// We are either already using the renderer clock or switching from the standalone to the
// renderer clock, so it must be non-null.
MediaClock rendererClock = Assertions.checkNotNull(this.rendererClock);
long rendererClockPositionUs = rendererClock.getPositionUs(); long rendererClockPositionUs = rendererClock.getPositionUs();
if (isUsingStandaloneClock) { if (isUsingStandaloneClock) {
// Ensure enabling the renderer clock doesn't jump backwards in time. // Ensure enabling the renderer clock doesn't jump backwards in time.