Do not send content complete if any midroll is skipped

google · Oct 18, 2022 · cc37f3a · cc37f3a
1 parent ab4d37f
commit cc37f3a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/AdTagLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/AdTagLoader.java
@@ -1122,9 +1122,15 @@ private void handleAdPrepareError(int adGroupIndex, int adIndexInAdGroup, Except
   }
 
   private void ensureSentContentCompleteIfAtEndOfStream() {
+    if (player == null) {
+      return;
+    }
+
+    int pendingAdGroupIndex = adPlaybackState.getAdGroupIndexAfterPositionUs(player.getContentPosition(), player.getContentDuration());
     if (!sentContentComplete
         && contentDurationMs != C.TIME_UNSET
         && pendingContentPositionMs == C.TIME_UNSET
+        && !((adPlaybackState).getAdGroup(pendingAdGroupIndex).shouldPlayAdGroup())
         && getContentPeriodPositionMs(checkNotNull(player), timeline, period)
                 + THRESHOLD_END_OF_CONTENT_MS
             >= contentDurationMs) {