Don't keep pending preferred queue size during cancelation.

Before loading a new chunk, the player will call reevaluateBuffer
anyway, so we don't have to do this directly after cancelation.

This simplifies some logic because we can remove the pending queue
size variable.

PiperOrigin-RevId: 314313268

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java

@@ -146,7 +146,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
   private @MonotonicNonNull Format upstreamTrackFormat;
   private @MonotonicNonNull Format upstreamTrackFormat;
   @Nullable private Format downstreamTrackFormat;
   @Nullable private Format downstreamTrackFormat;
   private boolean released;
   private boolean released;
-  private int pendingDiscardUpstreamQueueSize;
 
 
   // Tracks are complicated in HLS. See documentation of buildTracksFromSampleStreams for details.
   // Tracks are complicated in HLS. See documentation of buildTracksFromSampleStreams for details.
   // Indexed by track (as exposed by this source).
   // Indexed by track (as exposed by this source).
@@ -230,7 +229,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
     handler = Util.createHandler();
     handler = Util.createHandler();
     lastSeekPositionUs = positionUs;
     lastSeekPositionUs = positionUs;
     pendingResetPositionUs = positionUs;
     pendingResetPositionUs = positionUs;
-    pendingDiscardUpstreamQueueSize = C.LENGTH_UNSET;
   }
   }
 
 
   public void continuePreparing() {
   public void continuePreparing() {
@@ -708,7 +706,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
       return;
       return;
     }
     }
     if (loader.isLoading()) {
     if (loader.isLoading()) {
-      pendingDiscardUpstreamQueueSize = preferredQueueSize;
       loader.cancelLoading();
       loader.cancelLoading();
     } else {
     } else {
       discardUpstream(preferredQueueSize);
       discardUpstream(preferredQueueSize);
@@ -769,10 +766,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
         loadable.startTimeUs,
         loadable.startTimeUs,
         loadable.endTimeUs);
         loadable.endTimeUs);
     if (!released) {
     if (!released) {
-      if (pendingDiscardUpstreamQueueSize != C.LENGTH_UNSET) {
-        discardUpstream(pendingDiscardUpstreamQueueSize);
-        pendingDiscardUpstreamQueueSize = C.LENGTH_UNSET;
-      } else {
+      if (isPendingReset() || enabledTrackGroupCount == 0) {
         resetSampleQueues();
         resetSampleQueues();
       }
       }
       if (enabledTrackGroupCount > 0) {
       if (enabledTrackGroupCount > 0) {