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

Fix doc for preferred audio and text language.

Browse Source 
Both tags allow any BCP47 compliant code, not just the ISO 639-2/T ones.

PiperOrigin-RevId: 259714587
This commit is contained in:
tonihei 2019-07-24 12:17:05 +01:00 committed by Toni
parent e84d88e90f
commit a0ca79abcc
1 changed files with 5 additions and 19 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/TrackSelectionParameters.java
View File

@ -31,9 +31,7 @@ public class TrackSelectionParameters implements Parcelable {
*/ */
public static class Builder { public static class Builder {
// Audio
@Nullable /* package */ String preferredAudioLanguage; @Nullable /* package */ String preferredAudioLanguage;
// Text
@Nullable /* package */ String preferredTextLanguage; @Nullable /* package */ String preferredTextLanguage;
/* package */ boolean selectUndeterminedTextLanguage; /* package */ boolean selectUndeterminedTextLanguage;
@C.SelectionFlags /* package */ int disabledTextTrackSelectionFlags; @C.SelectionFlags /* package */ int disabledTextTrackSelectionFlags;
@ -48,9 +46,7 @@ public class TrackSelectionParameters implements Parcelable {
* the builder are obtained. * the builder are obtained.
*/ */
/* package */ Builder(TrackSelectionParameters initialValues) { /* package */ Builder(TrackSelectionParameters initialValues) {
// Audio
preferredAudioLanguage = initialValues.preferredAudioLanguage; preferredAudioLanguage = initialValues.preferredAudioLanguage;
// Text
preferredTextLanguage = initialValues.preferredTextLanguage; preferredTextLanguage = initialValues.preferredTextLanguage;
selectUndeterminedTextLanguage = initialValues.selectUndeterminedTextLanguage; selectUndeterminedTextLanguage = initialValues.selectUndeterminedTextLanguage;
disabledTextTrackSelectionFlags = initialValues.disabledTextTrackSelectionFlags; disabledTextTrackSelectionFlags = initialValues.disabledTextTrackSelectionFlags;
@ -67,8 +63,6 @@ public class TrackSelectionParameters implements Parcelable {
return this; return this;
} }
// Text
/** /**
* See {@link TrackSelectionParameters#preferredTextLanguage}. * See {@link TrackSelectionParameters#preferredTextLanguage}.
* *
@ -117,15 +111,14 @@ public class TrackSelectionParameters implements Parcelable {
public static final TrackSelectionParameters DEFAULT = new TrackSelectionParameters(); public static final TrackSelectionParameters DEFAULT = new TrackSelectionParameters();
/** /**
* The preferred language for audio and forced text tracks, as an ISO 639-2/T tag. {@code null} * The preferred language for audio and forced text tracks as an IETF BCP 47 conformant tag.
* selects the default track, or the first track if there's no default. The default value is * {@code null} selects the default track, or the first track if there's no default. The default
* {@code null}. * value is {@code null}.
*/ */
@Nullable public final String preferredAudioLanguage; @Nullable public final String preferredAudioLanguage;
// Text
/** /**
* The preferred language for text tracks as an ISO 639-2/T tag. {@code null} selects the default * The preferred language for text tracks as an IETF BCP 47 conformant tag. {@code null} selects
* track if there is one, or no track otherwise. The default value is {@code null}. * the default track if there is one, or no track otherwise. The default value is {@code null}.
*/ */
@Nullable public final String preferredTextLanguage; @Nullable public final String preferredTextLanguage;
/** /**
@ -163,9 +156,7 @@ public class TrackSelectionParameters implements Parcelable {
} }
/* package */ TrackSelectionParameters(Parcel in) { /* package */ TrackSelectionParameters(Parcel in) {
// Audio
this.preferredAudioLanguage = in.readString(); this.preferredAudioLanguage = in.readString();
// Text
this.preferredTextLanguage = in.readString(); this.preferredTextLanguage = in.readString();
this.selectUndeterminedTextLanguage = Util.readBoolean(in); this.selectUndeterminedTextLanguage = Util.readBoolean(in);
this.disabledTextTrackSelectionFlags = in.readInt(); this.disabledTextTrackSelectionFlags = in.readInt();
@ -187,7 +178,6 @@ public class TrackSelectionParameters implements Parcelable {
} }
TrackSelectionParameters other = (TrackSelectionParameters) obj; TrackSelectionParameters other = (TrackSelectionParameters) obj;
return TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage) return TextUtils.equals(preferredAudioLanguage, other.preferredAudioLanguage)
// Text
&& TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage) && TextUtils.equals(preferredTextLanguage, other.preferredTextLanguage)
&& selectUndeterminedTextLanguage == other.selectUndeterminedTextLanguage && selectUndeterminedTextLanguage == other.selectUndeterminedTextLanguage
&& disabledTextTrackSelectionFlags == other.disabledTextTrackSelectionFlags; && disabledTextTrackSelectionFlags == other.disabledTextTrackSelectionFlags;
@ -196,9 +186,7 @@ public class TrackSelectionParameters implements Parcelable {
@Override @Override
public int hashCode() { public int hashCode() {
int result = 1; int result = 1;
// Audio
result = 31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode()); result = 31 * result + (preferredAudioLanguage == null ? 0 : preferredAudioLanguage.hashCode());
// Text
result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode()); result = 31 * result + (preferredTextLanguage == null ? 0 : preferredTextLanguage.hashCode());
result = 31 * result + (selectUndeterminedTextLanguage ? 1 : 0); result = 31 * result + (selectUndeterminedTextLanguage ? 1 : 0);
result = 31 * result + disabledTextTrackSelectionFlags; result = 31 * result + disabledTextTrackSelectionFlags;
@ -214,9 +202,7 @@ public class TrackSelectionParameters implements Parcelable {
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
// Audio
dest.writeString(preferredAudioLanguage); dest.writeString(preferredAudioLanguage);
// Text
dest.writeString(preferredTextLanguage); dest.writeString(preferredTextLanguage);
Util.writeBoolean(dest, selectUndeterminedTextLanguage); Util.writeBoolean(dest, selectUndeterminedTextLanguage);
dest.writeInt(disabledTextTrackSelectionFlags); dest.writeInt(disabledTextTrackSelectionFlags);