From acf8a2265bb2adab6360f5971cbcebfcf67bd9a7 Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 26 Nov 2024 15:55:57 +0800 Subject: [PATCH] Fix bug --- .../android/tv/player/exo/TrackNameProvider.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/player/exo/TrackNameProvider.java b/app/src/main/java/com/fongmi/android/tv/player/exo/TrackNameProvider.java index 01257d003..fe3dd0bf2 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/exo/TrackNameProvider.java +++ b/app/src/main/java/com/fongmi/android/tv/player/exo/TrackNameProvider.java @@ -32,7 +32,7 @@ public class TrackNameProvider { } else { trackName = joinWithSeparator(buildLanguageString(format), buildLabelString(format)); } - return TextUtils.isEmpty(trackName) ? resources.getString(R.string.exo_track_unknown) : joinWithSeparator(trackName, buildMimeString(format)); + return TextUtils.isEmpty(trackName) ? resources.getString(R.string.exo_track_unknown) : joinWithSeparator(trackName, buildMimeString(trackType, format)); } private String buildResolutionString(Format format) { @@ -105,7 +105,7 @@ public class TrackNameProvider { private String joinWithSeparator(String... items) { String itemList = ""; for (String item : items) { - if (item.length() > 0) { + if (!item.isEmpty()) { if (TextUtils.isEmpty(itemList)) { itemList = item; } else { @@ -126,9 +126,10 @@ public class TrackNameProvider { return C.TRACK_TYPE_UNKNOWN; } - private String buildMimeString(Format format) { - if (format.sampleMimeType == null) return ""; - return buildMimeString(format.sampleMimeType); + private String buildMimeString(int trackType, Format format) { + if (trackType == C.TRACK_TYPE_TEXT && format.codecs != null) return buildMimeString(format.codecs); + if (format.sampleMimeType != null) return buildMimeString(format.sampleMimeType); + return ""; } private String buildMimeString(String mimeType) {