Skip to content

SDK / exoplayer

Go to a project
Commit 0ccf816a by aquilescanta Committed by Oliver Woodman
Options

Add a bitmask for text tracks' selection flags in DefaultTrackSelector 

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=179039563
parent 37a275f6
Inline Side-by-side
Showing with 228 additions and 34 deletions
RELEASENOTES.md
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
([#3149](https://github.com/google/ExoPlayer/issues/3149)). ([#3149](https://github.com/google/ExoPlayer/issues/3149)).
* DefaultTrackSelector: Replace `DefaultTrackSelector.Parameters` copy methods * DefaultTrackSelector: Replace `DefaultTrackSelector.Parameters` copy methods
with a builder. with a builder.
* DefaultTrackSelector: Support disabling of individual text track selection
flags.
* New Cast extension: Simplifies toggling between local and Cast playbacks. * New Cast extension: Simplifies toggling between local and Cast playbacks.
### 2.6.1 ### ### 2.6.1 ###
......
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
...@@ -82,6 +82,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -82,6 +82,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
private String preferredAudioLanguage; private String preferredAudioLanguage;
private String preferredTextLanguage; private String preferredTextLanguage;
private boolean selectUndeterminedTextLanguage; private boolean selectUndeterminedTextLanguage;
private int disabledTextTrackSelectionFlags;
private boolean forceLowestBitrate; private boolean forceLowestBitrate;
private boolean allowMixedMimeAdaptiveness; private boolean allowMixedMimeAdaptiveness;
private boolean allowNonSeamlessAdaptiveness; private boolean allowNonSeamlessAdaptiveness;
...@@ -109,6 +110,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -109,6 +110,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
preferredAudioLanguage = initialValues.preferredAudioLanguage; preferredAudioLanguage = initialValues.preferredAudioLanguage;
preferredTextLanguage = initialValues.preferredTextLanguage; preferredTextLanguage = initialValues.preferredTextLanguage;
selectUndeterminedTextLanguage = initialValues.selectUndeterminedTextLanguage; selectUndeterminedTextLanguage = initialValues.selectUndeterminedTextLanguage;
disabledTextTrackSelectionFlags = initialValues.disabledTextTrackSelectionFlags;
forceLowestBitrate = initialValues.forceLowestBitrate; forceLowestBitrate = initialValues.forceLowestBitrate;
allowMixedMimeAdaptiveness = initialValues.allowMixedMimeAdaptiveness; allowMixedMimeAdaptiveness = initialValues.allowMixedMimeAdaptiveness;
allowNonSeamlessAdaptiveness = initialValues.allowNonSeamlessAdaptiveness; allowNonSeamlessAdaptiveness = initialValues.allowNonSeamlessAdaptiveness;
...@@ -154,6 +156,17 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -154,6 +156,17 @@ public class DefaultTrackSelector extends MappingTrackSelector {
} }
/** /**
* See {@link Parameters#disabledTextTrackSelectionFlags}.
*
* @return This builder.
*/
public ParametersBuilder setDisabledTextTrackSelectionFlags(
int disabledTextTrackSelectionFlags) {
this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
return this;
}
/**
* See {@link Parameters#forceLowestBitrate}. * See {@link Parameters#forceLowestBitrate}.
* *
* @return This builder. * @return This builder.
...@@ -287,11 +300,22 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -287,11 +300,22 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* Builds a {@link Parameters} instance with the selected values. * Builds a {@link Parameters} instance with the selected values.
*/ */
public Parameters build() { public Parameters build() {
return new Parameters(preferredAudioLanguage, preferredTextLanguage, return new Parameters(
selectUndeterminedTextLanguage, forceLowestBitrate, allowMixedMimeAdaptiveness, preferredAudioLanguage,
allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight, maxVideoBitrate, preferredTextLanguage,
exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary, viewportWidth, selectUndeterminedTextLanguage,
viewportHeight, viewportOrientationMayChange); disabledTextTrackSelectionFlags,
forceLowestBitrate,
allowMixedMimeAdaptiveness,
allowNonSeamlessAdaptiveness,
maxVideoWidth,
maxVideoHeight,
maxVideoBitrate,
exceedVideoConstraintsIfNecessary,
exceedRendererCapabilitiesIfNecessary,
viewportWidth,
viewportHeight,
viewportOrientationMayChange);
} }
} }
...@@ -303,19 +327,21 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -303,19 +327,21 @@ public class DefaultTrackSelector extends MappingTrackSelector {
/** /**
* An instance with default values: * An instance with default values:
*
* <ul> * <ul>
* <li>No preferred audio language.</li> * <li>No preferred audio language.
* <li>No preferred text language.</li> * <li>No preferred text language.
* <li>Text tracks with undetermined language are not selected if no track with * <li>Text tracks with undetermined language are not selected if no track with {@link
* {@link #preferredTextLanguage} is available.</li> * #preferredTextLanguage} is available.
* <li>Lowest bitrate track selections are not forced.</li> * <li>All selection flags are considered for text track selections.
* <li>Adaptation between different mime types is not allowed.</li> * <li>Lowest bitrate track selections are not forced.
* <li>Non seamless adaptation is allowed.</li> * <li>Adaptation between different mime types is not allowed.
* <li>No max limit for video width/height.</li> * <li>Non seamless adaptation is allowed.
* <li>No max video bitrate.</li> * <li>No max limit for video width/height.
* <li>Video constraints are exceeded if no supported selection can be made otherwise.</li> * <li>No max video bitrate.
* <li>Renderer capabilities are exceeded if no supported selection can be made.</li> * <li>Video constraints are exceeded if no supported selection can be made otherwise.
* <li>No viewport constraints.</li> * <li>Renderer capabilities are exceeded if no supported selection can be made.
* <li>No viewport constraints.
* </ul> * </ul>
*/ */
public static final Parameters DEFAULT = new Parameters(); public static final Parameters DEFAULT = new Parameters();
...@@ -338,6 +364,11 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -338,6 +364,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* {@link #preferredTextLanguage} is available, or if {@link #preferredTextLanguage} is unset. * {@link #preferredTextLanguage} is available, or if {@link #preferredTextLanguage} is unset.
*/ */
public final boolean selectUndeterminedTextLanguage; public final boolean selectUndeterminedTextLanguage;
/**
* Bitmask of selection flags that are disabled for text track selections. See {@link
* C.SelectionFlags}.
*/
public final int disabledTextTrackSelectionFlags;
// Video // Video
/** /**
...@@ -392,19 +423,44 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -392,19 +423,44 @@ public class DefaultTrackSelector extends MappingTrackSelector {
public final boolean exceedRendererCapabilitiesIfNecessary; public final boolean exceedRendererCapabilitiesIfNecessary;
private Parameters() { private Parameters() {
this(null, null, false, false, false, true, Integer.MAX_VALUE, Integer.MAX_VALUE, this(
Integer.MAX_VALUE, true, true, Integer.MAX_VALUE, Integer.MAX_VALUE, true); null,
} null,
false,
private Parameters(String preferredAudioLanguage, String preferredTextLanguage, 0,
boolean selectUndeterminedTextLanguage, boolean forceLowestBitrate, false,
boolean allowMixedMimeAdaptiveness, boolean allowNonSeamlessAdaptiveness, int maxVideoWidth, false,
int maxVideoHeight, int maxVideoBitrate, boolean exceedVideoConstraintsIfNecessary, true,
boolean exceedRendererCapabilitiesIfNecessary, int viewportWidth, int viewportHeight, Integer.MAX_VALUE,
Integer.MAX_VALUE,
Integer.MAX_VALUE,
true,
true,
Integer.MAX_VALUE,
Integer.MAX_VALUE,
true);
}
private Parameters(
String preferredAudioLanguage,
String preferredTextLanguage,
boolean selectUndeterminedTextLanguage,
int disabledTextTrackSelectionFlags,
boolean forceLowestBitrate,
boolean allowMixedMimeAdaptiveness,
boolean allowNonSeamlessAdaptiveness,
int maxVideoWidth,
int maxVideoHeight,
int maxVideoBitrate,
boolean exceedVideoConstraintsIfNecessary,
boolean exceedRendererCapabilitiesIfNecessary,
int viewportWidth,
int viewportHeight,
boolean viewportOrientationMayChange) { boolean viewportOrientationMayChange) {
this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage); this.preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage);
this.preferredTextLanguage = Util.normalizeLanguageCode(preferredTextLanguage); this.preferredTextLanguage = Util.normalizeLanguageCode(preferredTextLanguage);
this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage; this.selectUndeterminedTextLanguage = selectUndeterminedTextLanguage;
this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
this.forceLowestBitrate = forceLowestBitrate; this.forceLowestBitrate = forceLowestBitrate;
this.allowMixedMimeAdaptiveness = allowMixedMimeAdaptiveness; this.allowMixedMimeAdaptiveness = allowMixedMimeAdaptiveness;
this.allowNonSeamlessAdaptiveness = allowNonSeamlessAdaptiveness; this.allowNonSeamlessAdaptiveness = allowNonSeamlessAdaptiveness;
...@@ -434,14 +490,18 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -434,14 +490,18 @@ public class DefaultTrackSelector extends MappingTrackSelector {
return false; return false;
} }
Parameters other = (Parameters) obj; Parameters other = (Parameters) obj;
return forceLowestBitrate == other.forceLowestBitrate return selectUndeterminedTextLanguage == other.selectUndeterminedTextLanguage
&& disabledTextTrackSelectionFlags == other.disabledTextTrackSelectionFlags
&& forceLowestBitrate == other.forceLowestBitrate
&& allowMixedMimeAdaptiveness == other.allowMixedMimeAdaptiveness && allowMixedMimeAdaptiveness == other.allowMixedMimeAdaptiveness
&& allowNonSeamlessAdaptiveness == other.allowNonSeamlessAdaptiveness && allowNonSeamlessAdaptiveness == other.allowNonSeamlessAdaptiveness
&& maxVideoWidth == other.maxVideoWidth && maxVideoHeight == other.maxVideoHeight && maxVideoWidth == other.maxVideoWidth
&& maxVideoHeight == other.maxVideoHeight
&& exceedVideoConstraintsIfNecessary == other.exceedVideoConstraintsIfNecessary && exceedVideoConstraintsIfNecessary == other.exceedVideoConstraintsIfNecessary
&& exceedRendererCapabilitiesIfNecessary == other.exceedRendererCapabilitiesIfNecessary && exceedRendererCapabilitiesIfNecessary == other.exceedRendererCapabilitiesIfNecessary
&& viewportOrientationMayChange == other.viewportOrientationMayChange && viewportOrientationMayChange == other.viewportOrientationMayChange
&& viewportWidth == other.viewportWidth && viewportHeight == other.viewportHeight && viewportWidth == other.viewportWidth
&& viewportHeight == other.viewportHeight
&& maxVideoBitrate == other.maxVideoBitrate && maxVideoBitrate == other.maxVideoBitrate
&& TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage) && TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage)
&& TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage); && TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage);
...@@ -449,19 +509,21 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -449,19 +509,21 @@ public class DefaultTrackSelector extends MappingTrackSelector {
@Override @Override
public int hashCode() { public int hashCode() {
int result = preferredAudioLanguage.hashCode(); int result = selectUndeterminedTextLanguage ? 1 : 0;
result = 31 * result + preferredTextLanguage.hashCode(); result = 31 * result + disabledTextTrackSelectionFlags;
result = 31 * result + (forceLowestBitrate ? 1 : 0); result = 31 * result + (forceLowestBitrate ? 1 : 0);
result = 31 * result + (allowMixedMimeAdaptiveness ? 1 : 0); result = 31 * result + (allowMixedMimeAdaptiveness ? 1 : 0);
result = 31 * result + (allowNonSeamlessAdaptiveness ? 1 : 0); result = 31 * result + (allowNonSeamlessAdaptiveness ? 1 : 0);
result = 31 * result + maxVideoWidth; result = 31 * result + maxVideoWidth;
result = 31 * result + maxVideoHeight; result = 31 * result + maxVideoHeight;
result = 31 * result + maxVideoBitrate;
result = 31 * result + (exceedVideoConstraintsIfNecessary ? 1 : 0); result = 31 * result + (exceedVideoConstraintsIfNecessary ? 1 : 0);
result = 31 * result + (exceedRendererCapabilitiesIfNecessary ? 1 : 0); result = 31 * result + (exceedRendererCapabilitiesIfNecessary ? 1 : 0);
result = 31 * result + (viewportOrientationMayChange ? 1 : 0); result = 31 * result + (viewportOrientationMayChange ? 1 : 0);
result = 31 * result + viewportWidth; result = 31 * result + viewportWidth;
result = 31 * result + viewportHeight; result = 31 * result + viewportHeight;
result = 31 * result + maxVideoBitrate;
result = 31 * result + preferredAudioLanguage.hashCode();
result = 31 * result + preferredTextLanguage.hashCode();
return result; return result;
} }
...@@ -923,8 +985,10 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -923,8 +985,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
if (isSupported(trackFormatSupport[trackIndex], if (isSupported(trackFormatSupport[trackIndex],
params.exceedRendererCapabilitiesIfNecessary)) { params.exceedRendererCapabilitiesIfNecessary)) {
Format format = trackGroup.getFormat(trackIndex); Format format = trackGroup.getFormat(trackIndex);
boolean isDefault = (format.selectionFlags & C.SELECTION_FLAG_DEFAULT) != 0; int maskedSelectionFlags =
boolean isForced = (format.selectionFlags & C.SELECTION_FLAG_FORCED) != 0; format.selectionFlags & ~params.disabledTextTrackSelectionFlags;
boolean isDefault = (maskedSelectionFlags & C.SELECTION_FLAG_DEFAULT) != 0;
boolean isForced = (maskedSelectionFlags & C.SELECTION_FLAG_FORCED) != 0;
int trackScore; int trackScore;
boolean preferredLanguageFound = formatHasLanguage(format, params.preferredTextLanguage); boolean preferredLanguageFound = formatHasLanguage(format, params.preferredTextLanguage);
if (preferredLanguageFound if (preferredLanguageFound
......
library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
...@@ -529,6 +529,134 @@ public final class DefaultTrackSelectorTest { ...@@ -529,6 +529,134 @@ public final class DefaultTrackSelectorTest {
.isEqualTo(lowerSampleRateHigherBitrateFormat); .isEqualTo(lowerSampleRateHigherBitrateFormat);
} }
/** Tests text track selection flags. */
@Test
public void testsTextTrackSelectionFlags() throws ExoPlaybackException {
Format forcedOnly =
Format.createTextContainerFormat(
"forcedOnly",
null,
MimeTypes.TEXT_VTT,
null,
Format.NO_VALUE,
C.SELECTION_FLAG_FORCED,
"eng");
Format forcedDefault =
Format.createTextContainerFormat(
"forcedDefault",
null,
MimeTypes.TEXT_VTT,
null,
Format.NO_VALUE,
C.SELECTION_FLAG_FORCED | C.SELECTION_FLAG_DEFAULT,
"eng");
Format defaultOnly =
Format.createTextContainerFormat(
"defaultOnly",
null,
MimeTypes.TEXT_VTT,
null,
Format.NO_VALUE,
C.SELECTION_FLAG_DEFAULT,
"eng");
Format forcedOnlySpanish =
Format.createTextContainerFormat(
"forcedOnlySpanish",
null,
MimeTypes.TEXT_VTT,
null,
Format.NO_VALUE,
C.SELECTION_FLAG_FORCED,
"spa");
Format noFlag =
Format.createTextContainerFormat(
"noFlag", null, MimeTypes.TEXT_VTT, null, Format.NO_VALUE, 0, "eng");
RendererCapabilities[] textRendererCapabilities =
new RendererCapabilities[] {ALL_TEXT_FORMAT_SUPPORTED_RENDERER_CAPABILITIES};
TrackSelectorResult result;
// There is no text language preference, the first track flagged as default should be selected.
result =
trackSelector.selectTracks(
textRendererCapabilities, wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag));
assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedDefault);
// Ditto.
result =
trackSelector.selectTracks(
textRendererCapabilities, wrapFormats(forcedOnly, noFlag, defaultOnly));
assertThat(result.selections.get(0).getFormat(0)).isSameAs(defaultOnly);
// With no language preference and no text track flagged as default, the first forced should be
// selected.
result = trackSelector.selectTracks(textRendererCapabilities, wrapFormats(forcedOnly, noFlag));
assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnly);
trackSelector.setParameters(
Parameters.DEFAULT
.buildUpon()
.setDisabledTextTrackSelectionFlags(C.SELECTION_FLAG_DEFAULT)
.build());
// Default flags are disabled, so the first track flagged as forced should be selected.
result =
trackSelector.selectTracks(
textRendererCapabilities, wrapFormats(defaultOnly, noFlag, forcedOnly, forcedDefault));
assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnly);
trackSelector.setParameters(
trackSelector.getParameters().buildUpon().setPreferredAudioLanguage("spa").build());
// Default flags are disabled, but there is a text track flagged as forced whose language
// matches the preferred audio language.
result =
trackSelector.selectTracks(
textRendererCapabilities,
wrapFormats(forcedDefault, forcedOnly, defaultOnly, noFlag, forcedOnlySpanish));
assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedOnlySpanish);
trackSelector.setParameters(
trackSelector
.getParameters()
.buildUpon()
.setDisabledTextTrackSelectionFlags(C.SELECTION_FLAG_DEFAULT | C.SELECTION_FLAG_FORCED)
.build());
// All selection flags are disabled and there is no language preference, so nothing should be
// selected.
result =
trackSelector.selectTracks(
textRendererCapabilities, wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag));
assertThat(result.selections.get(0)).isNull();
trackSelector.setParameters(
Parameters.DEFAULT.buildUpon().setPreferredTextLanguage("eng").build());
// There is a preferred language, so the first language-matching track flagged as default should
// be selected.
result =
trackSelector.selectTracks(
textRendererCapabilities, wrapFormats(forcedOnly, forcedDefault, defaultOnly, noFlag));
assertThat(result.selections.get(0).getFormat(0)).isSameAs(forcedDefault);
trackSelector.setParameters(
trackSelector
.getParameters()
.buildUpon()
.setDisabledTextTrackSelectionFlags(C.SELECTION_FLAG_DEFAULT)
.build());
// Same as above, but the default flag is disabled. If multiple tracks match the preferred
// language, those not flagged as forced are preferred, as they likely include the contents of
// forced subtitles.
result =
trackSelector.selectTracks(
textRendererCapabilities, wrapFormats(noFlag, forcedOnly, forcedDefault, defaultOnly));
assertThat(result.selections.get(0).getFormat(0)).isSameAs(noFlag);
}
/** /**
* Tests that the default track selector will select a text track with undetermined language if no * Tests that the default track selector will select a text track with undetermined language if no
* text track with the preferred language is available but * text track with the preferred language is available but
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment