Remove wait time parameter for evaluateQueueSize calls.

The wait time parameter is an implementation detail where we can just
provide a default.

In addition, we should also force the evaluation when the last chunk
in the queue changed to ensure it is always evaluated before starting
to load a new chunk.

Issue: #7582
PiperOrigin-RevId: 319949251

RELEASENOTES.md

@@ -94,6 +94,8 @@
     *   Remove throws clause from Renderer.stop.
     *   Remove throws clause from Renderer.stop.
     *   Don't clear `exception` in `SimpleDecoder#flush()`
     *   Don't clear `exception` in `SimpleDecoder#flush()`
         ([#7590](https://github.com/google/ExoPlayer/issues/7590)).
         ([#7590](https://github.com/google/ExoPlayer/issues/7590)).
+    *   Remove `AdaptiveTrackSelection.minTimeBetweenBufferReevaluationMs`
+        parameter ([#7582](https://github.com/google/ExoPlayer/issues/7582)).
 *   Video: Pass frame rate hint to `Surface.setFrameRate` on Android R devices.
 *   Video: Pass frame rate hint to `Surface.setFrameRate` on Android R devices.
 *   Track selection:
 *   Track selection:
     *   Add `Player.getTrackSelector`.
     *   Add `Player.getTrackSelector`.

library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java

@@ -272,20 +272,23 @@ public final class AdaptiveTrackSelectionTest {
     when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(500L);
     when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(500L);
     adaptiveTrackSelection =
     adaptiveTrackSelection =
         adaptiveTrackSelectionWithMinTimeBetweenBufferReevaluationMs(
         adaptiveTrackSelectionWithMinTimeBetweenBufferReevaluationMs(
-            trackGroup,
-            /* durationToRetainAfterDiscardMs= */ 15_000,
-            /* minTimeBetweenBufferReevaluationMs= */ 2000);
+            trackGroup, /* durationToRetainAfterDiscardMs= */ 15_000);
 
 
     int initialQueueSize = adaptiveTrackSelection.evaluateQueueSize(0, queue);
     int initialQueueSize = adaptiveTrackSelection.evaluateQueueSize(0, queue);
 
 
-    fakeClock.advanceTime(1999);
+    fakeClock.advanceTime(999);
     when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(1000L);
     when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(1000L);
 
 
-    // When bandwidth estimation is updated, we can discard chunks at the end of the queue now.
-    // However, since min duration between buffer reevaluation = 2000, we will not reevaluate
-    // queue size if time now is only 1999 ms after last buffer reevaluation.
-    int newSize = adaptiveTrackSelection.evaluateQueueSize(0, queue);
+    // When the bandwidth estimation is updated, we should be able to discard chunks from the end of
+    // the queue. However, since the duration since the last evaluation (999ms) is less than 1000ms,
+    // we will not reevaluate the queue size and should not discard chunks.
+    int newSize = adaptiveTrackSelection.evaluateQueueSize(/* playbackPositionUs= */ 0, queue);
     assertThat(newSize).isEqualTo(initialQueueSize);
     assertThat(newSize).isEqualTo(initialQueueSize);
+
+    // Sanity check for the comment above.
+    fakeClock.advanceTime(1);
+    newSize = adaptiveTrackSelection.evaluateQueueSize(/* playbackPositionUs= */ 0, queue);
+    assertThat(newSize).isLessThan(initialQueueSize);
   }
   }
 
 
   @Test
   @Test
@@ -309,9 +312,7 @@ public final class AdaptiveTrackSelectionTest {
     when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(500L);
     when(mockBandwidthMeter.getBitrateEstimate()).thenReturn(500L);
     adaptiveTrackSelection =
     adaptiveTrackSelection =
         adaptiveTrackSelectionWithMinTimeBetweenBufferReevaluationMs(
         adaptiveTrackSelectionWithMinTimeBetweenBufferReevaluationMs(
-            trackGroup,
-            /* durationToRetainAfterDiscardMs= */ 15_000,
-            /* minTimeBetweenBufferReevaluationMs= */ 2000);
+            trackGroup, /* durationToRetainAfterDiscardMs= */ 15_000);
 
 
     int initialQueueSize = adaptiveTrackSelection.evaluateQueueSize(0, queue);
     int initialQueueSize = adaptiveTrackSelection.evaluateQueueSize(0, queue);
     assertThat(initialQueueSize).isEqualTo(3);
     assertThat(initialQueueSize).isEqualTo(3);
@@ -345,7 +346,6 @@ public final class AdaptiveTrackSelectionTest {
             AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
             AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
             /* bandwidthFraction= */ 1.0f,
             /* bandwidthFraction= */ 1.0f,
             AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
             AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
-            AdaptiveTrackSelection.DEFAULT_MIN_TIME_BETWEEN_BUFFER_REEVALUTATION_MS,
             fakeClock));
             fakeClock));
   }
   }
 
 
@@ -362,14 +362,11 @@ public final class AdaptiveTrackSelectionTest {
             AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
             AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
             /* bandwidthFraction= */ 1.0f,
             /* bandwidthFraction= */ 1.0f,
             AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
             AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
-            AdaptiveTrackSelection.DEFAULT_MIN_TIME_BETWEEN_BUFFER_REEVALUTATION_MS,
             fakeClock));
             fakeClock));
   }
   }
 
 
   private AdaptiveTrackSelection adaptiveTrackSelectionWithMinTimeBetweenBufferReevaluationMs(
   private AdaptiveTrackSelection adaptiveTrackSelectionWithMinTimeBetweenBufferReevaluationMs(
-      TrackGroup trackGroup,
-      long durationToRetainAfterDiscardMs,
-      long minTimeBetweenBufferReevaluationMs) {
+      TrackGroup trackGroup, long durationToRetainAfterDiscardMs) {
     return prepareTrackSelection(
     return prepareTrackSelection(
         new AdaptiveTrackSelection(
         new AdaptiveTrackSelection(
             trackGroup,
             trackGroup,
@@ -381,7 +378,6 @@ public final class AdaptiveTrackSelectionTest {
             durationToRetainAfterDiscardMs,
             durationToRetainAfterDiscardMs,
             /* bandwidthFraction= */ 1.0f,
             /* bandwidthFraction= */ 1.0f,
             AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
             AdaptiveTrackSelection.DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE,
-            minTimeBetweenBufferReevaluationMs,
             fakeClock));
             fakeClock));
   }
   }