From fbd97ad8de9f5cb2d752a0deb000203da3d34ca4 Mon Sep 17 00:00:00 2001
From: Steve Mayhew <mayhew.steve@gmail.com>
Date: Sun, 5 Apr 2020 13:23:03 -0700
Subject: [PATCH] Fix merge mistake, wrong track type.

Fix mistake from the backport merge, should get TEXT track type for subtitles.  Also update testcase to match pattern in `dev-v2` branch.
---
 .../exoplayer2/source/hls/playlist/HlsPlaylistParser.java       | 2 +-
 .../source/hls/playlist/HlsMasterPlaylistParserTest.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 60736189b5..4392f746d4 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -462,7 +462,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           variant = getVariantWithSubtitleGroup(variants, groupId);
           if (variant != null) {
             @Nullable
-            String codecs = Util.getCodecsOfType(variant.format.codecs, C.TRACK_TYPE_AUDIO);
+            String codecs = Util.getCodecsOfType(variant.format.codecs, C.TRACK_TYPE_TEXT);
             sampleMimeType = MimeTypes.getMediaMimeType(codecs);
             if (sampleMimeType == null) {
               sampleMimeType = MimeTypes.TEXT_VTT;
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 4f988c4e92..c45c35fba2 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -364,7 +364,7 @@ public class HlsMasterPlaylistParserTest {
   }
 
   @Test
-  public void testSubtitleCodec() throws IOException {
+  public void parseMasterPlaylist_withMatchedTTMLSubtitleCodec() throws IOException {
     HlsMasterPlaylist playlistWithSubtitles =
             parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_SUBTITLE_CODEC);
     HlsMasterPlaylist.Variant variant = playlistWithSubtitles.variants.get(0);