Update stale TrackSelections in chunk sources when keeping the streams.

If we keep streams in chunk sources after selecting new tracks, we also keep
a reference to a stale disabled TrackSelection object. Fix this by updating
the TrackSelection object when keeping the stream. The static part of the
selection (i.e. the subset of selected tracks) stays the same in all cases.

Issue:#6256
PiperOrigin-RevId: 261696082

RELEASENOTES.md

@@ -27,6 +27,9 @@
 * Fix issue when calling `performClick` on `PlayerView` without
 * Fix issue when calling `performClick` on `PlayerView` without
   `PlayerControlView`
   `PlayerControlView`
   ([#6260](https://github.com/google/ExoPlayer/issues/6260)).
   ([#6260](https://github.com/google/ExoPlayer/issues/6260)).
+* Fix issue where playback speeds are not used in adaptive track selections
+  after manual selection changes for other renderers
+  ([#6256](https://github.com/google/ExoPlayer/issues/6256)).
 
 
 ### 2.10.3 ###
 ### 2.10.3 ###
 
 

library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java

@@ -106,13 +106,16 @@ public interface MediaPeriod extends SequenceableLoader {
    * Performs a track selection.
    * Performs a track selection.
    *
    *
    * <p>The call receives track {@code selections} for each renderer, {@code mayRetainStreamFlags}
    * <p>The call receives track {@code selections} for each renderer, {@code mayRetainStreamFlags}
-   * indicating whether the existing {@code SampleStream} can be retained for each selection, and
+   * indicating whether the existing {@link SampleStream} can be retained for each selection, and
    * the existing {@code stream}s themselves. The call will update {@code streams} to reflect the
    * the existing {@code stream}s themselves. The call will update {@code streams} to reflect the
    * provided selections, clearing, setting and replacing entries as required. If an existing sample
    * provided selections, clearing, setting and replacing entries as required. If an existing sample
    * stream is retained but with the requirement that the consuming renderer be reset, then the
    * stream is retained but with the requirement that the consuming renderer be reset, then the
    * corresponding flag in {@code streamResetFlags} will be set to true. This flag will also be set
    * corresponding flag in {@code streamResetFlags} will be set to true. This flag will also be set
    * if a new sample stream is created.
    * if a new sample stream is created.
    *
    *
+   * <p>Note that previously received {@link TrackSelection TrackSelections} are no longer valid and
+   * references need to be replaced even if the corresponding {@link SampleStream} is kept.
+   *
    * <p>This method is only called after the period has been prepared.
    * <p>This method is only called after the period has been prepared.
    *
    *
    * @param selections The renderer track selections.
    * @param selections The renderer track selections.

library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java

@@ -69,4 +69,11 @@ public interface DashChunkSource extends ChunkSource {
    * @param newManifest The new manifest.
    * @param newManifest The new manifest.
    */
    */
   void updateManifest(DashManifest newManifest, int periodIndex);
   void updateManifest(DashManifest newManifest, int periodIndex);
+
+  /**
+   * Updates the track selection.
+   *
+   * @param trackSelection The new track selection instance. Must be equivalent to the previous one.
+   */
+  void updateTrackSelection(TrackSelection trackSelection);
 }
 }

library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java

@@ -402,17 +402,27 @@ import java.util.regex.Pattern;
       int[] streamIndexToTrackGroupIndex) {
       int[] streamIndexToTrackGroupIndex) {
     // Create newly selected primary and event streams.
     // Create newly selected primary and event streams.
     for (int i = 0; i < selections.length; i++) {
     for (int i = 0; i < selections.length; i++) {
-      if (streams[i] == null && selections[i] != null) {
+      TrackSelection selection = selections[i];
+      if (selection == null) {
+        continue;
+      }
+      if (streams[i] == null) {
+        // Create new stream for selection.
         streamResetFlags[i] = true;
         streamResetFlags[i] = true;
         int trackGroupIndex = streamIndexToTrackGroupIndex[i];
         int trackGroupIndex = streamIndexToTrackGroupIndex[i];
         TrackGroupInfo trackGroupInfo = trackGroupInfos[trackGroupIndex];
         TrackGroupInfo trackGroupInfo = trackGroupInfos[trackGroupIndex];
         if (trackGroupInfo.trackGroupCategory == TrackGroupInfo.CATEGORY_PRIMARY) {
         if (trackGroupInfo.trackGroupCategory == TrackGroupInfo.CATEGORY_PRIMARY) {
-          streams[i] = buildSampleStream(trackGroupInfo, selections[i], positionUs);
+          streams[i] = buildSampleStream(trackGroupInfo, selection, positionUs);
         } else if (trackGroupInfo.trackGroupCategory == TrackGroupInfo.CATEGORY_MANIFEST_EVENTS) {
         } else if (trackGroupInfo.trackGroupCategory == TrackGroupInfo.CATEGORY_MANIFEST_EVENTS) {
           EventStream eventStream = eventStreams.get(trackGroupInfo.eventStreamGroupIndex);
           EventStream eventStream = eventStreams.get(trackGroupInfo.eventStreamGroupIndex);
-          Format format = selections[i].getTrackGroup().getFormat(0);
+          Format format = selection.getTrackGroup().getFormat(0);
           streams[i] = new EventSampleStream(eventStream, format, manifest.dynamic);
           streams[i] = new EventSampleStream(eventStream, format, manifest.dynamic);
         }
         }
+      } else if (streams[i] instanceof ChunkSampleStream) {
+        // Update selection in existing stream.
+        @SuppressWarnings("unchecked")
+        ChunkSampleStream<DashChunkSource> stream = (ChunkSampleStream<DashChunkSource>) streams[i];
+        stream.getChunkSource().updateTrackSelection(selection);
       }
       }
     }
     }
     // Create newly selected embedded streams from the corresponding primary stream. Note that this
     // Create newly selected embedded streams from the corresponding primary stream. Note that this

library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java

@@ -111,7 +111,6 @@ public class DefaultDashChunkSource implements DashChunkSource {
 
 
   private final LoaderErrorThrower manifestLoaderErrorThrower;
   private final LoaderErrorThrower manifestLoaderErrorThrower;
   private final int[] adaptationSetIndices;
   private final int[] adaptationSetIndices;
-  private final TrackSelection trackSelection;
   private final int trackType;
   private final int trackType;
   private final DataSource dataSource;
   private final DataSource dataSource;
   private final long elapsedRealtimeOffsetMs;
   private final long elapsedRealtimeOffsetMs;
@@ -120,6 +119,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
 
 
   protected final RepresentationHolder[] representationHolders;
   protected final RepresentationHolder[] representationHolders;
 
 
+  private TrackSelection trackSelection;
   private DashManifest manifest;
   private DashManifest manifest;
   private int periodIndex;
   private int periodIndex;
   private IOException fatalError;
   private IOException fatalError;
@@ -223,6 +223,11 @@ public class DefaultDashChunkSource implements DashChunkSource {
   }
   }
 
 
   @Override
   @Override
+  public void updateTrackSelection(TrackSelection trackSelection) {
+    this.trackSelection = trackSelection;
+  }
+
+  @Override
   public void maybeThrowError() throws IOException {
   public void maybeThrowError() throws IOException {
     if (fatalError != null) {
     if (fatalError != null) {
       throw fatalError;
       throw fatalError;

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

@@ -183,17 +183,15 @@ import java.util.Map;
   }
   }
 
 
   /**
   /**
-   * Selects tracks for use.
+   * Sets the current track selection.
    *
    *
-   * @param trackSelection The track selection.
+   * @param trackSelection The {@link TrackSelection}.
    */
    */
-  public void selectTracks(TrackSelection trackSelection) {
+  public void setTrackSelection(TrackSelection trackSelection) {
     this.trackSelection = trackSelection;
     this.trackSelection = trackSelection;
   }
   }
 
 
-  /**
-   * Returns the current track selection.
-   */
+  /** Returns the current {@link TrackSelection}. */
   public TrackSelection getTrackSelection() {
   public TrackSelection getTrackSelection() {
     return trackSelection;
     return trackSelection;
   }
   }

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

@@ -292,14 +292,17 @@ import java.util.Map;
     TrackSelection primaryTrackSelection = oldPrimaryTrackSelection;
     TrackSelection primaryTrackSelection = oldPrimaryTrackSelection;
     // Select new tracks.
     // Select new tracks.
     for (int i = 0; i < selections.length; i++) {
     for (int i = 0; i < selections.length; i++) {
-      if (streams[i] == null && selections[i] != null) {
+      TrackSelection selection = selections[i];
+      if (selection == null) {
+        continue;
+      }
+      int trackGroupIndex = trackGroups.indexOf(selection.getTrackGroup());
+      if (trackGroupIndex == primaryTrackGroupIndex) {
+        primaryTrackSelection = selection;
+        chunkSource.setTrackSelection(selection);
+      }
+      if (streams[i] == null) {
         enabledTrackGroupCount++;
         enabledTrackGroupCount++;
-        TrackSelection selection = selections[i];
-        int trackGroupIndex = trackGroups.indexOf(selection.getTrackGroup());
-        if (trackGroupIndex == primaryTrackGroupIndex) {
-          primaryTrackSelection = selection;
-          chunkSource.selectTracks(selection);
-        }
         streams[i] = new HlsSampleStream(this, trackGroupIndex);
         streams[i] = new HlsSampleStream(this, trackGroupIndex);
         streamResetFlags[i] = true;
         streamResetFlags[i] = true;
         if (trackGroupToSampleQueueIndex != null) {
         if (trackGroupToSampleQueueIndex != null) {

library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java

@@ -74,10 +74,10 @@ public class DefaultSsChunkSource implements SsChunkSource {
 
 
   private final LoaderErrorThrower manifestLoaderErrorThrower;
   private final LoaderErrorThrower manifestLoaderErrorThrower;
   private final int streamElementIndex;
   private final int streamElementIndex;
-  private final TrackSelection trackSelection;
   private final ChunkExtractorWrapper[] extractorWrappers;
   private final ChunkExtractorWrapper[] extractorWrappers;
   private final DataSource dataSource;
   private final DataSource dataSource;
 
 
+  private TrackSelection trackSelection;
   private SsManifest manifest;
   private SsManifest manifest;
   private int currentManifestChunkOffset;
   private int currentManifestChunkOffset;
 
 
@@ -155,6 +155,11 @@ public class DefaultSsChunkSource implements SsChunkSource {
     manifest = newManifest;
     manifest = newManifest;
   }
   }
 
 
+  @Override
+  public void updateTrackSelection(TrackSelection trackSelection) {
+    this.trackSelection = trackSelection;
+  }
+
   // ChunkSource implementation.
   // ChunkSource implementation.
 
 
   @Override
   @Override

library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java

@@ -55,4 +55,11 @@ public interface SsChunkSource extends ChunkSource {
    * @param newManifest The new manifest.
    * @param newManifest The new manifest.
    */
    */
   void updateManifest(SsManifest newManifest);
   void updateManifest(SsManifest newManifest);
+
+  /**
+   * Updates the track selection.
+   *
+   * @param trackSelection The new track selection instance. Must be equivalent to the previous one.
+   */
+  void updateTrackSelection(TrackSelection trackSelection);
 }
 }

library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java

@@ -126,6 +126,7 @@ import java.util.List;
           stream.release();
           stream.release();
           streams[i] = null;
           streams[i] = null;
         } else {
         } else {
+          stream.getChunkSource().updateTrackSelection(selections[i]);
           sampleStreamsList.add(stream);
           sampleStreamsList.add(stream);
         }
         }
       }
       }