diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java index 93c31f899f..bbf57c5602 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java @@ -36,10 +36,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; */ public class AdaptiveTrackSelection extends BaseTrackSelection { - /** - * Factory for {@link AdaptiveTrackSelection} instances. - */ - public static final class Factory implements TrackSelection.Factory { + /** Factory for {@link AdaptiveTrackSelection} instances. */ + public static class Factory implements TrackSelection.Factory { private final @Nullable BandwidthMeter bandwidthMeter; private final int minDurationForQualityIncreaseMs; @@ -215,7 +213,8 @@ public class AdaptiveTrackSelection extends BaseTrackSelection { * * @param trackBitrateEstimator A {@link TrackBitrateEstimator}. */ - public void experimental_setTrackBitrateEstimator(TrackBitrateEstimator trackBitrateEstimator) { + public final void experimental_setTrackBitrateEstimator( + TrackBitrateEstimator trackBitrateEstimator) { this.trackBitrateEstimator = trackBitrateEstimator; } @@ -224,13 +223,16 @@ public class AdaptiveTrackSelection extends BaseTrackSelection { * *
This method is experimental, and will be renamed or removed in a future release.
*/
- public void experimental_enableBlockFixedTrackSelectionBandwidth() {
+ public final void experimental_enableBlockFixedTrackSelectionBandwidth() {
this.blockFixedTrackSelectionBandwidth = true;
}
@Override
- public @NullableType TrackSelection[] createTrackSelections(
+ public final @NullableType TrackSelection[] createTrackSelections(
@NullableType Definition[] definitions, BandwidthMeter bandwidthMeter) {
+ if (this.bandwidthMeter != null) {
+ bandwidthMeter = this.bandwidthMeter;
+ }
TrackSelection[] selections = new TrackSelection[definitions.length];
List