Skip to content

SDK / exoplayer

Go to a project
Commit d2c4f740 by Rohit Singh Committed by microkatz
Options

Merge pull request #10618 from vishnuchilakala:fix/do_not_send_content_complete_if_midroll_skipped 

PiperOrigin-RevId: 482481703
(cherry picked from commit a413b478)
parent b97a9593
Inline Side-by-side
Showing with 29 additions and 17 deletions
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/AdTagLoader.java
...@@ -22,6 +22,7 @@ import static com.google.android.exoplayer2.ext.ima.ImaUtil.getAdGroupTimesUsFor ...@@ -22,6 +22,7 @@ import static com.google.android.exoplayer2.ext.ima.ImaUtil.getAdGroupTimesUsFor
import static com.google.android.exoplayer2.ext.ima.ImaUtil.getImaLooper; import static com.google.android.exoplayer2.ext.ima.ImaUtil.getImaLooper;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.android.exoplayer2.util.Assertions.checkState;
import static com.google.android.exoplayer2.util.Util.msToUs;
import static java.lang.Math.max; import static java.lang.Math.max;
import static java.lang.annotation.ElementType.TYPE_USE; import static java.lang.annotation.ElementType.TYPE_USE;
...@@ -50,6 +51,7 @@ import com.google.ads.interactivemedia.v3.api.ImaSdkSettings; ...@@ -50,6 +51,7 @@ import com.google.ads.interactivemedia.v3.api.ImaSdkSettings;
import com.google.ads.interactivemedia.v3.api.player.AdMediaInfo; import com.google.ads.interactivemedia.v3.api.player.AdMediaInfo;
import com.google.ads.interactivemedia.v3.api.player.ContentProgressProvider; import com.google.ads.interactivemedia.v3.api.player.ContentProgressProvider;
import com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer; import com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer;
import com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer.VideoAdPlayerCallback;
import com.google.ads.interactivemedia.v3.api.player.VideoProgressUpdate; import com.google.ads.interactivemedia.v3.api.player.VideoProgressUpdate;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayerLibraryInfo; import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
...@@ -355,7 +357,7 @@ import java.util.Map; ...@@ -355,7 +357,7 @@ import java.util.Map;
long contentPositionMs = getContentPeriodPositionMs(player, timeline, period); long contentPositionMs = getContentPeriodPositionMs(player, timeline, period);
int adGroupForPositionIndex = int adGroupForPositionIndex =
adPlaybackState.getAdGroupIndexForPositionUs( adPlaybackState.getAdGroupIndexForPositionUs(
Util.msToUs(contentPositionMs), Util.msToUs(contentDurationMs)); msToUs(contentPositionMs), msToUs(contentDurationMs));
if (adGroupForPositionIndex != C.INDEX_UNSET if (adGroupForPositionIndex != C.INDEX_UNSET
&& imaAdInfo != null && imaAdInfo != null
&& imaAdInfo.adGroupIndex != adGroupForPositionIndex) { && imaAdInfo.adGroupIndex != adGroupForPositionIndex) {
...@@ -379,7 +381,7 @@ import java.util.Map; ...@@ -379,7 +381,7 @@ import java.util.Map;
} }
adPlaybackState = adPlaybackState =
adPlaybackState.withAdResumePositionUs( adPlaybackState.withAdResumePositionUs(
playingAd ? Util.msToUs(player.getCurrentPosition()) : 0); playingAd ? msToUs(player.getCurrentPosition()) : 0);
} }
lastVolumePercent = getPlayerVolumePercent(); lastVolumePercent = getPlayerVolumePercent();
lastAdProgress = getAdVideoProgressUpdate(); lastAdProgress = getAdVideoProgressUpdate();
...@@ -609,11 +611,10 @@ import java.util.Map; ...@@ -609,11 +611,10 @@ import java.util.Map;
// Skip ads based on the start position as required. // Skip ads based on the start position as required.
int adGroupForPositionIndex = int adGroupForPositionIndex =
adPlaybackState.getAdGroupIndexForPositionUs( adPlaybackState.getAdGroupIndexForPositionUs(
Util.msToUs(contentPositionMs), Util.msToUs(contentDurationMs)); msToUs(contentPositionMs), msToUs(contentDurationMs));
if (adGroupForPositionIndex != C.INDEX_UNSET) { if (adGroupForPositionIndex != C.INDEX_UNSET) {
boolean playAdWhenStartingPlayback = boolean playAdWhenStartingPlayback =
adPlaybackState.getAdGroup(adGroupForPositionIndex).timeUs adPlaybackState.getAdGroup(adGroupForPositionIndex).timeUs == msToUs(contentPositionMs)
== Util.msToUs(contentPositionMs)
|| configuration.playAdBeforeStartPosition; || configuration.playAdBeforeStartPosition;
if (!playAdWhenStartingPlayback) { if (!playAdWhenStartingPlayback) {
adGroupForPositionIndex++; adGroupForPositionIndex++;
...@@ -865,7 +866,7 @@ import java.util.Map; ...@@ -865,7 +866,7 @@ import java.util.Map;
if (!sentContentComplete && !timeline.isEmpty()) { if (!sentContentComplete && !timeline.isEmpty()) {
long positionMs = getContentPeriodPositionMs(player, timeline, period); long positionMs = getContentPeriodPositionMs(player, timeline, period);
timeline.getPeriod(player.getCurrentPeriodIndex(), period); timeline.getPeriod(player.getCurrentPeriodIndex(), period);
int newAdGroupIndex = period.getAdGroupIndexForPositionUs(Util.msToUs(positionMs)); int newAdGroupIndex = period.getAdGroupIndexForPositionUs(msToUs(positionMs));
if (newAdGroupIndex != C.INDEX_UNSET) { if (newAdGroupIndex != C.INDEX_UNSET) {
sentPendingContentPositionMs = false; sentPendingContentPositionMs = false;
pendingContentPositionMs = positionMs; pendingContentPositionMs = positionMs;
...@@ -1157,14 +1158,26 @@ import java.util.Map; ...@@ -1157,14 +1158,26 @@ import java.util.Map;
} }
private void ensureSentContentCompleteIfAtEndOfStream() { private void ensureSentContentCompleteIfAtEndOfStream() {
if (!sentContentComplete if (sentContentComplete
&& contentDurationMs != C.TIME_UNSET || contentDurationMs == C.TIME_UNSET
&& pendingContentPositionMs == C.TIME_UNSET || pendingContentPositionMs != C.TIME_UNSET) {
&& getContentPeriodPositionMs(checkNotNull(player), timeline, period) return;
+ THRESHOLD_END_OF_CONTENT_MS }
>= contentDurationMs) { long contentPeriodPositionMs =
sendContentComplete(); getContentPeriodPositionMs(checkNotNull(player), timeline, period);
if (contentPeriodPositionMs + THRESHOLD_END_OF_CONTENT_MS < contentDurationMs) {
return;
} }
int pendingAdGroupIndex =
adPlaybackState.getAdGroupIndexForPositionUs(
msToUs(contentPeriodPositionMs), msToUs(contentDurationMs));
if (pendingAdGroupIndex != C.INDEX_UNSET
&& adPlaybackState.getAdGroup(pendingAdGroupIndex).timeUs != C.TIME_END_OF_SOURCE
&& adPlaybackState.getAdGroup(pendingAdGroupIndex).shouldPlayAdGroup()) {
// Pending mid-roll ad that needs to be played before marking the content complete.
return;
}
sendContentComplete();
} }
private void sendContentComplete() { private void sendContentComplete() {
...@@ -1233,14 +1246,13 @@ import java.util.Map; ...@@ -1233,14 +1246,13 @@ import java.util.Map;
if (player == null) { if (player == null) {
return C.INDEX_UNSET; return C.INDEX_UNSET;
} }
long playerPositionUs = Util.msToUs(getContentPeriodPositionMs(player, timeline, period)); long playerPositionUs = msToUs(getContentPeriodPositionMs(player, timeline, period));
int adGroupIndex = int adGroupIndex =
adPlaybackState.getAdGroupIndexForPositionUs( adPlaybackState.getAdGroupIndexForPositionUs(playerPositionUs, msToUs(contentDurationMs));
playerPositionUs, Util.msToUs(contentDurationMs));
if (adGroupIndex == C.INDEX_UNSET) { if (adGroupIndex == C.INDEX_UNSET) {
adGroupIndex = adGroupIndex =
adPlaybackState.getAdGroupIndexAfterPositionUs( adPlaybackState.getAdGroupIndexAfterPositionUs(
playerPositionUs, Util.msToUs(contentDurationMs)); playerPositionUs, msToUs(contentDurationMs));
} }
return adGroupIndex; return adGroupIndex;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment