loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DefaultTrackSelector#Parameter withSelectUndeterminedTextLanguage

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=177170994
This commit is contained in:
aquilescanta 2017-11-28 09:22:32 -08:00 committed by Oliver Woodman
parent 54a1bb186e
commit baa80a1b68
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
View File

@ -243,8 +243,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
/** /**
* Returns an instance with the provided {@link #selectUndeterminedTextLanguage}. * Returns an instance with the provided {@link #selectUndeterminedTextLanguage}.
*/ */
public Parameters withSelectUndeterminedTextLanguageAsFallback( public Parameters withSelectUndeterminedTextLanguage(boolean selectUndeterminedTextLanguage) {
boolean selectUndeterminedTextLanguage) {
if (selectUndeterminedTextLanguage == this.selectUndeterminedTextLanguage) { if (selectUndeterminedTextLanguage == this.selectUndeterminedTextLanguage) {
return this; return this;
} }

5
library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
View File

@ -561,8 +561,7 @@ public final class DefaultTrackSelectorTest {
wrapFormats(spanish, german, undeterminedUnd, undeterminedNull)); wrapFormats(spanish, german, undeterminedUnd, undeterminedNull));
assertThat(result.selections.get(0)).isNull(); assertThat(result.selections.get(0)).isNull();
trackSelector.setParameters( trackSelector.setParameters(DEFAULT_PARAMETERS.withSelectUndeterminedTextLanguage(true));
DEFAULT_PARAMETERS.withSelectUndeterminedTextLanguageAsFallback(true));
result = trackSelector.selectTracks(textRendererCapabilites, result = trackSelector.selectTracks(textRendererCapabilites,
wrapFormats(spanish, german, undeterminedUnd, undeterminedNull)); wrapFormats(spanish, german, undeterminedUnd, undeterminedNull));
assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedUnd); assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedUnd);
@ -577,7 +576,7 @@ public final class DefaultTrackSelectorTest {
assertThat(result.selections.get(0)).isNull(); assertThat(result.selections.get(0)).isNull();
trackSelector.setParameters( trackSelector.setParameters(
trackSelector.getParameters().withSelectUndeterminedTextLanguageAsFallback(true)); trackSelector.getParameters().withSelectUndeterminedTextLanguage(true));
result = trackSelector.selectTracks(textRendererCapabilites, result = trackSelector.selectTracks(textRendererCapabilites,
wrapFormats(german, undeterminedUnd, undeterminedNull)); wrapFormats(german, undeterminedUnd, undeterminedNull));
assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedUnd); assertThat(result.selections.get(0).getFormat(0)).isSameAs(undeterminedUnd);