Fix handling of incompatible VPAID ads

Issue: #7832 PiperOrigin-RevId: 329497598
google · Sep 7, 2020 · 47561f2 · 47561f2
1 parent d155416
commit 47561f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -322,6 +322,8 @@
     *   Add `ImaAdsLoader.Builder.setCompanionAdSlots` so it's possible to set
         companion ad slots without accessing the `AdDisplayContainer`.
     *   Add missing notification of `VideoAdPlayerCallback.onLoaded`.
+    *   Fix handling of incompatible VPAID ads
+        ([#7832](https://github.com/google/ExoPlayer/issues/7832)).
 *   Demo app:
     *   Replace the `extensions` variant with `decoderExtensions` and update the
         demo app use the Cronet and IMA extensions by default.

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -1096,6 +1096,11 @@ private void resumeContentInternal() {
     if (imaAdInfo != null) {
       adPlaybackState = adPlaybackState.withSkippedAdGroup(imaAdInfo.adGroupIndex);
       updateAdPlaybackState();
+    } else if (adPlaybackState.adGroupCount == 1 && adPlaybackState.adGroupTimesUs[0] == 0) {
+      // For incompatible VPAID ads with one preroll, content is resumed immediately. In this case
+      // we haven't received ad info (the ad never loaded), but there is only one ad group to skip.
+      adPlaybackState = adPlaybackState.withSkippedAdGroup(/* adGroupIndex= */ 0);
+      updateAdPlaybackState();
     }
   }