loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make parallel adaptive track selection more robust.

Browse Source 
Using parallel adaptation for Formats without bitrate information currently
causes an exception. Handle this gracefully and also cases where all formats
have the same bitrate.

Issue:#5971
PiperOrigin-RevId: 250682127
This commit is contained in:
tonihei 2019-05-30 15:08:51 +01:00 committed by Oliver Woodman
parent d626e4bc54
commit b9f3fd429d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASENOTES.md
View File

@ -21,6 +21,9 @@
([#5915](https://github.com/google/ExoPlayer/issues/5915)). ([#5915](https://github.com/google/ExoPlayer/issues/5915)).
* Allow enabling decoder fallback with `DefaultRenderersFactory` * Allow enabling decoder fallback with `DefaultRenderersFactory`
([#5942](https://github.com/google/ExoPlayer/issues/5942)). ([#5942](https://github.com/google/ExoPlayer/issues/5942)).
* Fix bug caused by parallel adaptive track selection using `Format`s without
bitrate information
([#5971](https://github.com/google/ExoPlayer/issues/5971)).
### 2.10.1 ### ### 2.10.1 ###

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

@ -757,7 +757,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {
logValues[i] = new double[values[i].length]; logValues[i] = new double[values[i].length];
for (int j = 0; j < values[i].length; j++) { for (int j = 0; j < values[i].length; j++) {
logValues[i][j] = Math.log(values[i][j]); logValues[i][j] = values[i][j] == Format.NO_VALUE ? 0 : Math.log(values[i][j]);
} }
} }
return logValues; return logValues;
@ -779,7 +779,8 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
double totalBitrateDiff = logBitrates[i][logBitrates[i].length - 1] - logBitrates[i][0]; double totalBitrateDiff = logBitrates[i][logBitrates[i].length - 1] - logBitrates[i][0];
for (int j = 0; j < logBitrates[i].length - 1; j++) { for (int j = 0; j < logBitrates[i].length - 1; j++) {
double switchBitrate = 0.5 * (logBitrates[i][j] + logBitrates[i][j + 1]); double switchBitrate = 0.5 * (logBitrates[i][j] + logBitrates[i][j + 1]);
switchPoints[i][j] = (switchBitrate - logBitrates[i][0]) / totalBitrateDiff; switchPoints[i][j] =
totalBitrateDiff == 0.0 ? 1.0 : (switchBitrate - logBitrates[i][0]) / totalBitrateDiff;
} }
} }
return switchPoints; return switchPoints;