|
|
|
|
@ -26,7 +26,7 @@ public class TrackNameProvider { |
|
|
|
|
String trackName; |
|
|
|
|
int trackType = inferPrimaryTrackType(format); |
|
|
|
|
if (trackType == C.TRACK_TYPE_VIDEO) { |
|
|
|
|
trackName = joinWithSeparator(buildRoleString(format), buildResolutionString(format), buildBitrateString(format)); |
|
|
|
|
trackName = joinWithSeparator(buildRoleString(format), buildResolutionString(format), buildFrameRateString(format), buildBitrateString(format)); |
|
|
|
|
} else if (trackType == C.TRACK_TYPE_AUDIO) { |
|
|
|
|
trackName = joinWithSeparator(buildLanguageOrLabelString(format), buildAudioChannelString(format), buildBitrateString(format)); |
|
|
|
|
} else { |
|
|
|
|
@ -46,6 +46,11 @@ public class TrackNameProvider { |
|
|
|
|
return bitrate == Format.NO_VALUE ? "" : resources.getString(R.string.exo_track_bitrate, bitrate / 1000000f); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private String buildFrameRateString(Format format) { |
|
|
|
|
float fameRate = format.frameRate; |
|
|
|
|
return fameRate <= 0 ? "" : (int) Math.floor(fameRate) + "FPS"; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private String buildAudioChannelString(Format format) { |
|
|
|
|
int channelCount = format.channelCount; |
|
|
|
|
if (channelCount < 1) return ""; |
|
|
|
|
|