Tweak null-checking in TextRenderer#getNextEventTime()

`subtitle` is only guaranteed to be non-null if `nextSubtitleEventIndex != C.INDEX_UNSET`. The null check added in 0efec5f was too early. Issue: #8017 PiperOrigin-RevId: 334777742
google · Oct 17, 2020 · 13d8860 · 13d8860
1 parent b8c8ce0
commit 13d8860
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -13,6 +13,8 @@
     *   Add support for `\h` SSA/ASS style override code (non-breaking space).
     *   Fix WebVTT subtitles in MP4 containers in DASH streams
         ([#7985](https://github.com/google/ExoPlayer/issues/7985)).
+    *   Fix NPE in `TextRenderer` when playing content with a single subtitle
+        buffer ([#8017](https://github.com/google/ExoPlayer/issues/8017)).
 *   UI:
     *   Do not require subtitleButton in custom layouts of StyledPlayerView
         ([#7962](https://github.com/google/ExoPlayer/issues/7962)).

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
@@ -325,10 +325,13 @@ private void replaceDecoder() {
   }
 
   private long getNextEventTime() {
+    if (nextSubtitleEventIndex == C.INDEX_UNSET) {
+      return Long.MAX_VALUE;
+    }
     checkNotNull(subtitle);
-    return nextSubtitleEventIndex == C.INDEX_UNSET
-        || nextSubtitleEventIndex >= subtitle.getEventTimeCount()
-        ? Long.MAX_VALUE : subtitle.getEventTime(nextSubtitleEventIndex);
+    return nextSubtitleEventIndex >= subtitle.getEventTimeCount()
+        ? Long.MAX_VALUE
+        : subtitle.getEventTime(nextSubtitleEventIndex);
   }
 
   private void updateOutput(List<Cue> cues) {