From ff2ece56dd9afa7eaf03bdb994e1ef9387fe44a6 Mon Sep 17 00:00:00 2001
From: yqritc <yqritc@gmail.com>
Date: Thu, 21 Sep 2017 12:01:25 +0900
Subject: [PATCH 1/3] fix primarySnapshotAccessAgeMs

---
 .../exoplayer2/source/hls/playlist/HlsPlaylistTracker.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
index 567dbd4af6..dfa544dfcd 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
@@ -351,7 +351,7 @@ public final class HlsPlaylistTracker implements Loader.Callback<ParsingLoadable
     }
     MediaPlaylistBundle currentPrimaryBundle = playlistBundles.get(primaryHlsUrl);
     long primarySnapshotAccessAgeMs =
-        currentPrimaryBundle.lastSnapshotAccessTimeMs - SystemClock.elapsedRealtime();
+        SystemClock.elapsedRealtime() - currentPrimaryBundle.lastSnapshotAccessTimeMs;
     if (primarySnapshotAccessAgeMs > PRIMARY_URL_KEEPALIVE_MS) {
       primaryHlsUrl = url;
       playlistBundles.get(primaryHlsUrl).loadPlaylist();

From cac16f1647be29828c1b404e5de0b6e2577d2e61 Mon Sep 17 00:00:00 2001
From: yqritc <yqritc@gmail.com>
Date: Thu, 21 Sep 2017 14:18:59 +0900
Subject: [PATCH 2/3] remove keep alive check for updating primary url to avoid
 redundant playlist loading

---
 .../source/hls/playlist/HlsPlaylistTracker.java | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
index dfa544dfcd..9b777bccf8 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
@@ -112,11 +112,6 @@ public final class HlsPlaylistTracker implements Loader.Callback<ParsingLoadable
    * which an unchanging playlist is considered stuck.
    */
   private static final double PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT = 3.5;
-  /**
-   * The minimum number of milliseconds that a url is kept as primary url, if no
-   * {@link #getPlaylistSnapshot} call is made for that url.
-   */
-  private static final long PRIMARY_URL_KEEPALIVE_MS = 15000;
 
   private final Uri initialPlaylistUri;
   private final HlsDataSourceFactory dataSourceFactory;
@@ -205,7 +200,7 @@ public final class HlsPlaylistTracker implements Loader.Callback<ParsingLoadable
    */
   public HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url) {
     HlsMediaPlaylist snapshot = playlistBundles.get(url).getPlaylistSnapshot();
-    if (snapshot != null) {
+    if (url != primaryHlsUrl && snapshot != null ) {
       maybeSetPrimaryUrl(url);
     }
     return snapshot;
@@ -349,13 +344,9 @@ public final class HlsPlaylistTracker implements Loader.Callback<ParsingLoadable
       // the last primary snapshot contains an end tag.
       return;
     }
-    MediaPlaylistBundle currentPrimaryBundle = playlistBundles.get(primaryHlsUrl);
-    long primarySnapshotAccessAgeMs =
-        SystemClock.elapsedRealtime() - currentPrimaryBundle.lastSnapshotAccessTimeMs;
-    if (primarySnapshotAccessAgeMs > PRIMARY_URL_KEEPALIVE_MS) {
-      primaryHlsUrl = url;
-      playlistBundles.get(primaryHlsUrl).loadPlaylist();
-    }
+
+    primaryHlsUrl = url;
+    playlistBundles.get(primaryHlsUrl).loadPlaylist();
   }
 
   private void createBundles(List<HlsUrl> urls) {

From 455f9fb9f0fb422652ed3e1771f843db0c1383a1 Mon Sep 17 00:00:00 2001
From: yqritc <yqritc@gmail.com>
Date: Thu, 21 Sep 2017 16:01:32 +0900
Subject: [PATCH 3/3] remove space

---
 .../exoplayer2/source/hls/playlist/HlsPlaylistTracker.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
index 9b777bccf8..d9ab410fb9 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
@@ -200,7 +200,7 @@ public final class HlsPlaylistTracker implements Loader.Callback<ParsingLoadable
    */
   public HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url) {
     HlsMediaPlaylist snapshot = playlistBundles.get(url).getPlaylistSnapshot();
-    if (url != primaryHlsUrl && snapshot != null ) {
+    if (url != primaryHlsUrl && snapshot != null) {
       maybeSetPrimaryUrl(url);
     }
     return snapshot;