From 41192ee046043a663c5c185bbb5d090817425f0c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 2 Oct 2020 14:03:37 +0100
Subject: [PATCH] Allow apps to add a VideoAdPlayerCallback

Issue: #7944
PiperOrigin-RevId: 335012643
---
 RELEASENOTES.md                               |  2 ++
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d43ecfcc8a1..37551c9575d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -42,6 +42,8 @@
 *   IMA extension:
     *   Fix position reporting after fetch errors
         ([#7956](https://github.com/google/ExoPlayer/issues/7956)).
+    *   Allow apps to specify a `VideoAdPlayerCallback`
+        ([#7944](https://github.com/google/ExoPlayer/issues/7944)).
 
 ### 2.12.0 (2020-09-11) ###
 
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
index 592920bfc48..ffece0f110e 100644
--- 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
@@ -125,6 +125,7 @@ public static final class Builder {
     @Nullable private ImaSdkSettings imaSdkSettings;
     @Nullable private AdErrorListener adErrorListener;
     @Nullable private AdEventListener adEventListener;
+    @Nullable private VideoAdPlayer.VideoAdPlayerCallback videoAdPlayerCallback;
     @Nullable private Set<UiElement> adUiElements;
     @Nullable private Collection<CompanionAdSlot> companionAdSlots;
     private long adPreloadTimeoutMs;
@@ -190,6 +191,22 @@ public Builder setAdEventListener(AdEventListener adEventListener) {
       return this;
     }
 
+    /**
+     * Sets a callback to receive video ad player events. Note that these events are handled
+     * internally by the IMA SDK and this ads loader. For analytics and diagnostics, new
+     * implementations should generally use events from the top-level {@link Player} listeners
+     * instead of setting a callback via this method.
+     *
+     * @param videoAdPlayerCallback The callback to receive video ad player events.
+     * @return This builder, for convenience.
+     * @see com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer.VideoAdPlayerCallback
+     */
+    public Builder setVideoAdPlayerCallback(
+        VideoAdPlayer.VideoAdPlayerCallback videoAdPlayerCallback) {
+      this.videoAdPlayerCallback = checkNotNull(videoAdPlayerCallback);
+      return this;
+    }
+
     /**
      * Sets the ad UI elements to be rendered by the IMA SDK.
      *
@@ -524,6 +541,9 @@ private ImaAdsLoader(Builder builder, @Nullable Uri adTagUri, @Nullable String a
     handler = Util.createHandler(getImaLooper(), /* callback= */ null);
     componentListener = new ComponentListener();
     adCallbacks = new ArrayList<>(/* initialCapacity= */ 1);
+    if (builder.videoAdPlayerCallback != null) {
+      adCallbacks.add(builder.videoAdPlayerCallback);
+    }
     updateAdProgressRunnable = this::updateAdProgress;
     adInfoByAdMediaInfo = HashBiMap.create();
     supportedMimeTypes = Collections.emptyList();