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

Fix VOD to live transitions.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=130755346
This commit is contained in:
andrewlewis 2016-08-19 08:36:11 -07:00 committed by Oliver Woodman
parent f2ee7ef07b
commit 725337dab3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
View File

@ -1051,7 +1051,7 @@ import java.io.IOException;
private void maybeContinueLoading() { private void maybeContinueLoading() {
long nextLoadPositionUs = loadingPeriod.mediaPeriod.getNextLoadPositionUs(); long nextLoadPositionUs = loadingPeriod.mediaPeriod.getNextLoadPositionUs();
if (nextLoadPositionUs != C.END_OF_SOURCE_US) { if (nextLoadPositionUs != C.END_OF_SOURCE_US) {
long positionUs = internalPositionUs - loadingPeriod.offsetUs; long positionUs = internalPositionUs - loadingPeriod.offsetUs + loadingPeriod.startPositionUs;
long bufferedDurationUs = nextLoadPositionUs - positionUs; long bufferedDurationUs = nextLoadPositionUs - positionUs;
boolean continueLoading = loadControl.shouldContinueLoading(bufferedDurationUs); boolean continueLoading = loadControl.shouldContinueLoading(bufferedDurationUs);
setIsLoading(continueLoading); setIsLoading(continueLoading);

2
library/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
View File

@ -226,7 +226,7 @@ public final class ConcatenatingMediaSource implements MediaSource {
@Override @Override
public long getWindowOffsetInFirstPeriodUs(int windowIndex) { public long getWindowOffsetInFirstPeriodUs(int windowIndex) {
int sourceIndex = getSourceIndexForWindow(windowIndex); int sourceIndex = getSourceIndexForWindow(windowIndex);
int firstWindowIndexInSource = getFirstPeriodIndexInSource(sourceIndex); int firstWindowIndexInSource = getFirstWindowIndexInSource(sourceIndex);
return timelines[sourceIndex].getWindowOffsetInFirstPeriodUs( return timelines[sourceIndex].getWindowOffsetInFirstPeriodUs(
windowIndex - firstWindowIndexInSource); windowIndex - firstWindowIndexInSource);
} }