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
6b123590
authored
Nov 14, 2014
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Correctly propagate errors
parent
643f33f7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
View file @
6b123590
...
...
@@ -165,7 +165,7 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
@Override
public
int
readData
(
int
track
,
long
playbackPositionUs
,
MediaFormatHolder
formatHolder
,
SampleHolder
sampleHolder
,
boolean
onlyReadDiscontinuity
)
{
SampleHolder
sampleHolder
,
boolean
onlyReadDiscontinuity
)
throws
IOException
{
Assertions
.
checkState
(
prepared
);
downstreamPositionUs
=
playbackPositionUs
;
...
...
@@ -175,6 +175,9 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
}
if
(
onlyReadDiscontinuity
||
isPendingReset
()
||
extractors
.
isEmpty
())
{
if
(
currentLoadableException
!=
null
)
{
throw
currentLoadableException
;
}
return
NOTHING_READ
;
}
...
...
@@ -192,6 +195,9 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
}
if
(!
extractor
.
isPrepared
())
{
if
(
currentLoadableException
!=
null
)
{
throw
currentLoadableException
;
}
return
NOTHING_READ
;
}
...
...
@@ -208,7 +214,14 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
return
SAMPLE_READ
;
}
return
loadingFinished
?
END_OF_STREAM
:
NOTHING_READ
;
if
(
loadingFinished
)
{
return
END_OF_STREAM
;
}
if
(
currentLoadableException
!=
null
)
{
throw
currentLoadableException
;
}
return
NOTHING_READ
;
}
@Override
...
...
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