Fix NullPointerException enabling WebVtt subtitles in DASH

Issue: #2596 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=151013802

Fix NullPointerException enabling WebVtt subtitles in DASH
Issue: #2596 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=151013802
6faf5663 · olly · Oliver Woodman · 14f1b33f · 6faf5663
Commit 6faf5663 authored Mar 23, 2017 by olly Committed by Oliver Woodman Mar 23, 2017
Showing with 17 additions and 16 deletions
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
@@ -179,23 +179,24 @@ public class DefaultDashChunkSource implements DashChunkSource {
    RepresentationHolder representationHolder =
        representationHolders[trackSelection.getSelectedIndex()];
-    Representation selectedRepresentation = representationHolder.representation;
-    DashSegmentIndex segmentIndex = representationHolder.segmentIndex;
-    RangedUri pendingInitializationUri = null;
+    if (representationHolder.extractorWrapper != null) {
-    RangedUri pendingIndexUri = null;
+      Representation selectedRepresentation = representationHolder.representation;
-    if (representationHolder.extractorWrapper.getSampleFormats() == null) {
+      RangedUri pendingInitializationUri = null;
-      pendingInitializationUri = selectedRepresentation.getInitializationUri();
+      RangedUri pendingIndexUri = null;
-    }
+      if (representationHolder.extractorWrapper.getSampleFormats() == null) {
-    if (segmentIndex == null) {
+        pendingInitializationUri = selectedRepresentation.getInitializationUri();
-      pendingIndexUri = selectedRepresentation.getIndexUri();
+      }
-    }
+      if (representationHolder.segmentIndex == null) {
-    if (pendingInitializationUri != null || pendingIndexUri != null) {
+        pendingIndexUri = selectedRepresentation.getIndexUri();
-      // We have initialization and/or index requests to make.
+      }
-      out.chunk = newInitializationChunk(representationHolder, dataSource,
+      if (pendingInitializationUri != null || pendingIndexUri != null) {
-          trackSelection.getSelectedFormat(), trackSelection.getSelectionReason(),
+        // We have initialization and/or index requests to make.
-          trackSelection.getSelectionData(), pendingInitializationUri, pendingIndexUri);
+        out.chunk = newInitializationChunk(representationHolder, dataSource,
-      return;
+            trackSelection.getSelectedFormat(), trackSelection.getSelectionReason(),
+            trackSelection.getSelectionData(), pendingInitializationUri, pendingIndexUri);
+        return;
+      }
    }
    long nowUs = getNowUnixTimeUs();