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

Change handling of renderer position offset for first media period.

Browse source 
This should be a no-op change. And it eliminates the need to use the index variable
which will be removed once the MediaPeriodHolderQueue is implemented.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=177963360
This commit is contained in:
tonihei 2017-12-05 09:10:05 -08:00 committed by Oliver Woodman
parent 88dea59cd2
commit 8a0a8339e8
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
View file

@ -1407,9 +1407,10 @@ import java.io.IOException;
return; return;
} }
long rendererPositionOffsetUs = loadingPeriodHolder == null long rendererPositionOffsetUs =
? RENDERER_TIMESTAMP_OFFSET_US loadingPeriodHolder == null
: (loadingPeriodHolder.getRendererOffset() + loadingPeriodHolder.info.durationUs); ? (info.startPositionUs + RENDERER_TIMESTAMP_OFFSET_US)
: (loadingPeriodHolder.getRendererOffset() + loadingPeriodHolder.info.durationUs);
int holderIndex = loadingPeriodHolder == null ? 0 : loadingPeriodHolder.index + 1; int holderIndex = loadingPeriodHolder == null ? 0 : loadingPeriodHolder.index + 1;
Object uid = playbackInfo.timeline.getPeriod(info.id.periodIndex, period, true).uid; Object uid = playbackInfo.timeline.getPeriod(info.id.periodIndex, period, true).uid;
MediaPeriodHolder newPeriodHolder = new MediaPeriodHolder(renderers, rendererCapabilities, MediaPeriodHolder newPeriodHolder = new MediaPeriodHolder(renderers, rendererCapabilities,
@ -1553,8 +1554,8 @@ import java.io.IOException;
public final int index; public final int index;
public final SampleStream[] sampleStreams; public final SampleStream[] sampleStreams;
public final boolean[] mayRetainStreamFlags; public final boolean[] mayRetainStreamFlags;
public final long rendererPositionOffsetUs;
public long rendererPositionOffsetUs;
public MediaPeriodInfo info; public MediaPeriodInfo info;
public boolean prepared; public boolean prepared;
public boolean hasEnabledTracks; public boolean hasEnabledTracks;
@ -1574,7 +1575,7 @@ import java.io.IOException;
MediaSource mediaSource, Object periodUid, int index, MediaPeriodInfo info) { MediaSource mediaSource, Object periodUid, int index, MediaPeriodInfo info) {
this.renderers = renderers; this.renderers = renderers;
this.rendererCapabilities = rendererCapabilities; this.rendererCapabilities = rendererCapabilities;
this.rendererPositionOffsetUs = rendererPositionOffsetUs; this.rendererPositionOffsetUs = rendererPositionOffsetUs - info.startPositionUs;
this.trackSelector = trackSelector; this.trackSelector = trackSelector;
this.loadControl = loadControl; this.loadControl = loadControl;
this.mediaSource = mediaSource; this.mediaSource = mediaSource;
@ -1601,8 +1602,7 @@ import java.io.IOException;
} }
public long getRendererOffset() { public long getRendererOffset() {
return index == 0 ? rendererPositionOffsetUs return rendererPositionOffsetUs;
: (rendererPositionOffsetUs - info.startPositionUs);
} }
public boolean isFullyBuffered() { public boolean isFullyBuffered() {
@ -1628,6 +1628,7 @@ import java.io.IOException;
prepared = true; prepared = true;
selectTracks(playbackSpeed); selectTracks(playbackSpeed);
long newStartPositionUs = updatePeriodTrackSelection(info.startPositionUs, false); long newStartPositionUs = updatePeriodTrackSelection(info.startPositionUs, false);
rendererPositionOffsetUs += info.startPositionUs - newStartPositionUs;
info = info.copyWithStartPositionUs(newStartPositionUs); info = info.copyWithStartPositionUs(newStartPositionUs);
} }