mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-23 08:30:44 +00:00
Code Issues Releases Wiki Activity

fixed: added comments for DefaultTrackSelector auto-select fix.

Browse Source
This commit is contained in:
karyogamy 2022-04-17 18:34:31 -04:00
parent 4917da2d2e
commit 29fc0eff38
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/schabi/newpipe/player/Player.java
View File

@ -3557,20 +3557,27 @@ public final class Player implements
} }
// apply caption language from previous user preference // apply caption language from previous user preference
final int textRendererIndex = getCaptionRendererIndex();
if (textRendererIndex == RENDERER_UNAVAILABLE) {
return;
}
// If user prefers to show no caption, then disable the renderer.
// Otherwise, DefaultTrackSelector may automatically find an available caption
// and display that.
final String userPreferredLanguage = final String userPreferredLanguage =
prefs.getString(context.getString(R.string.caption_user_set_key), null); prefs.getString(context.getString(R.string.caption_user_set_key), null);
final int textRendererIndex = getCaptionRendererIndex();
if (userPreferredLanguage == null) { if (userPreferredLanguage == null) {
trackSelector.setParameters(trackSelector.buildUponParameters() trackSelector.setParameters(trackSelector.buildUponParameters()
.setRendererDisabled(textRendererIndex, true)); .setRendererDisabled(textRendererIndex, true));
return; return;
} }
// Only set preferred language if it does not match the user preference,
// otherwise there might be an infinite cycle at onTextTracksChanged.
final List<String> selectedPreferredLanguages = final List<String> selectedPreferredLanguages =
trackSelector.getParameters().preferredTextLanguages; trackSelector.getParameters().preferredTextLanguages;
if (!selectedPreferredLanguages.contains(userPreferredLanguage) if (!selectedPreferredLanguages.contains(userPreferredLanguage)) {
&& textRendererIndex != RENDERER_UNAVAILABLE) {
trackSelector.setParameters(trackSelector.buildUponParameters() trackSelector.setParameters(trackSelector.buildUponParameters()
.setPreferredTextLanguages(userPreferredLanguage, .setPreferredTextLanguages(userPreferredLanguage,
PlayerHelper.captionLanguageStemOf(userPreferredLanguage)) PlayerHelper.captionLanguageStemOf(userPreferredLanguage))