chore: hide marker for watched ad, also rename some method names. (#13)

* chore: hide marker for watched ad, also rename some method names.

* chore: rename the method names.

Author: guoen21

libraries/common/src/main/java/androidx/media3/common/endeavor/ExoConfig.java

@@ -9,6 +9,7 @@ private static class SingletonHolder {
   // use L3 only if the widevineSecurityLevel set to "L3", otherwise use L1 (default)
   private String widevineSecurityLevel = null;
   private boolean obtainKeyIdsFromManifest = true;
+  private boolean hideMarkerForWatchedAd = true;
 
   private ExoConfig() {
   }
@@ -32,4 +33,12 @@ public boolean isObtainKeyIdsFromManifest() {
   public void setObtainKeyIdsFromManifest(boolean obtainKeyIdsFromManifest) {
     this.obtainKeyIdsFromManifest = obtainKeyIdsFromManifest;
   }
+
+  public boolean isHideMarkerForWatchedAd() {
+    return hideMarkerForWatchedAd;
+  }
+
+  public void setHideMarkerForWatchedAd(boolean hideMarkerForWatchedAd) {
+    this.hideMarkerForWatchedAd = hideMarkerForWatchedAd;
+  }
 }

libraries/common/src/main/java/androidx/media3/common/endeavor/LimitedSeekRange.java

@@ -65,7 +65,7 @@ private long getDurationMs() {
     return useAsLive || isWaitReady() ? C.DCE_UNSET : Math.max(0, endTimeMs - factStartTimeMs);
   }
 
-  public static boolean isUseAsVod(LimitedSeekRange limitedSeekRange) {
+  public static boolean isUseLiveAsVod(LimitedSeekRange limitedSeekRange) {
     return limitedSeekRange != null && !limitedSeekRange.useAsLive;
   }
 
@@ -91,23 +91,23 @@ private static boolean shouldUseOriginal(long timeMs, LimitedSeekRange limitedSe
     return timeMs == C.TIME_UNSET || limitedSeekRange == null || limitedSeekRange.isWaitReady();
   }
 
-  public static Position revertPosition(long adjustedPositionMs, LimitedSeekRange limitedSeekRange) {
-    if (shouldUseOriginal(adjustedPositionMs, limitedSeekRange)) {
-      return Position.legal(adjustedPositionMs);
+  public static Position scaleSeekbarToTimelineMs(long seekbarMs, LimitedSeekRange limitedSeekRange) {
+    if (shouldUseOriginal(seekbarMs, limitedSeekRange)) {
+      return Position.legal(seekbarMs);
     }
-    Position position = toPosition(adjustedPositionMs, limitedSeekRange);
+    Position position = toPosition(seekbarMs, limitedSeekRange);
     return position.offset(limitedSeekRange.timestampOffsetMs);
   }
 
-  public static Position adjustPosition(long positionMs, LimitedSeekRange limitedSeekRange) {
-    if (shouldUseOriginal(positionMs, limitedSeekRange)) {
-      return Position.legal(positionMs);
+  public static Position scaleTimelineToSeekbarMs(long timelineMs, LimitedSeekRange limitedSeekRange) {
+    if (shouldUseOriginal(timelineMs, limitedSeekRange)) {
+      return Position.legal(timelineMs);
     }
-    long adjustedPositionMs = positionMs - limitedSeekRange.timestampOffsetMs;
+    long adjustedPositionMs = timelineMs - limitedSeekRange.timestampOffsetMs;
     return toPosition(adjustedPositionMs, limitedSeekRange);
   }
 
-  public static long adjustDuration(long durationMs, LimitedSeekRange limitedSeekRange) {
+  public static long scaleDurationToSeekbarMs(long durationMs, LimitedSeekRange limitedSeekRange) {
     if (shouldUseOriginal(durationMs, limitedSeekRange)) {
       return durationMs;
     }
@@ -117,21 +117,7 @@ public static long adjustDuration(long durationMs, LimitedSeekRange limitedSeekR
     return limitedSeekRange.getDurationMs();
   }
 
-  public static long revertTimestamp(long adjustedTimeMs, LimitedSeekRange limitedSeekRange) {
-    if (shouldUseOriginal(adjustedTimeMs, limitedSeekRange)) {
-      return adjustedTimeMs;
-    }
-    return adjustedTimeMs + limitedSeekRange.timestampOffsetMs;
-  }
-
-  public static long adjustTimestamp(long timeMs, LimitedSeekRange limitedSeekRange) {
-    if (shouldUseOriginal(timeMs, limitedSeekRange)) {
-      return timeMs;
-    }
-    return timeMs - limitedSeekRange.timestampOffsetMs;
-  }
-
-  public static @Player.State int adjustPlaybackState(@Player.State int state, LimitedSeekRange limitedSeekRange) {
+  public static @Player.State int scalePlaybackState(@Player.State int state, LimitedSeekRange limitedSeekRange) {
     if (limitedSeekRange != null && limitedSeekRange.playbackEnded) {
       return Player.STATE_ENDED;
     }

libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java

@@ -81,6 +81,7 @@
 import androidx.media3.common.TrackSelectionOverride;
 import androidx.media3.common.TrackSelectionParameters;
 import androidx.media3.common.Tracks;
+import androidx.media3.common.endeavor.ExoConfig;
 import androidx.media3.common.endeavor.LimitedSeekRange;
 import androidx.media3.common.endeavor.TimelineAdjuster;
 import androidx.media3.common.util.Assertions;
@@ -724,8 +725,32 @@ public void setExtraAdGroupMarkers(
     } else {
       extraPlayedAdGroups = checkNotNull(extraPlayedAdGroups);
       Assertions.checkArgument(extraAdGroupTimesMs.length == extraPlayedAdGroups.length);
-      this.extraAdGroupTimesMs = extraAdGroupTimesMs;
-      this.extraPlayedAdGroups = extraPlayedAdGroups;
+
+      long[] newExtraAdGroupTimesMs = extraAdGroupTimesMs;
+      boolean[] newExtraPlayedAdGroups = extraPlayedAdGroups;
+      if (ExoConfig.getInstance().isHideMarkerForWatchedAd()) {
+        int markerCount = 0;
+        for (boolean markerPlayed : extraPlayedAdGroups) {
+          if (!markerPlayed) {
+            markerCount++;
+          }
+        }
+        if (markerCount != extraPlayedAdGroups.length) {
+          int index = 0;
+          newExtraAdGroupTimesMs = new long[markerCount];
+          newExtraPlayedAdGroups = new boolean[markerCount];
+          for (int i = 0; i < extraPlayedAdGroups.length; i++) {
+            if (extraPlayedAdGroups[i]) {
+              continue;
+            }
+            newExtraAdGroupTimesMs[index] = extraAdGroupTimesMs[i];
+            newExtraPlayedAdGroups[index] = false;
+            index++;
+          }
+        }
+      }
+      this.extraAdGroupTimesMs = newExtraAdGroupTimesMs;
+      this.extraPlayedAdGroups = newExtraPlayedAdGroups;
     }
     updateTimeline();
   }
@@ -741,23 +766,23 @@ public void setLimitedSeekRange(LimitedSeekRange limitedSeekRange) {
   }
 
   protected long scaleSeekbarToTimelineMs(long seekbarMs) {
-    long positionMs = LimitedSeekRange.revertPosition(seekbarMs, limitedSeekRange).getPositionMs();
+    long positionMs = LimitedSeekRange.scaleSeekbarToTimelineMs(seekbarMs, limitedSeekRange).getPositionMs();
     if (timelineAdjuster != null) {
       positionMs = timelineAdjuster.scaleSeekbarToTimelineMs(positionMs);
     }
     return positionMs;
   }
 
   protected long scaleTimelineToSeekbarMs(long timelineMs) {
-    long positionMs = LimitedSeekRange.adjustPosition(timelineMs, limitedSeekRange).getPositionMs();
+    long positionMs = LimitedSeekRange.scaleTimelineToSeekbarMs(timelineMs, limitedSeekRange).getPositionMs();
     if (timelineAdjuster != null) {
       positionMs = timelineAdjuster.scaleTimelineToSeekbarMs(positionMs);
     }
     return positionMs;
   }
 
-  protected long adjustDuration(long realDurationMs) {
-    long durationMs = LimitedSeekRange.adjustDuration(realDurationMs, limitedSeekRange);
+  protected long scaleDurationToSeekbarMs(long realDurationMs) {
+    long durationMs = LimitedSeekRange.scaleDurationToSeekbarMs(realDurationMs, limitedSeekRange);
     if (timelineAdjuster != null) {
       durationMs = timelineAdjuster.scaleTimelineToSeekbarMs(durationMs);
     }
@@ -1326,7 +1351,9 @@ private void updateTimeline() {
               }
               adGroupTimesMs[adGroupCount] = Util.usToMs(durationUs + adGroupTimeInWindowUs);
               playedAdGroups[adGroupCount] = period.hasPlayedAdGroup(adGroupIndex);
-              adGroupCount++;
+              if (!playedAdGroups[adGroupCount] || !ExoConfig.getInstance().isHideMarkerForWatchedAd()) {
+                adGroupCount++;
+              }
             }
           }
         }
@@ -1341,8 +1368,8 @@ private void updateTimeline() {
     // Apply the timeline converter.
     // long durationMs = Util.usToMs(durationUs);
     long realDurationMs = Util.usToMs(durationUs);
-    long durationMs = adjustDuration(realDurationMs);
-    boolean isVod = LimitedSeekRange.isUseAsVod(limitedSeekRange);
+    long durationMs = scaleDurationToSeekbarMs(realDurationMs);
+    boolean isVod = LimitedSeekRange.isUseLiveAsVod(limitedSeekRange);
     if (dvrWindowListener != null && player.isCurrentMediaItemLive() && !isVod) {
       dvrWindowListener.onDvrWindowUpdate(realDurationMs > MIN_LENGTH_OF_DVR_MS);
     }
@@ -1395,7 +1422,7 @@ private void updateProgress() {
     // Apply the timeline converter.
     // int playbackState = player == null ? Player.STATE_IDLE : player.getPlaybackState();
     int realPlaybackState = player == null ? Player.STATE_IDLE : player.getPlaybackState();
-    int playbackState = LimitedSeekRange.adjustPlaybackState(realPlaybackState, limitedSeekRange);
+    int playbackState = LimitedSeekRange.scalePlaybackState(realPlaybackState, limitedSeekRange);
     if (player != null && player.isPlaying() && playbackState != Player.STATE_ENDED) {
       long mediaTimeDelayMs =
           timeBar != null ? timeBar.getPreferredUpdateDelay() : MAX_UPDATE_INTERVAL_MS;