loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge mistake, wrong track type.

Browse Source 
Fix mistake from the backport merge, should get TEXT track type for subtitles.  Also update testcase to match pattern in `dev-v2` branch.
This commit is contained in:
Steve Mayhew 2020-04-05 13:23:03 -07:00
parent 4ad4a826ab
commit fbd97ad8de
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
View File

@ -462,7 +462,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
variant = getVariantWithSubtitleGroup(variants, groupId); variant = getVariantWithSubtitleGroup(variants, groupId);
if (variant != null) { if (variant != null) {
@Nullable @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); sampleMimeType = MimeTypes.getMediaMimeType(codecs);
if (sampleMimeType == null) { if (sampleMimeType == null) {
sampleMimeType = MimeTypes.TEXT_VTT; sampleMimeType = MimeTypes.TEXT_VTT;

2
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
View File

@ -364,7 +364,7 @@ public class HlsMasterPlaylistParserTest {
} }
@Test @Test
public void testSubtitleCodec() throws IOException { public void parseMasterPlaylist_withMatchedTTMLSubtitleCodec() throws IOException {
HlsMasterPlaylist playlistWithSubtitles = HlsMasterPlaylist playlistWithSubtitles =
parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_SUBTITLE_CODEC); parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_SUBTITLE_CODEC);
HlsMasterPlaylist.Variant variant = playlistWithSubtitles.variants.get(0); HlsMasterPlaylist.Variant variant = playlistWithSubtitles.variants.get(0);