loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly propagate errors

Browse Source
This commit is contained in:
Oliver Woodman 2014-11-14 16:31:47 +00:00
parent 643f33f7e9
commit 6b123590ca
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
View File

@ -165,7 +165,7 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
@Override @Override
public int readData(int track, long playbackPositionUs, MediaFormatHolder formatHolder, public int readData(int track, long playbackPositionUs, MediaFormatHolder formatHolder,
SampleHolder sampleHolder, boolean onlyReadDiscontinuity) { SampleHolder sampleHolder, boolean onlyReadDiscontinuity) throws IOException {
Assertions.checkState(prepared); Assertions.checkState(prepared);
downstreamPositionUs = playbackPositionUs; downstreamPositionUs = playbackPositionUs;
@ -175,6 +175,9 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
} }
if (onlyReadDiscontinuity || isPendingReset() || extractors.isEmpty()) { if (onlyReadDiscontinuity || isPendingReset() || extractors.isEmpty()) {
if (currentLoadableException != null) {
throw currentLoadableException;
}
return NOTHING_READ; return NOTHING_READ;
} }
@ -192,6 +195,9 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
} }
if (!extractor.isPrepared()) { if (!extractor.isPrepared()) {
if (currentLoadableException != null) {
throw currentLoadableException;
}
return NOTHING_READ; return NOTHING_READ;
} }
@ -208,7 +214,14 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
return SAMPLE_READ; 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 @Override