sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash introduced by previous change.

Browse source
This commit is contained in:
Oliver Woodman 2015-06-19 20:05:34 +01:00
parent b8df8ecb47
commit 97aaee6d15
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
View file

@ -353,18 +353,17 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader
@Override @Override
public void onLoadCompleted(Loadable loadable) { public void onLoadCompleted(Loadable loadable) {
Assertions.checkState(loadable == currentLoadable);
long now = SystemClock.elapsedRealtime(); long now = SystemClock.elapsedRealtime();
long loadDurationMs = now - currentLoadStartTimeMs; long loadDurationMs = now - currentLoadStartTimeMs;
if (currentTsLoadable != null) {
previousTsLoadable = currentTsLoadable;
currentTsLoadable = null;
}
chunkSource.onChunkLoadCompleted(currentLoadable); chunkSource.onChunkLoadCompleted(currentLoadable);
if (isTsChunk(currentLoadable)) { if (isTsChunk(currentLoadable)) {
TsChunk tsChunk = (TsChunk) loadable; Assertions.checkState(currentLoadable == currentTsLoadable);
loadingFinished = tsChunk.isLastChunk; loadingFinished = currentTsLoadable.isLastChunk;
notifyLoadCompleted(currentLoadable.bytesLoaded(), tsChunk.type, tsChunk.trigger, previousTsLoadable = currentTsLoadable;
tsChunk.format, tsChunk.startTimeUs, tsChunk.endTimeUs, now, loadDurationMs); notifyLoadCompleted(currentLoadable.bytesLoaded(), currentTsLoadable.type,
currentTsLoadable.trigger, currentTsLoadable.format, currentTsLoadable.startTimeUs,
currentTsLoadable.endTimeUs, now, loadDurationMs);
} else { } else {
notifyLoadCompleted(currentLoadable.bytesLoaded(), currentLoadable.type, notifyLoadCompleted(currentLoadable.bytesLoaded(), currentLoadable.type,
currentLoadable.trigger, currentLoadable.format, -1, -1, now, loadDurationMs); currentLoadable.trigger, currentLoadable.format, -1, -1, now, loadDurationMs);
@ -534,10 +533,10 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader
private long getNextLoadPositionUs() { private long getNextLoadPositionUs() {
if (isPendingReset()) { if (isPendingReset()) {
return pendingResetPositionUs; return pendingResetPositionUs;
} else if (loader.isLoading()) {
return currentTsLoadable.isLastChunk ? -1 : currentTsLoadable.endTimeUs;
} else { } else {
return previousTsLoadable.isLastChunk ? -1 : previousTsLoadable.endTimeUs; return currentTsLoadable != null
? (currentTsLoadable.isLastChunk ? -1 : currentTsLoadable.endTimeUs)
: (previousTsLoadable.isLastChunk ? -1 : previousTsLoadable.endTimeUs);
} }
} }