loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a minor bug with AdaptiveTrackSelection.

Browse Source 
When updating track selection, we should only revert back from ideal
track selection to current track selection if the currently selected
track is not black-listed.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=158135644
This commit is contained in:
hoangtc 2017-06-06 06:58:07 -07:00 committed by Oliver Woodman
parent 5c2c3c5c63
commit c1bfab3c23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
View File

@ -156,13 +156,13 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
long nowMs = SystemClock.elapsedRealtime(); long nowMs = SystemClock.elapsedRealtime();
// Get the current and ideal selections. // Get the current and ideal selections.
int currentSelectedIndex = selectedIndex; int currentSelectedIndex = selectedIndex;
Format currentFormat = getSelectedFormat();
int idealSelectedIndex = determineIdealSelectedIndex(nowMs); int idealSelectedIndex = determineIdealSelectedIndex(nowMs);
Format idealFormat = getFormat(idealSelectedIndex);
// Assume we can switch to the ideal selection. // Assume we can switch to the ideal selection.
selectedIndex = idealSelectedIndex; selectedIndex = idealSelectedIndex;
// Revert back to the current selection if conditions are not suitable for switching. // Revert back to the current selection if conditions are not suitable for switching.
if (currentFormat != null && !isBlacklisted(selectedIndex, nowMs)) { if (!isBlacklisted(currentSelectedIndex, nowMs)) {
Format currentFormat = getFormat(currentSelectedIndex);
Format idealFormat = getFormat(idealSelectedIndex);
if (idealFormat.bitrate > currentFormat.bitrate if (idealFormat.bitrate > currentFormat.bitrate
&& bufferedDurationUs < minDurationForQualityIncreaseUs) { && bufferedDurationUs < minDurationForQualityIncreaseUs) {
// The ideal track is a higher quality, but we have insufficient buffer to safely switch // The ideal track is a higher quality, but we have insufficient buffer to safely switch