From 090f359895825db92ecc48c2f13429dd90e53db8 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 30 May 2019 15:08:51 +0100
Subject: [PATCH] Make parallel adaptive track selection more robust.

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
---
 RELEASENOTES.md                                              | 3 +++
 .../exoplayer2/trackselection/AdaptiveTrackSelection.java    | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b6cbe3d275..cb63af693d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -47,6 +47,9 @@
   ([#5834](https://github.com/google/ExoPlayer/issues/5834)).
 * Allow enabling decoder fallback with `DefaultRenderersFactory`
   ([#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 ###
 
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 08f4d3a928..ca8a0b12f9 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
@@ -758,7 +758,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
     for (int i = 0; i < values.length; i++) {
       logValues[i] = new double[values[i].length];
       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;
@@ -780,7 +780,8 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
       double totalBitrateDiff = logBitrates[i][logBitrates[i].length - 1] - logBitrates[i][0];
       for (int j = 0; j < logBitrates[i].length - 1; j++) {
         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;