From f6541b498ada56c3675d9a0d66698fe3e9db57b8 Mon Sep 17 00:00:00 2001 From: eguven Date: Fri, 26 Jan 2018 08:42:46 -0800 Subject: [PATCH] Fix FilteringHlsPlaylistParser Only filter HlsMasterPlaylists. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=183394956 --- .../source/hls/playlist/FilteringHlsPlaylistParser.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParser.java index d57363b257..24fa0df7d1 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParser.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParser.java @@ -36,12 +36,10 @@ public final class FilteringHlsPlaylistParser implements Parser { @Override public HlsPlaylist parse(Uri uri, InputStream inputStream) throws IOException { HlsPlaylist hlsPlaylist = hlsPlaylistParser.parse(uri, inputStream); - HlsMasterPlaylist hlsMasterPlaylist; if (hlsPlaylist instanceof HlsMasterPlaylist) { - hlsMasterPlaylist = (HlsMasterPlaylist) hlsPlaylist; + return ((HlsMasterPlaylist) hlsPlaylist).copy(filter); } else { - hlsMasterPlaylist = HlsMasterPlaylist.createSingleVariantMasterPlaylist(hlsPlaylist.baseUri); + return hlsPlaylist; } - return hlsMasterPlaylist.copy(filter); } }