Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(android): ensure maxBitrate & selectedVideoTrack interact correctly #4155

Merged
merged 1 commit into from
Sep 17, 2024
Merged

fix(android): ensure maxBitrate & selectedVideoTrack interact correctly #4155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,11 @@ private void reLayoutControls() {
reLayout(playerControlView);
}

/// returns true is adaptive bitrate shall be used
public boolean isUsingVideoABR() {
return videoTrackType == null || "auto".equals(videoTrackType);
}

public void setDebug(boolean enableDebug) {
this.enableDebug = enableDebug;
refreshDebugState();
Expand Down Expand Up @@ -2037,16 +2042,21 @@ public void setSelectedTrack(int trackType, String type, String value) {

TrackSelectionOverride selectionOverride = new TrackSelectionOverride(groups.get(groupIndex), tracks);

DefaultTrackSelector.Parameters selectionParameters = trackSelector.getParameters()
DefaultTrackSelector.Parameters.Builder selectionParameters = trackSelector.getParameters()
.buildUpon()
.setExceedAudioConstraintsIfNecessary(true)
.setExceedRendererCapabilitiesIfNecessary(true)
.setExceedVideoConstraintsIfNecessary(true)
.setRendererDisabled(rendererIndex, false)
.clearOverridesOfType(selectionOverride.getType())
.addOverride(selectionOverride)
.build();
trackSelector.setParameters(selectionParameters);
.clearOverridesOfType(selectionOverride.getType());

if (trackType == C.TRACK_TYPE_VIDEO && isUsingVideoABR()) {
selectionParameters.setMaxVideoBitrate(maxBitRate == 0 ? Integer.MAX_VALUE : maxBitRate);
} else {
selectionParameters.addOverride(selectionOverride);
}

trackSelector.setParameters(selectionParameters.build());
}

private boolean isFormatSupported(Format format) {
Expand Down Expand Up @@ -2177,7 +2187,8 @@ public void setRateModifier(float newRate) {

public void setMaxBitRateModifier(int newMaxBitRate) {
maxBitRate = newMaxBitRate;
if (player != null) {
if (player != null && isUsingVideoABR()) {
// do not apply yet if not auto
trackSelector.setParameters(trackSelector.buildUponParameters()
.setMaxVideoBitrate(maxBitRate == 0 ? Integer.MAX_VALUE : maxBitRate));
}
Expand Down
3 changes: 3 additions & 0 deletions docs/pages/component/props.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,9 @@ Sets the desired limit, in bits per second, of network bandwidth consumption whe

Default: 0. Don't limit the maxBitRate.

Note: This property can interact with selectedVideoTrack.
To use `maxBitrate`, selectedVideoTrack shall be undefined or `{type: SelectedVideoTrackType.AUTO}`.

Example:

```javascript
Expand Down
Loading