sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Count the number of matches for role flags.

Browse source 
Select a track with matching role flags even if someone specifies a preferred role flgs without providing a preferred language
Prefer track without captions or describing music and sound flag when no role flag preference is provided.
This commit is contained in:
Yannick RUI 2019-09-05 17:31:24 +02:00
parent 0c4df84eaa
commit 5f48871731
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
View file

@ -2695,6 +2695,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
private final boolean isWithinRendererCapabilities; private final boolean isWithinRendererCapabilities;
private final boolean isDefault; private final boolean isDefault;
private final boolean hasPreferredIsForcedFlag; private final boolean hasPreferredIsForcedFlag;
private final boolean hasPreferredRoleFlags;
private final int hasCaptionRoleFlags;
private final int preferredLanguageScore; private final int preferredLanguageScore;
private final int preferredRoleFlagsScore; private final int preferredRoleFlagsScore;
private final int selectedAudioLanguageScore; private final int selectedAudioLanguageScore;
@ -2713,18 +2715,21 @@ public class DefaultTrackSelector extends MappingTrackSelector {
preferredLanguageScore = preferredLanguageScore =
getFormatLanguageScore( getFormatLanguageScore(
format, parameters.preferredTextLanguage, parameters.selectUndeterminedTextLanguage); format, parameters.preferredTextLanguage, parameters.selectUndeterminedTextLanguage);
preferredRoleFlagsScore = format.roleFlags & parameters.preferredRoleFlags; preferredRoleFlagsScore = Integer.bitCount(format.roleFlags & parameters.preferredRoleFlags);
// Prefer non-forced to forced if a preferred text language has been matched. Where both are // Prefer non-forced to forced if a preferred text language has been matched. Where both are
// provided the non-forced track will usually contain the forced subtitles as a subset. // provided the non-forced track will usually contain the forced subtitles as a subset.
// Otherwise, prefer a forced track. // Otherwise, prefer a forced track.
hasPreferredIsForcedFlag = hasPreferredIsForcedFlag =
(preferredLanguageScore > 0 && !isForced) || (preferredLanguageScore == 0 && isForced); (preferredLanguageScore > 0 && !isForced) || (preferredLanguageScore == 0 && isForced);
hasPreferredRoleFlags = parameters.preferredRoleFlags > 0;
hasCaptionRoleFlags = Integer.bitCount(format.roleFlags
& (C.ROLE_FLAG_CAPTION | C.ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND));
boolean selectedAudioLanguageUndetermined = boolean selectedAudioLanguageUndetermined =
normalizeUndeterminedLanguageToNull(selectedAudioLanguage) == null; normalizeUndeterminedLanguageToNull(selectedAudioLanguage) == null;
selectedAudioLanguageScore = selectedAudioLanguageScore =
getFormatLanguageScore(format, selectedAudioLanguage, selectedAudioLanguageUndetermined); getFormatLanguageScore(format, selectedAudioLanguage, selectedAudioLanguageUndetermined);
isWithinConstraints = isWithinConstraints =
(preferredLanguageScore > 0 || (parameters.preferredTextLanguage == null && selectedAudioLanguageScore > 0 && preferredRoleFlagsScore > 0)) || isDefault || (isForced && selectedAudioLanguageScore > 0); (preferredLanguageScore > 0 || (parameters.preferredTextLanguage == null && preferredRoleFlagsScore > 0)) || isDefault || (isForced && selectedAudioLanguageScore > 0);
} }
/** /**
@ -2742,16 +2747,23 @@ public class DefaultTrackSelector extends MappingTrackSelector {
if (this.preferredLanguageScore != other.preferredLanguageScore) { if (this.preferredLanguageScore != other.preferredLanguageScore) {
return compareInts(this.preferredLanguageScore, other.preferredLanguageScore); return compareInts(this.preferredLanguageScore, other.preferredLanguageScore);
} }
if (this.preferredRoleFlagsScore != other.preferredRoleFlagsScore) {
return compareInts(this.preferredRoleFlagsScore, other.preferredRoleFlagsScore);
}
if (this.isDefault != other.isDefault) { if (this.isDefault != other.isDefault) {
return this.isDefault ? 1 : -1; return this.isDefault ? 1 : -1;
} }
if (this.hasPreferredIsForcedFlag != other.hasPreferredIsForcedFlag) { if (this.hasPreferredIsForcedFlag != other.hasPreferredIsForcedFlag) {
return this.hasPreferredIsForcedFlag ? 1 : -1; return this.hasPreferredIsForcedFlag ? 1 : -1;
} }
return compareInts(this.selectedAudioLanguageScore, other.selectedAudioLanguageScore); if (this.selectedAudioLanguageScore != other.selectedAudioLanguageScore) {
return compareInts(this.selectedAudioLanguageScore, other.selectedAudioLanguageScore);
}
// If no role flag preference is provided in the parameters, prefer tracks
// without C.ROLE_FLAG_CAPTION or C.ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND
// No specification means that non-captioning text tracks are preferred.
if (!this.hasPreferredRoleFlags) {
return compareInts(other.hasCaptionRoleFlags, this.hasCaptionRoleFlags);
}
return compareInts(this.preferredRoleFlagsScore, other.preferredRoleFlagsScore);
} }
} }
} }