hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update TrackNameProvider.java

Browse Source
pull/123/head
FongMi 3 years ago
parent f6104e474c
commit 4ef549830d
1 changed files with 11 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 40
      app/src/main/java/com/fongmi/android/tv/ui/custom/TrackNameProvider.java

40
app/src/main/java/com/fongmi/android/tv/ui/custom/TrackNameProvider.java
Unescape View File

@ -35,7 +35,7 @@ public class TrackNameProvider {
} else {
trackName = joinWithSeparator(buildLanguageString(format), buildLabelString(format));
}
return trackName.length() == 0 ? resources.getString(R.string.exo_track_unknown) : trackName;
return TextUtils.isEmpty(trackName) ? resources.getString(R.string.exo_track_unknown) : trackName;
}
public String getTrackName(IjkTrackInfo trackInfo) {
@ -46,7 +46,7 @@ public class TrackNameProvider {
} else {
trackName = buildLanguageString(trackInfo.getLanguage());
}
return trackName.length() == 0 ? resources.getString(R.string.exo_track_unknown) : trackName;
return TextUtils.isEmpty(trackName) ? resources.getString(R.string.exo_track_unknown) : trackName;
}
private String buildResolutionString(Format format) {
@ -113,18 +113,10 @@ public class TrackNameProvider {
private String buildRoleString(Format format) {
String roles = "";
if ((format.roleFlags & C.ROLE_FLAG_ALTERNATE) != 0) {
roles = resources.getString(R.string.exo_track_role_alternate);
}
if ((format.roleFlags & C.ROLE_FLAG_SUPPLEMENTARY) != 0) {
roles = joinWithSeparator(roles, resources.getString(R.string.exo_track_role_supplementary));
}
if ((format.roleFlags & C.ROLE_FLAG_COMMENTARY) != 0) {
roles = joinWithSeparator(roles, resources.getString(R.string.exo_track_role_commentary));
}
if ((format.roleFlags & (C.ROLE_FLAG_CAPTION | C.ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND)) != 0) {
roles = joinWithSeparator(roles, resources.getString(R.string.exo_track_role_closed_captions));
}
if ((format.roleFlags & C.ROLE_FLAG_ALTERNATE) != 0) roles = resources.getString(R.string.exo_track_role_alternate);
if ((format.roleFlags & C.ROLE_FLAG_SUPPLEMENTARY) != 0) roles = joinWithSeparator(roles, resources.getString(R.string.exo_track_role_supplementary));
if ((format.roleFlags & C.ROLE_FLAG_COMMENTARY) != 0) roles = joinWithSeparator(roles, resources.getString(R.string.exo_track_role_commentary));
if ((format.roleFlags & (C.ROLE_FLAG_CAPTION | C.ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND)) != 0) roles = joinWithSeparator(roles, resources.getString(R.string.exo_track_role_closed_captions));
return roles;
}
@ -144,21 +136,11 @@ public class TrackNameProvider {
private static int inferPrimaryTrackType(Format format) {
int trackType = MimeTypes.getTrackType(format.sampleMimeType);
if (trackType != C.TRACK_TYPE_UNKNOWN) {
return trackType;
}
if (MimeTypes.getVideoMediaMimeType(format.codecs) != null) {
return C.TRACK_TYPE_VIDEO;
}
if (MimeTypes.getAudioMediaMimeType(format.codecs) != null) {
return C.TRACK_TYPE_AUDIO;
}
if (format.width != Format.NO_VALUE || format.height != Format.NO_VALUE) {
return C.TRACK_TYPE_VIDEO;
}
if (format.channelCount != Format.NO_VALUE || format.sampleRate != Format.NO_VALUE) {
return C.TRACK_TYPE_AUDIO;
}
if (trackType != C.TRACK_TYPE_UNKNOWN) return trackType;
if (MimeTypes.getVideoMediaMimeType(format.codecs) != null) return C.TRACK_TYPE_VIDEO;
if (MimeTypes.getAudioMediaMimeType(format.codecs) != null) return C.TRACK_TYPE_AUDIO;
if (format.width != Format.NO_VALUE || format.height != Format.NO_VALUE) return C.TRACK_TYPE_VIDEO;
if (format.channelCount != Format.NO_VALUE || format.sampleRate != Format.NO_VALUE) return C.TRACK_TYPE_AUDIO;
return C.TRACK_TYPE_UNKNOWN;
}
}

Write Preview
Loading…
Cancel
Save