From 646f6a74c94e4ffb228ea018b61fff1eeb59e966 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Thu, 23 Mar 2017 17:44:47 +0000
Subject: [PATCH] Fix NullPointerException enabling WebVtt subtitles in DASH

Issue: #2596
---
 .../source/dash/DefaultDashChunkSource.java   | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
index 7ccea8a2a6..a6e909ddac 100644
--- a/library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
+++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
@@ -180,23 +180,24 @@ public class DefaultDashChunkSource implements DashChunkSource {
 
     RepresentationHolder representationHolder =
         representationHolders[trackSelection.getSelectedIndex()];
-    Representation selectedRepresentation = representationHolder.representation;
-    DashSegmentIndex segmentIndex = representationHolder.segmentIndex;
 
-    RangedUri pendingInitializationUri = null;
-    RangedUri pendingIndexUri = null;
-    if (representationHolder.extractorWrapper.getSampleFormats() == null) {
-      pendingInitializationUri = selectedRepresentation.getInitializationUri();
-    }
-    if (segmentIndex == null) {
-      pendingIndexUri = selectedRepresentation.getIndexUri();
-    }
-    if (pendingInitializationUri != null || pendingIndexUri != null) {
-      // We have initialization and/or index requests to make.
-      out.chunk = newInitializationChunk(representationHolder, dataSource,
-          trackSelection.getSelectedFormat(), trackSelection.getSelectionReason(),
-          trackSelection.getSelectionData(), pendingInitializationUri, pendingIndexUri);
-      return;
+    if (representationHolder.extractorWrapper != null) {
+      Representation selectedRepresentation = representationHolder.representation;
+      RangedUri pendingInitializationUri = null;
+      RangedUri pendingIndexUri = null;
+      if (representationHolder.extractorWrapper.getSampleFormats() == null) {
+        pendingInitializationUri = selectedRepresentation.getInitializationUri();
+      }
+      if (representationHolder.segmentIndex == null) {
+        pendingIndexUri = selectedRepresentation.getIndexUri();
+      }
+      if (pendingInitializationUri != null || pendingIndexUri != null) {
+        // We have initialization and/or index requests to make.
+        out.chunk = newInitializationChunk(representationHolder, dataSource,
+            trackSelection.getSelectedFormat(), trackSelection.getSelectionReason(),
+            trackSelection.getSelectionData(), pendingInitializationUri, pendingIndexUri);
+        return;
+      }
     }
 
     long nowUs = getNowUnixTimeUs();