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

Fix detection of postroll when seeking to duration

Browse Source 
Also mark all ads as played when the postroll plays, in the case the
player is backgrounded then resumed and the user seeks back.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164262738
This commit is contained in:
andrewlewis 2017-07-13 08:03:45 +01:00 committed by Oliver Woodman
parent c28ebf10f7
commit 287b999723
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
View File

@ -572,15 +572,25 @@ public final class ImaAdsLoader implements Player.EventListener, VideoAdPlayer,
return; return;
} }
if (!playingAd && !player.isPlayingAd()) { if (!playingAd && !player.isPlayingAd()) {
long positionUs = C.msToUs(player.getCurrentPosition()); checkForContentComplete();
int adGroupIndex = timeline.getPeriod(0, period).getAdGroupIndexForPositionUs(positionUs); if (sentContentComplete) {
if (adGroupIndex != C.INDEX_UNSET) { for (int i = 0; i < adPlaybackState.adGroupCount; i++) {
sentPendingContentPositionMs = false; if (adPlaybackState.adGroupTimesUs[i] != C.TIME_END_OF_SOURCE) {
pendingContentPositionMs = player.getCurrentPosition(); adPlaybackState.playedAdGroup(i);
}
}
updateAdPlaybackState();
} else {
long positionMs = player.getCurrentPosition();
timeline.getPeriod(0, period);
if (period.getAdGroupIndexForPositionUs(C.msToUs(positionMs)) != C.INDEX_UNSET) {
sentPendingContentPositionMs = false;
pendingContentPositionMs = positionMs;
}
} }
return; } else {
updateImaStateForPlayerState();
} }
updateImaStateForPlayerState();
} }
@Override @Override
@ -672,8 +682,8 @@ public final class ImaAdsLoader implements Player.EventListener, VideoAdPlayer,
} }
private void checkForContentComplete() { private void checkForContentComplete() {
if (contentDurationMs != C.TIME_UNSET if (contentDurationMs != C.TIME_UNSET && pendingContentPositionMs == C.TIME_UNSET
&& player.getCurrentPosition() + END_OF_CONTENT_POSITION_THRESHOLD_MS >= contentDurationMs && player.getContentPosition() + END_OF_CONTENT_POSITION_THRESHOLD_MS >= contentDurationMs
&& !sentContentComplete) { && !sentContentComplete) {
adsLoader.contentComplete(); adsLoader.contentComplete();
if (DEBUG) { if (DEBUG) {

2
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java
View File

@ -23,7 +23,7 @@ import com.google.android.exoplayer2.util.Assertions;
/** /**
* A {@link Timeline} for sources that have ads. * A {@link Timeline} for sources that have ads.
*/ */
public final class SinglePeriodAdTimeline extends ForwardingTimeline { /* package */ final class SinglePeriodAdTimeline extends ForwardingTimeline {
private final long[] adGroupTimesUs; private final long[] adGroupTimesUs;
private final int[] adCounts; private final int[] adCounts;