From 3478ef310806eee6433b1cefed01ed2d8ba0c1ee Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 12 May 2020 08:52:15 +0100
Subject: [PATCH] Improve DEBUG logging in ImaAdsLoader

Log content progress events, as these are helpful to debug triggering of events
based on the content progress.

Don't log AD_PROGRESS events as they occur several times per second while ads
are playing, and the verbosity makes logs difficult to read.

PiperOrigin-RevId: 311077302
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

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 52167b6c5c..136b0d04f1 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
@@ -688,7 +688,7 @@ public final class ImaAdsLoader
   @Override
   public void onAdEvent(AdEvent adEvent) {
     AdEventType adEventType = adEvent.getType();
-    if (DEBUG) {
+    if (DEBUG && adEventType != AdEventType.AD_PROGRESS) {
       Log.d(TAG, "onAdEvent: " + adEventType);
     }
     if (adsManager == null) {
@@ -733,24 +733,11 @@ public final class ImaAdsLoader
 
   @Override
   public VideoProgressUpdate getContentProgress() {
-    if (player == null) {
-      return lastContentProgress;
+    VideoProgressUpdate videoProgressUpdate = getContentVideoProgressUpdate();
+    if (DEBUG) {
+      Log.d(TAG, "Content progress: " + videoProgressUpdate);
     }
-    boolean hasContentDuration = contentDurationMs != C.TIME_UNSET;
-    long contentPositionMs;
-    if (pendingContentPositionMs != C.TIME_UNSET) {
-      sentPendingContentPositionMs = true;
-      contentPositionMs = pendingContentPositionMs;
-    } else if (fakeContentProgressElapsedRealtimeMs != C.TIME_UNSET) {
-      long elapsedSinceEndMs = SystemClock.elapsedRealtime() - fakeContentProgressElapsedRealtimeMs;
-      contentPositionMs = fakeContentProgressOffsetMs + elapsedSinceEndMs;
-    } else if (imaAdState == IMA_AD_STATE_NONE && !playingAd && hasContentDuration) {
-      contentPositionMs = getContentPeriodPositionMs(player, timeline, period);
-    } else {
-      return VideoProgressUpdate.VIDEO_TIME_NOT_READY;
-    }
-    long contentDurationMs = hasContentDuration ? this.contentDurationMs : IMA_DURATION_UNSET;
-    return new VideoProgressUpdate(contentPositionMs, contentDurationMs);
+    return videoProgressUpdate;
   }
 
   // VideoAdPlayer implementation.
@@ -1082,6 +1069,27 @@ public final class ImaAdsLoader
     }
   }
 
+  private VideoProgressUpdate getContentVideoProgressUpdate() {
+    if (player == null) {
+      return lastContentProgress;
+    }
+    boolean hasContentDuration = contentDurationMs != C.TIME_UNSET;
+    long contentPositionMs;
+    if (pendingContentPositionMs != C.TIME_UNSET) {
+      sentPendingContentPositionMs = true;
+      contentPositionMs = pendingContentPositionMs;
+    } else if (fakeContentProgressElapsedRealtimeMs != C.TIME_UNSET) {
+      long elapsedSinceEndMs = SystemClock.elapsedRealtime() - fakeContentProgressElapsedRealtimeMs;
+      contentPositionMs = fakeContentProgressOffsetMs + elapsedSinceEndMs;
+    } else if (imaAdState == IMA_AD_STATE_NONE && !playingAd && hasContentDuration) {
+      contentPositionMs = getContentPeriodPositionMs(player, timeline, period);
+    } else {
+      return VideoProgressUpdate.VIDEO_TIME_NOT_READY;
+    }
+    long contentDurationMs = hasContentDuration ? this.contentDurationMs : IMA_DURATION_UNSET;
+    return new VideoProgressUpdate(contentPositionMs, contentDurationMs);
+  }
+
   private VideoProgressUpdate getAdVideoProgressUpdate() {
     if (player == null) {
       return lastAdProgress;