Merge pull request #5496 from szaboa:dev-v2-5040

PiperOrigin-RevId: 237412166

library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java

@@ -205,6 +205,7 @@ public class DefaultTimeBar extends View implements TimeBar {
   private final CopyOnWriteArraySet<OnScrubListener> listeners;
   private final int[] locationOnScreen;
   private final Point touchPosition;
+  private final float density;
 
   private int keyCountIncrement;
   private long keyTimeIncrement;
@@ -242,13 +243,14 @@ public class DefaultTimeBar extends View implements TimeBar {
     // Calculate the dimensions and paints for drawn elements.
     Resources res = context.getResources();
     DisplayMetrics displayMetrics = res.getDisplayMetrics();
-    fineScrubYThreshold = dpToPx(displayMetrics, FINE_SCRUB_Y_THRESHOLD_DP);
-    int defaultBarHeight = dpToPx(displayMetrics, DEFAULT_BAR_HEIGHT_DP);
-    int defaultTouchTargetHeight = dpToPx(displayMetrics, DEFAULT_TOUCH_TARGET_HEIGHT_DP);
-    int defaultAdMarkerWidth = dpToPx(displayMetrics, DEFAULT_AD_MARKER_WIDTH_DP);
-    int defaultScrubberEnabledSize = dpToPx(displayMetrics, DEFAULT_SCRUBBER_ENABLED_SIZE_DP);
-    int defaultScrubberDisabledSize = dpToPx(displayMetrics, DEFAULT_SCRUBBER_DISABLED_SIZE_DP);
-    int defaultScrubberDraggedSize = dpToPx(displayMetrics, DEFAULT_SCRUBBER_DRAGGED_SIZE_DP);
+    density = displayMetrics.density;
+    fineScrubYThreshold = dpToPx(density, FINE_SCRUB_Y_THRESHOLD_DP);
+    int defaultBarHeight = dpToPx(density, DEFAULT_BAR_HEIGHT_DP);
+    int defaultTouchTargetHeight = dpToPx(density, DEFAULT_TOUCH_TARGET_HEIGHT_DP);
+    int defaultAdMarkerWidth = dpToPx(density, DEFAULT_AD_MARKER_WIDTH_DP);
+    int defaultScrubberEnabledSize = dpToPx(density, DEFAULT_SCRUBBER_ENABLED_SIZE_DP);
+    int defaultScrubberDisabledSize = dpToPx(density, DEFAULT_SCRUBBER_DISABLED_SIZE_DP);
+    int defaultScrubberDraggedSize = dpToPx(density, DEFAULT_SCRUBBER_DRAGGED_SIZE_DP);
     if (attrs != null) {
       TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DefaultTimeBar, 0,
           0);
@@ -437,6 +439,14 @@ public class DefaultTimeBar extends View implements TimeBar {
   }
 
   @Override
+  public long getPreferredUpdateDelay() {
+    int timeBarWidthDp = pxToDp(density, progressBar.width());
+    return timeBarWidthDp == 0 || duration == 0 || duration == C.TIME_UNSET
+        ? Long.MAX_VALUE
+        : duration / timeBarWidthDp;
+  }
+
+  @Override
   public void setAdGroupTimesMs(@Nullable long[] adGroupTimesMs, @Nullable boolean[] playedAdGroups,
       int adGroupCount) {
     Assertions.checkArgument(adGroupCount == 0
@@ -832,7 +842,11 @@ public class DefaultTimeBar extends View implements TimeBar {
     return 0x33000000 | (adMarkerColor & 0x00FFFFFF);
   }
 
-  private static int dpToPx(DisplayMetrics displayMetrics, int dps) {
-    return (int) (dps * displayMetrics.density + 0.5f);
+  private static int dpToPx(float density, int dps) {
+    return (int) (dps * density + 0.5f);
+  }
+
+  private static int pxToDp(float density, int px) {
+    return (int) (px / density);
   }
 }

library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java

@@ -85,6 +85,12 @@ import java.util.Locale;
  *         <li>Corresponding method: {@link #setShowShuffleButton(boolean)}
  *         <li>Default: false
  *       </ul>
+ *   <li><b>{@code time_bar_min_update_interval}</b> - Specifies the minimum interval between time
+ *       bar position updates.
+ *       <ul>
+ *         <li>Corresponding method: {@link #setTimeBarMinUpdateInterval(int)}
+ *         <li>Default: {@link #DEFAULT_TIME_BAR_MIN_UPDATE_INTERVAL_MS}
+ *       </ul>
  *   <li><b>{@code controller_layout_id}</b> - Specifies the id of the layout to be inflated. See
  *       below for more details.
  *       <ul>
@@ -191,11 +197,14 @@ public class PlayerControlView extends FrameLayout {
   /** The default repeat toggle modes. */
   public static final @RepeatModeUtil.RepeatToggleModes int DEFAULT_REPEAT_TOGGLE_MODES =
       RepeatModeUtil.REPEAT_TOGGLE_MODE_NONE;
-
+  /** The default minimum interval between time bar position updates. */
+  public static final int DEFAULT_TIME_BAR_MIN_UPDATE_INTERVAL_MS = 200;
   /** The maximum number of windows that can be shown in a multi-window time bar. */
   public static final int MAX_WINDOWS_FOR_MULTI_WINDOW_TIME_BAR = 100;
 
   private static final long MAX_POSITION_FOR_SEEK_TO_PREVIOUS = 3000;
+  /** The maximum interval between time bar position updates. */
+  private static final int MAX_UPDATE_INTERVAL_MS = 1000;
 
   private final ComponentListener componentListener;
   private final View previousButton;
@@ -236,6 +245,7 @@ public class PlayerControlView extends FrameLayout {
   private int rewindMs;
   private int fastForwardMs;
   private int showTimeoutMs;
+  private int timeBarMinUpdateIntervalMs;
   private @RepeatModeUtil.RepeatToggleModes int repeatToggleModes;
   private boolean showShuffleButton;
   private long hideAtMs;
@@ -243,6 +253,7 @@ public class PlayerControlView extends FrameLayout {
   private boolean[] playedAdGroups;
   private long[] extraAdGroupTimesMs;
   private boolean[] extraPlayedAdGroups;
+  private long currentWindowOffset;
 
   public PlayerControlView(Context context) {
     this(context, null);
@@ -264,6 +275,7 @@ public class PlayerControlView extends FrameLayout {
     fastForwardMs = DEFAULT_FAST_FORWARD_MS;
     showTimeoutMs = DEFAULT_SHOW_TIMEOUT_MS;
     repeatToggleModes = DEFAULT_REPEAT_TOGGLE_MODES;
+    timeBarMinUpdateIntervalMs = DEFAULT_TIME_BAR_MIN_UPDATE_INTERVAL_MS;
     hideAtMs = C.TIME_UNSET;
     showShuffleButton = false;
     if (playbackAttrs != null) {
@@ -402,7 +414,7 @@ public class PlayerControlView extends FrameLayout {
    */
   public void setShowMultiWindowTimeBar(boolean showMultiWindowTimeBar) {
     this.showMultiWindowTimeBar = showMultiWindowTimeBar;
-    updateTimeBarMode();
+    updateTimeline();
   }
 
   /**
@@ -426,7 +438,7 @@ public class PlayerControlView extends FrameLayout {
       this.extraAdGroupTimesMs = extraAdGroupTimesMs;
       this.extraPlayedAdGroups = extraPlayedAdGroups;
     }
-    updateProgress();
+    updateTimeline();
   }
 
   /**
@@ -584,6 +596,22 @@ public class PlayerControlView extends FrameLayout {
   }
 
   /**
+   * Sets the minimum interval between time bar position updates.
+   *
+   * <p>Note that smaller intervals, e.g. 33ms, will result in a smooth movement but will use more
+   * CPU resources while the time bar is visible, whereas larger intervals, e.g. 200ms, will result
+   * in a step-wise update with less CPU usage.
+   *
+   * @param minUpdateIntervalMs The minimum interval between time bar position updates, in
+   *     milliseconds.
+   */
+  public void setTimeBarMinUpdateInterval(int minUpdateIntervalMs) {
+    // Do not accept values below 16ms (60fps) and larger than the maximum update interval.
+    timeBarMinUpdateIntervalMs =
+        Util.constrainValue(minUpdateIntervalMs, 16, MAX_UPDATE_INTERVAL_MS);
+  }
+
+  /**
    * Shows the playback controls. If {@link #getShowTimeoutMs()} is positive then the controls will
    * be automatically hidden after this duration of time has elapsed without user input.
    */
@@ -635,7 +663,7 @@ public class PlayerControlView extends FrameLayout {
     updateNavigation();
     updateRepeatModeButton();
     updateShuffleButton();
-    updateProgress();
+    updateTimeline();
   }
 
   private void updatePlayPauseButton() {
@@ -735,35 +763,23 @@ public class PlayerControlView extends FrameLayout {
     }
   }
 
-  private void updateTimeBarMode() {
+  private void updateTimeline() {
     if (player == null) {
       return;
     }
     multiWindowTimeBar =
         showMultiWindowTimeBar && canShowMultiWindowTimeBar(player.getCurrentTimeline(), window);
-  }
-
-  private void updateProgress() {
-    if (!isVisible() || !isAttachedToWindow) {
-      return;
-    }
-
-    long position = 0;
-    long bufferedPosition = 0;
-    long duration = 0;
-    if (player != null) {
-      long currentWindowTimeBarOffsetMs = 0;
+    currentWindowOffset = 0;
     long durationUs = 0;
     int adGroupCount = 0;
     Timeline timeline = player.getCurrentTimeline();
     if (!timeline.isEmpty()) {
       int currentWindowIndex = player.getCurrentWindowIndex();
       int firstWindowIndex = multiWindowTimeBar ? 0 : currentWindowIndex;
-        int lastWindowIndex =
-            multiWindowTimeBar ? timeline.getWindowCount() - 1 : currentWindowIndex;
+      int lastWindowIndex = multiWindowTimeBar ? timeline.getWindowCount() - 1 : currentWindowIndex;
       for (int i = firstWindowIndex; i <= lastWindowIndex; i++) {
         if (i == currentWindowIndex) {
-            currentWindowTimeBarOffsetMs = C.usToMs(durationUs);
+          currentWindowOffset = C.usToMs(durationUs);
         }
         timeline.getWindow(i, window);
         if (window.durationUs == C.TIME_UNSET) {
@@ -798,10 +814,12 @@ public class PlayerControlView extends FrameLayout {
         durationUs += window.durationUs;
       }
     }
-      duration = C.usToMs(durationUs);
-      position = currentWindowTimeBarOffsetMs + player.getContentPosition();
-      bufferedPosition = currentWindowTimeBarOffsetMs + player.getContentBufferedPosition();
+    long durationMs = C.usToMs(durationUs);
+    if (durationView != null) {
+      durationView.setText(Util.getStringForTime(formatBuilder, formatter, durationMs));
+    }
     if (timeBar != null) {
+      timeBar.setDuration(durationMs);
       int extraAdGroupCount = extraAdGroupTimesMs.length;
       int totalAdGroupCount = adGroupCount + extraAdGroupCount;
       if (totalAdGroupCount > adGroupTimesMs.length) {
@@ -812,9 +830,19 @@ public class PlayerControlView extends FrameLayout {
       System.arraycopy(extraPlayedAdGroups, 0, playedAdGroups, adGroupCount, extraAdGroupCount);
       timeBar.setAdGroupTimesMs(adGroupTimesMs, playedAdGroups, totalAdGroupCount);
     }
+    updateProgress();
   }
-    if (durationView != null) {
-      durationView.setText(Util.getStringForTime(formatBuilder, formatter, duration));
+
+  private void updateProgress() {
+    if (!isVisible() || !isAttachedToWindow) {
+      return;
+    }
+
+    long position = 0;
+    long bufferedPosition = 0;
+    if (player != null) {
+      position = currentWindowOffset + player.getContentPosition();
+      bufferedPosition = currentWindowOffset + player.getContentBufferedPosition();
     }
     if (positionView != null && !scrubbing) {
       positionView.setText(Util.getStringForTime(formatBuilder, formatter, position));
@@ -822,33 +850,29 @@ public class PlayerControlView extends FrameLayout {
     if (timeBar != null) {
       timeBar.setPosition(position);
       timeBar.setBufferedPosition(bufferedPosition);
-      timeBar.setDuration(duration);
     }
 
     // Cancel any pending updates and schedule a new one if necessary.
     removeCallbacks(updateProgressAction);
     int playbackState = player == null ? Player.STATE_IDLE : player.getPlaybackState();
-    if (playbackState != Player.STATE_IDLE && playbackState != Player.STATE_ENDED) {
-      long delayMs;
-      if (player.getPlayWhenReady() && playbackState == Player.STATE_READY) {
+    if (playbackState == Player.STATE_READY && player.getPlayWhenReady()) {
+      long mediaTimeDelayMs =
+          timeBar != null ? timeBar.getPreferredUpdateDelay() : MAX_UPDATE_INTERVAL_MS;
+
+      // Limit delay to the start of the next full second to ensure position display is smooth.
+      long mediaTimeUntilNextFullSecondMs = 1000 - position % 1000;
+      mediaTimeDelayMs = Math.min(mediaTimeDelayMs, mediaTimeUntilNextFullSecondMs);
+
+      // Calculate the delay until the next update in real time, taking playbackSpeed into account.
       float playbackSpeed = player.getPlaybackParameters().speed;
-        if (playbackSpeed <= 0.1f) {
-          delayMs = 1000;
-        } else if (playbackSpeed <= 5f) {
-          long mediaTimeUpdatePeriodMs = 1000 / Math.max(1, Math.round(1 / playbackSpeed));
-          long mediaTimeDelayMs = mediaTimeUpdatePeriodMs - (position % mediaTimeUpdatePeriodMs);
-          if (mediaTimeDelayMs < (mediaTimeUpdatePeriodMs / 5)) {
-            mediaTimeDelayMs += mediaTimeUpdatePeriodMs;
-          }
-          delayMs =
-              playbackSpeed == 1 ? mediaTimeDelayMs : (long) (mediaTimeDelayMs / playbackSpeed);
-        } else {
-          delayMs = 200;
-        }
-      } else {
-        delayMs = 1000;
-      }
+      long delayMs =
+          playbackSpeed > 0 ? (long) (mediaTimeDelayMs / playbackSpeed) : MAX_UPDATE_INTERVAL_MS;
+
+      // Constrain the delay to avoid too frequent / infrequent updates.
+      delayMs = Util.constrainValue(delayMs, timeBarMinUpdateIntervalMs, MAX_UPDATE_INTERVAL_MS);
       postDelayed(updateProgressAction, delayMs);
+    } else if (playbackState != Player.STATE_ENDED && playbackState != Player.STATE_IDLE) {
+      postDelayed(updateProgressAction, MAX_UPDATE_INTERVAL_MS);
     }
   }
 
@@ -1119,15 +1143,14 @@ public class PlayerControlView extends FrameLayout {
     @Override
     public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
       updateNavigation();
-      updateProgress();
+      updateTimeline();
     }
 
     @Override
     public void onTimelineChanged(
         Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
       updateNavigation();
-      updateTimeBarMode();
-      updateProgress();
+      updateTimeline();
     }
 
     @Override

library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java

@@ -85,6 +85,14 @@ public interface TimeBar {
   void setDuration(long duration);
 
   /**
+   * Returns the preferred delay in milliseconds of media time after which the time bar position
+   * should be updated.
+   *
+   * @return Preferred delay, in milliseconds of media time.
+   */
+  long getPreferredUpdateDelay();
+
+  /**
    * Sets the times of ad groups and whether each ad group has been played.
    *
    * @param adGroupTimesMs An array where the first {@code adGroupCount} elements are the times of

library/ui/src/main/res/values/attrs.xml

@@ -42,6 +42,7 @@
     <flag name="all" value="2"/>
   </attr>
   <attr name="show_shuffle_button" format="boolean"/>
+  <attr name="time_bar_min_update_interval" format="integer"/>
 
   <declare-styleable name="PlayerView">
     <attr name="use_artwork" format="boolean"/>
@@ -66,6 +67,7 @@
     <attr name="fastforward_increment"/>
     <attr name="repeat_toggle_modes"/>
     <attr name="show_shuffle_button"/>
+    <attr name="time_bar_min_update_interval"/>
     <attr name="controller_layout_id"/>
   </declare-styleable>
 
@@ -79,6 +81,7 @@
     <attr name="fastforward_increment"/>
     <attr name="repeat_toggle_modes"/>
     <attr name="show_shuffle_button"/>
+    <attr name="time_bar_min_update_interval"/>
     <attr name="controller_layout_id"/>
   </declare-styleable>