Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
646f6a74
authored
Mar 23, 2017
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix NullPointerException enabling WebVtt subtitles in DASH
Issue: #2596
parent
569cec7f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
View file @
646f6a74
...
@@ -180,15 +180,15 @@ public class DefaultDashChunkSource implements DashChunkSource {
...
@@ -180,15 +180,15 @@ public class DefaultDashChunkSource implements DashChunkSource {
RepresentationHolder
representationHolder
=
RepresentationHolder
representationHolder
=
representationHolders
[
trackSelection
.
getSelectedIndex
()];
representationHolders
[
trackSelection
.
getSelectedIndex
()];
Representation
selectedRepresentation
=
representationHolder
.
representation
;
DashSegmentIndex
segmentIndex
=
representationHolder
.
segmentIndex
;
if
(
representationHolder
.
extractorWrapper
!=
null
)
{
Representation
selectedRepresentation
=
representationHolder
.
representation
;
RangedUri
pendingInitializationUri
=
null
;
RangedUri
pendingInitializationUri
=
null
;
RangedUri
pendingIndexUri
=
null
;
RangedUri
pendingIndexUri
=
null
;
if
(
representationHolder
.
extractorWrapper
.
getSampleFormats
()
==
null
)
{
if
(
representationHolder
.
extractorWrapper
.
getSampleFormats
()
==
null
)
{
pendingInitializationUri
=
selectedRepresentation
.
getInitializationUri
();
pendingInitializationUri
=
selectedRepresentation
.
getInitializationUri
();
}
}
if
(
segmentIndex
==
null
)
{
if
(
representationHolder
.
segmentIndex
==
null
)
{
pendingIndexUri
=
selectedRepresentation
.
getIndexUri
();
pendingIndexUri
=
selectedRepresentation
.
getIndexUri
();
}
}
if
(
pendingInitializationUri
!=
null
||
pendingIndexUri
!=
null
)
{
if
(
pendingInitializationUri
!=
null
||
pendingIndexUri
!=
null
)
{
...
@@ -198,6 +198,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
...
@@ -198,6 +198,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
trackSelection
.
getSelectionData
(),
pendingInitializationUri
,
pendingIndexUri
);
trackSelection
.
getSelectionData
(),
pendingInitializationUri
,
pendingIndexUri
);
return
;
return
;
}
}
}
long
nowUs
=
getNowUnixTimeUs
();
long
nowUs
=
getNowUnixTimeUs
();
int
availableSegmentCount
=
representationHolder
.
getSegmentCount
();
int
availableSegmentCount
=
representationHolder
.
getSegmentCount
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment