loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-06 23:20:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix NullPointerException enabling WebVtt subtitles in DASH

Browse Source 
Issue: #2596
This commit is contained in:
Oliver Woodman 2017-03-23 17:44:47 +00:00
parent 569cec7fe8
commit 646f6a74c9
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
View File

@ -180,23 +180,24 @@ public class DefaultDashChunkSource implements DashChunkSource {
RepresentationHolder representationHolder = RepresentationHolder representationHolder =
representationHolders[trackSelection.getSelectedIndex()]; 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(); long nowUs = getNowUnixTimeUs();