loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-17 04:29:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup to use getCodecsOfType()

Browse Source 
Use the `Util.getCodecsOfType()` method rather than hard coded codec strings
This commit is contained in:
Steve Mayhew 2020-04-04 16:59:33 -07:00
parent 232820d3e1
commit 4ad4a826ab
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -458,19 +458,18 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
} }
break; break;
case TYPE_SUBTITLES: case TYPE_SUBTITLES:
String subtitleMime = MimeTypes.TEXT_VTT; // Assume VTT unless variant declares it sampleMimeType = MimeTypes.TEXT_VTT;
variant = getVariantWithSubtitleGroup(variants, groupId); variant = getVariantWithSubtitleGroup(variants, groupId);
if (variant != null) { if (variant != null) {
@Nullable @Nullable
String codecs[] = Util.splitCodecs(variant.format.codecs); String codecs = Util.getCodecsOfType(variant.format.codecs, C.TRACK_TYPE_AUDIO);
for (String codec : codecs) { sampleMimeType = MimeTypes.getMediaMimeType(codecs);
if (codec.equalsIgnoreCase("stpp.ttml.im1t")) { // TOOD move this all to Utils.x if (sampleMimeType == null) {
subtitleMime = MimeTypes.APPLICATION_TTML; sampleMimeType = MimeTypes.TEXT_VTT;
}
} }
} }
formatBuilder.setSampleMimeType(subtitleMime).setMetadata(metadata); formatBuilder.setSampleMimeType(sampleMimeType).setMetadata(metadata);
subtitles.add(new Rendition(uri, formatBuilder.build(), groupId, name)); subtitles.add(new Rendition(uri, formatBuilder.build(), groupId, name));
break; break;
case TYPE_CLOSED_CAPTIONS: case TYPE_CLOSED_CAPTIONS: