From 5db33deef4aaff76ec22c41390e738e63a5ae6c7 Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 29 Mar 2019 16:10:03 +0000 Subject: [PATCH] HLS: Fix playlist tracker bundle lookup As of https://github.com/google/ExoPlayer/commit/99f89132c219b52b991b4614322fa7af6208c906 an identity check isn't sufficient for the lookup. PiperOrigin-RevId: 240989848 --- .../source/hls/playlist/DefaultHlsPlaylistTracker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java index 38b041d765..0064338ca8 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java @@ -33,7 +33,7 @@ import com.google.android.exoplayer2.upstream.ParsingLoadable; import com.google.android.exoplayer2.util.Assertions; import java.io.IOException; import java.util.ArrayList; -import java.util.IdentityHashMap; +import java.util.HashMap; import java.util.List; /** Default implementation for {@link HlsPlaylistTracker}. */ @@ -52,7 +52,7 @@ public final class DefaultHlsPlaylistTracker private final HlsDataSourceFactory dataSourceFactory; private final HlsPlaylistParserFactory playlistParserFactory; private final LoadErrorHandlingPolicy loadErrorHandlingPolicy; - private final IdentityHashMap playlistBundles; + private final HashMap playlistBundles; private final List listeners; private final double playlistStuckTargetDurationCoefficient; @@ -106,7 +106,7 @@ public final class DefaultHlsPlaylistTracker this.loadErrorHandlingPolicy = loadErrorHandlingPolicy; this.playlistStuckTargetDurationCoefficient = playlistStuckTargetDurationCoefficient; listeners = new ArrayList<>(); - playlistBundles = new IdentityHashMap<>(); + playlistBundles = new HashMap<>(); initialStartTimeUs = C.TIME_UNSET; }