Skip to content

SDK / exoplayer

Go to a project
Commit cd297b04 by krocard Committed by bachinger
Options

Make Track selection objects Bundleable 

Most of those objects needs to be sent to MediaControler.

`TrackSelectior.Parameters` could have stayed Parcelable,
but it needs to be `Bundleable` as it inherit from
`TrackSelectionParameters` that is and needs to be
serializable anyway for the demo app.
As a result it has also been migrated to bundleable.

PiperOrigin-RevId: 391353293
parent b689fbd4
Inline Side-by-side
Showing with 898 additions and 500 deletions
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
...@@ -98,7 +98,7 @@ public class PlayerActivity extends AppCompatActivity ...@@ -98,7 +98,7 @@ public class PlayerActivity extends AppCompatActivity
// Activity lifecycle. // Activity lifecycle.
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
dataSourceFactory = DemoUtil.getDataSourceFactory(/* context= */ this); dataSourceFactory = DemoUtil.getDataSourceFactory(/* context= */ this);
...@@ -114,7 +114,9 @@ public class PlayerActivity extends AppCompatActivity ...@@ -114,7 +114,9 @@ public class PlayerActivity extends AppCompatActivity
playerView.requestFocus(); playerView.requestFocus();
if (savedInstanceState != null) { if (savedInstanceState != null) {
trackSelectorParameters = savedInstanceState.getParcelable(KEY_TRACK_SELECTOR_PARAMETERS); trackSelectorParameters =
DefaultTrackSelector.Parameters.CREATOR.fromBundle(
savedInstanceState.getBundle(KEY_TRACK_SELECTOR_PARAMETERS));
startAutoPlay = savedInstanceState.getBoolean(KEY_AUTO_PLAY); startAutoPlay = savedInstanceState.getBoolean(KEY_AUTO_PLAY);
startWindow = savedInstanceState.getInt(KEY_WINDOW); startWindow = savedInstanceState.getInt(KEY_WINDOW);
startPosition = savedInstanceState.getLong(KEY_POSITION); startPosition = savedInstanceState.getLong(KEY_POSITION);
...@@ -207,7 +209,7 @@ public class PlayerActivity extends AppCompatActivity ...@@ -207,7 +209,7 @@ public class PlayerActivity extends AppCompatActivity
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
updateTrackSelectorParameters(); updateTrackSelectorParameters();
updateStartPosition(); updateStartPosition();
outState.putParcelable(KEY_TRACK_SELECTOR_PARAMETERS, trackSelectorParameters); outState.putBundle(KEY_TRACK_SELECTOR_PARAMETERS, trackSelectorParameters.toBundle());
outState.putBoolean(KEY_AUTO_PLAY, startAutoPlay); outState.putBoolean(KEY_AUTO_PLAY, startAutoPlay);
outState.putInt(KEY_WINDOW, startWindow); outState.putInt(KEY_WINDOW, startWindow);
outState.putLong(KEY_POSITION, startPosition); outState.putLong(KEY_POSITION, startPosition);
......
library/common/src/main/java/com/google/android/exoplayer2/Format.java
...@@ -15,19 +15,21 @@ ...@@ -15,19 +15,21 @@
*/ */
package com.google.android.exoplayer2; package com.google.android.exoplayer2;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import android.os.Bundle;
import androidx.annotation.IntDef;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.drm.ExoMediaCrypto; import com.google.android.exoplayer2.drm.ExoMediaCrypto;
import com.google.android.exoplayer2.drm.UnsupportedMediaCrypto; import com.google.android.exoplayer2.drm.UnsupportedMediaCrypto;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.util.BundleableUtils;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.ColorInfo; import com.google.android.exoplayer2.video.ColorInfo;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
...@@ -112,7 +114,7 @@ import java.util.UUID; ...@@ -112,7 +114,7 @@ import java.util.UUID;
* <li>{@link #accessibilityChannel} * <li>{@link #accessibilityChannel}
* </ul> * </ul>
*/ */
public final class Format implements Parcelable { public final class Format implements Bundleable {
/** /**
* Builds {@link Format} instances. * Builds {@link Format} instances.
...@@ -610,6 +612,8 @@ public final class Format implements Parcelable { ...@@ -610,6 +612,8 @@ public final class Format implements Parcelable {
*/ */
public static final long OFFSET_SAMPLE_RELATIVE = Long.MAX_VALUE; public static final long OFFSET_SAMPLE_RELATIVE = Long.MAX_VALUE;
private static final Format DEFAULT = new Builder().build();
/** An identifier for the format, or null if unknown or not applicable. */ /** An identifier for the format, or null if unknown or not applicable. */
@Nullable public final String id; @Nullable public final String id;
/** The human readable label, or null if unknown or not applicable. */ /** The human readable label, or null if unknown or not applicable. */
...@@ -968,54 +972,6 @@ public final class Format implements Parcelable { ...@@ -968,54 +972,6 @@ public final class Format implements Parcelable {
} }
} }
// Some fields are deprecated but they're still assigned below.
@SuppressWarnings({"ResourceType"})
/* package */ Format(Parcel in) {
id = in.readString();
label = in.readString();
language = in.readString();
selectionFlags = in.readInt();
roleFlags = in.readInt();
averageBitrate = in.readInt();
peakBitrate = in.readInt();
bitrate = peakBitrate != NO_VALUE ? peakBitrate : averageBitrate;
codecs = in.readString();
metadata = in.readParcelable(Metadata.class.getClassLoader());
// Container specific.
containerMimeType = in.readString();
// Sample specific.
sampleMimeType = in.readString();
maxInputSize = in.readInt();
int initializationDataSize = in.readInt();
initializationData = new ArrayList<>(initializationDataSize);
for (int i = 0; i < initializationDataSize; i++) {
initializationData.add(checkNotNull(in.createByteArray()));
}
drmInitData = in.readParcelable(DrmInitData.class.getClassLoader());
subsampleOffsetUs = in.readLong();
// Video specific.
width = in.readInt();
height = in.readInt();
frameRate = in.readFloat();
rotationDegrees = in.readInt();
pixelWidthHeightRatio = in.readFloat();
boolean hasProjectionData = Util.readBoolean(in);
projectionData = hasProjectionData ? in.createByteArray() : null;
stereoMode = in.readInt();
colorInfo = in.readParcelable(ColorInfo.class.getClassLoader());
// Audio specific.
channelCount = in.readInt();
sampleRate = in.readInt();
pcmEncoding = in.readInt();
encoderDelay = in.readInt();
encoderPadding = in.readInt();
// Text specific.
accessibilityChannel = in.readInt();
// Provided by source.
// Encrypted content must always have a non-null exoMediaCryptoType.
exoMediaCryptoType = drmInitData != null ? UnsupportedMediaCrypto.class : null;
}
/** Returns a {@link Format.Builder} initialized with the values of this instance. */ /** Returns a {@link Format.Builder} initialized with the values of this instance. */
public Builder buildUpon() { public Builder buildUpon() {
return new Builder(this); return new Builder(this);
...@@ -1371,69 +1327,208 @@ public final class Format implements Parcelable { ...@@ -1371,69 +1327,208 @@ public final class Format implements Parcelable {
return builder.toString(); return builder.toString();
} }
// Parcelable implementation. // Bundleable implementation.
@Documented
@Override @Retention(RetentionPolicy.SOURCE)
public int describeContents() { @IntDef({
return 0; FIELD_ID,
} FIELD_LABEL,
FIELD_LANGUAGE,
FIELD_SELECTION_FLAGS,
FIELD_ROLE_FLAGS,
FIELD_AVERAGE_BITRATE,
FIELD_PEAK_BITRATE,
FIELD_CODECS,
FIELD_METADATA,
FIELD_CONTAINER_MIME_TYPE,
FIELD_SAMPLE_MIME_TYPE,
FIELD_MAX_INPUT_SIZE,
FIELD_INITIALIZATION_DATA,
FIELD_DRM_INIT_DATA,
FIELD_SUBSAMPLE_OFFSET_US,
FIELD_WIDTH,
FIELD_HEIGHT,
FIELD_FRAME_RATE,
FIELD_ROTATION_DEGREES,
FIELD_PIXEL_WIDTH_HEIGHT_RATIO,
FIELD_PROJECTION_DATA,
FIELD_STEREO_MODE,
FIELD_COLOR_INFO,
FIELD_CHANNEL_COUNT,
FIELD_SAMPLE_RATE,
FIELD_PCM_ENCODING,
FIELD_ENCODER_DELAY,
FIELD_ENCODER_PADDING,
FIELD_ACCESSIBILITY_CHANNEL,
})
private @interface FieldNumber {}
private static final int FIELD_ID = 0;
private static final int FIELD_LABEL = 1;
private static final int FIELD_LANGUAGE = 2;
private static final int FIELD_SELECTION_FLAGS = 3;
private static final int FIELD_ROLE_FLAGS = 4;
private static final int FIELD_AVERAGE_BITRATE = 5;
private static final int FIELD_PEAK_BITRATE = 6;
private static final int FIELD_CODECS = 7;
private static final int FIELD_METADATA = 8;
private static final int FIELD_CONTAINER_MIME_TYPE = 9;
private static final int FIELD_SAMPLE_MIME_TYPE = 10;
private static final int FIELD_MAX_INPUT_SIZE = 11;
private static final int FIELD_INITIALIZATION_DATA = 12;
private static final int FIELD_DRM_INIT_DATA = 13;
private static final int FIELD_SUBSAMPLE_OFFSET_US = 14;
private static final int FIELD_WIDTH = 15;
private static final int FIELD_HEIGHT = 16;
private static final int FIELD_FRAME_RATE = 17;
private static final int FIELD_ROTATION_DEGREES = 18;
private static final int FIELD_PIXEL_WIDTH_HEIGHT_RATIO = 19;
private static final int FIELD_PROJECTION_DATA = 20;
private static final int FIELD_STEREO_MODE = 21;
private static final int FIELD_COLOR_INFO = 22;
private static final int FIELD_CHANNEL_COUNT = 23;
private static final int FIELD_SAMPLE_RATE = 24;
private static final int FIELD_PCM_ENCODING = 25;
private static final int FIELD_ENCODER_DELAY = 26;
private static final int FIELD_ENCODER_PADDING = 27;
private static final int FIELD_ACCESSIBILITY_CHANNEL = 28;
/**
* {@inheritDoc}
*
* <p>Omits the {@link #exoMediaCryptoType} field. The {@link #exoMediaCryptoType} of an instance
* restored by {@link #CREATOR} will always be {@link UnsupportedMediaCrypto}.
*/
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public Bundle toBundle() {
dest.writeString(id); Bundle bundle = new Bundle();
dest.writeString(label); bundle.putString(keyForField(FIELD_ID), id);
dest.writeString(language); bundle.putString(keyForField(FIELD_LABEL), label);
dest.writeInt(selectionFlags); bundle.putString(keyForField(FIELD_LANGUAGE), language);
dest.writeInt(roleFlags); bundle.putInt(keyForField(FIELD_SELECTION_FLAGS), selectionFlags);
dest.writeInt(averageBitrate); bundle.putInt(keyForField(FIELD_ROLE_FLAGS), roleFlags);
dest.writeInt(peakBitrate); bundle.putInt(keyForField(FIELD_AVERAGE_BITRATE), averageBitrate);
dest.writeString(codecs); bundle.putInt(keyForField(FIELD_PEAK_BITRATE), peakBitrate);
dest.writeParcelable(metadata, 0); bundle.putString(keyForField(FIELD_CODECS), codecs);
// Metadata is currently not Bundleable because Metadata.Entry is an Interface,
// which would be difficult to unbundle in a backward compatible way.
// The entries are additionally of limited usefulness to remote processes.
bundle.putParcelable(keyForField(FIELD_METADATA), metadata);
// Container specific. // Container specific.
dest.writeString(containerMimeType); bundle.putString(keyForField(FIELD_CONTAINER_MIME_TYPE), containerMimeType);
// Sample specific. // Sample specific.
dest.writeString(sampleMimeType); bundle.putString(keyForField(FIELD_SAMPLE_MIME_TYPE), sampleMimeType);
dest.writeInt(maxInputSize); bundle.putInt(keyForField(FIELD_MAX_INPUT_SIZE), maxInputSize);
int initializationDataSize = initializationData.size(); for (int i = 0; i < initializationData.size(); i++) {
dest.writeInt(initializationDataSize); bundle.putByteArray(keyForInitializationData(i), initializationData.get(i));
for (int i = 0; i < initializationDataSize; i++) {
dest.writeByteArray(initializationData.get(i));
} }
dest.writeParcelable(drmInitData, 0); // DrmInitData doesn't need to be Bundleable as it's only used in the playing process to
dest.writeLong(subsampleOffsetUs); // initialize the decoder.
bundle.putParcelable(keyForField(FIELD_DRM_INIT_DATA), drmInitData);
bundle.putLong(keyForField(FIELD_SUBSAMPLE_OFFSET_US), subsampleOffsetUs);
// Video specific. // Video specific.
dest.writeInt(width); bundle.putInt(keyForField(FIELD_WIDTH), width);
dest.writeInt(height); bundle.putInt(keyForField(FIELD_HEIGHT), height);
dest.writeFloat(frameRate); bundle.putFloat(keyForField(FIELD_FRAME_RATE), frameRate);
dest.writeInt(rotationDegrees); bundle.putInt(keyForField(FIELD_ROTATION_DEGREES), rotationDegrees);
dest.writeFloat(pixelWidthHeightRatio); bundle.putFloat(keyForField(FIELD_PIXEL_WIDTH_HEIGHT_RATIO), pixelWidthHeightRatio);
Util.writeBoolean(dest, projectionData != null); bundle.putByteArray(keyForField(FIELD_PROJECTION_DATA), projectionData);
if (projectionData != null) { bundle.putInt(keyForField(FIELD_STEREO_MODE), stereoMode);
dest.writeByteArray(projectionData); bundle.putBundle(keyForField(FIELD_COLOR_INFO), BundleableUtils.toNullableBundle(colorInfo));
}
dest.writeInt(stereoMode);
dest.writeParcelable(colorInfo, flags);
// Audio specific. // Audio specific.
dest.writeInt(channelCount); bundle.putInt(keyForField(FIELD_CHANNEL_COUNT), channelCount);
dest.writeInt(sampleRate); bundle.putInt(keyForField(FIELD_SAMPLE_RATE), sampleRate);
dest.writeInt(pcmEncoding); bundle.putInt(keyForField(FIELD_PCM_ENCODING), pcmEncoding);
dest.writeInt(encoderDelay); bundle.putInt(keyForField(FIELD_ENCODER_DELAY), encoderDelay);
dest.writeInt(encoderPadding); bundle.putInt(keyForField(FIELD_ENCODER_PADDING), encoderPadding);
// Text specific. // Text specific.
dest.writeInt(accessibilityChannel); bundle.putInt(keyForField(FIELD_ACCESSIBILITY_CHANNEL), accessibilityChannel);
return bundle;
} }
public static final Creator<Format> CREATOR = /** Object that can restore {@code Format} from a {@link Bundle}. */
new Creator<Format>() { public static final Creator<Format> CREATOR = Format::fromBundle;
private static Format fromBundle(Bundle bundle) {
Builder builder = new Builder();
BundleableUtils.ensureClassLoader(bundle);
builder
.setId(defaultIfNull(bundle.getString(keyForField(FIELD_ID)), DEFAULT.id))
.setLabel(defaultIfNull(bundle.getString(keyForField(FIELD_LABEL)), DEFAULT.label))
.setLanguage(defaultIfNull(bundle.getString(keyForField(FIELD_LANGUAGE)), DEFAULT.language))
.setSelectionFlags(
bundle.getInt(keyForField(FIELD_SELECTION_FLAGS), DEFAULT.selectionFlags))
.setRoleFlags(bundle.getInt(keyForField(FIELD_ROLE_FLAGS), DEFAULT.roleFlags))
.setAverageBitrate(
bundle.getInt(keyForField(FIELD_AVERAGE_BITRATE), DEFAULT.averageBitrate))
.setPeakBitrate(bundle.getInt(keyForField(FIELD_PEAK_BITRATE), DEFAULT.peakBitrate))
.setCodecs(defaultIfNull(bundle.getString(keyForField(FIELD_CODECS)), DEFAULT.codecs))
.setMetadata(
defaultIfNull(bundle.getParcelable(keyForField(FIELD_METADATA)), DEFAULT.metadata))
// Container specific.
.setContainerMimeType(
defaultIfNull(
bundle.getString(keyForField(FIELD_CONTAINER_MIME_TYPE)),
DEFAULT.containerMimeType))
// Sample specific.
.setSampleMimeType(
defaultIfNull(
bundle.getString(keyForField(FIELD_SAMPLE_MIME_TYPE)), DEFAULT.sampleMimeType))
.setMaxInputSize(bundle.getInt(keyForField(FIELD_MAX_INPUT_SIZE), DEFAULT.maxInputSize));
List<byte[]> initializationData = new ArrayList<>();
for (int i = 0; ; i++) {
@Nullable byte[] data = bundle.getByteArray(keyForInitializationData(i));
if (data == null) {
break;
}
initializationData.add(data);
}
builder
.setInitializationData(initializationData)
.setDrmInitData(bundle.getParcelable(keyForField(FIELD_DRM_INIT_DATA)))
.setSubsampleOffsetUs(
bundle.getLong(keyForField(FIELD_SUBSAMPLE_OFFSET_US), DEFAULT.subsampleOffsetUs))
// Video specific.
.setWidth(bundle.getInt(keyForField(FIELD_WIDTH), DEFAULT.width))
.setHeight(bundle.getInt(keyForField(FIELD_HEIGHT), DEFAULT.height))
.setFrameRate(bundle.getFloat(keyForField(FIELD_FRAME_RATE), DEFAULT.frameRate))
.setRotationDegrees(
bundle.getInt(keyForField(FIELD_ROTATION_DEGREES), DEFAULT.rotationDegrees))
.setPixelWidthHeightRatio(
bundle.getFloat(
keyForField(FIELD_PIXEL_WIDTH_HEIGHT_RATIO), DEFAULT.pixelWidthHeightRatio))
.setProjectionData(bundle.getByteArray(keyForField(FIELD_PROJECTION_DATA)))
.setStereoMode(bundle.getInt(keyForField(FIELD_STEREO_MODE), DEFAULT.stereoMode))
.setColorInfo(
BundleableUtils.fromNullableBundle(
ColorInfo.CREATOR, bundle.getBundle(keyForField(FIELD_COLOR_INFO))))
// Audio specific.
.setChannelCount(bundle.getInt(keyForField(FIELD_CHANNEL_COUNT), DEFAULT.channelCount))
.setSampleRate(bundle.getInt(keyForField(FIELD_SAMPLE_RATE), DEFAULT.sampleRate))
.setPcmEncoding(bundle.getInt(keyForField(FIELD_PCM_ENCODING), DEFAULT.pcmEncoding))
.setEncoderDelay(bundle.getInt(keyForField(FIELD_ENCODER_DELAY), DEFAULT.encoderDelay))
.setEncoderPadding(
bundle.getInt(keyForField(FIELD_ENCODER_PADDING), DEFAULT.encoderPadding))
// Text specific.
.setAccessibilityChannel(
bundle.getInt(keyForField(FIELD_ACCESSIBILITY_CHANNEL), DEFAULT.accessibilityChannel));
return builder.build();
}
@Override private static String keyForField(@FieldNumber int field) {
public Format createFromParcel(Parcel in) { return Integer.toString(field, Character.MAX_RADIX);
return new Format(in); }
}
@Override private static String keyForInitializationData(int initialisationDataIndex) {
public Format[] newArray(int size) { return keyForField(FIELD_INITIALIZATION_DATA)
return new Format[size]; + "_"
} + Integer.toString(initialisationDataIndex, Character.MAX_RADIX);
}; }
@Nullable
private static <T> T defaultIfNull(@Nullable T value, @Nullable T defaultValue) {
return value != null ? value : defaultValue;
}
} }
library/common/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java
...@@ -15,17 +15,26 @@ ...@@ -15,17 +15,26 @@
*/ */
package com.google.android.exoplayer2.source; package com.google.android.exoplayer2.source;
import android.os.Parcel; import static com.google.android.exoplayer2.util.Assertions.checkArgument;
import android.os.Parcelable;
import android.os.Bundle;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Bundleable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.BundleableUtils;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** Defines an immutable group of tracks identified by their format identity. */ /** Defines an immutable group of tracks identified by their format identity. */
public final class TrackGroup implements Parcelable { public final class TrackGroup implements Bundleable {
private static final String TAG = "TrackGroup"; private static final String TAG = "TrackGroup";
...@@ -37,22 +46,18 @@ public final class TrackGroup implements Parcelable { ...@@ -37,22 +46,18 @@ public final class TrackGroup implements Parcelable {
// Lazily initialized hashcode. // Lazily initialized hashcode.
private int hashCode; private int hashCode;
/** @param formats The track formats. At least one {@link Format} must be provided. */ /**
* Constructs an instance {@code TrackGroup} containing the provided {@code formats}.
*
* @param formats Non empty array of format.
*/
public TrackGroup(Format... formats) { public TrackGroup(Format... formats) {
Assertions.checkState(formats.length > 0); checkArgument(formats.length > 0);
this.formats = formats; this.formats = formats;
this.length = formats.length; this.length = formats.length;
verifyCorrectness(); verifyCorrectness();
} }
/* package */ TrackGroup(Parcel in) {
length = in.readInt();
formats = new Format[length];
for (int i = 0; i < length; i++) {
formats[i] = in.readParcelable(Format.class.getClassLoader());
}
}
/** /**
* Returns the format of the track at a given index. * Returns the format of the track at a given index.
* *
...@@ -103,35 +108,40 @@ public final class TrackGroup implements Parcelable { ...@@ -103,35 +108,40 @@ public final class TrackGroup implements Parcelable {
return length == other.length && Arrays.equals(formats, other.formats); return length == other.length && Arrays.equals(formats, other.formats);
} }
// Parcelable implementation. // Bundleable implementation.
@Override @Documented
public int describeContents() { @Retention(RetentionPolicy.SOURCE)
return 0; @IntDef({
} FIELD_FORMATS,
})
private @interface FieldNumber {}
private static final int FIELD_FORMATS = 0;
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public Bundle toBundle() {
dest.writeInt(length); Bundle bundle = new Bundle();
for (int i = 0; i < length; i++) { bundle.putParcelableArrayList(
dest.writeParcelable(formats[i], 0); keyForField(FIELD_FORMATS), BundleableUtils.toBundleArrayList(Lists.newArrayList(formats)));
} return bundle;
} }
public static final Parcelable.Creator<TrackGroup> CREATOR = /** Object that can restore {@code TrackGroup} from a {@link Bundle}. */
new Parcelable.Creator<TrackGroup>() { public static final Creator<TrackGroup> CREATOR =
bundle -> {
@Override List<Format> formats =
public TrackGroup createFromParcel(Parcel in) { BundleableUtils.fromBundleNullableList(
return new TrackGroup(in); Format.CREATOR,
} bundle.getParcelableArrayList(keyForField(FIELD_FORMATS)),
ImmutableList.of());
@Override return new TrackGroup(formats.toArray(new Format[0]));
public TrackGroup[] newArray(int size) {
return new TrackGroup[size];
}
}; };
private static String keyForField(@FieldNumber int field) {
return Integer.toString(field, Character.MAX_RADIX);
}
private void verifyCorrectness() { private void verifyCorrectness() {
// TrackGroups should only contain tracks with exactly the same content (but in different // TrackGroups should only contain tracks with exactly the same content (but in different
// qualities). We only log an error instead of throwing to not break backwards-compatibility for // qualities). We only log an error instead of throwing to not break backwards-compatibility for
......
library/common/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java
...@@ -15,14 +15,22 @@ ...@@ -15,14 +15,22 @@
*/ */
package com.google.android.exoplayer2.source; package com.google.android.exoplayer2.source;
import android.os.Parcel; import android.os.Bundle;
import android.os.Parcelable; import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Bundleable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.BundleableUtils;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** An immutable array of {@link TrackGroup}s. */ /** An immutable array of {@link TrackGroup}s. */
public final class TrackGroupArray implements Parcelable { public final class TrackGroupArray implements Bundleable {
/** The empty array. */ /** The empty array. */
public static final TrackGroupArray EMPTY = new TrackGroupArray(); public static final TrackGroupArray EMPTY = new TrackGroupArray();
...@@ -35,20 +43,12 @@ public final class TrackGroupArray implements Parcelable { ...@@ -35,20 +43,12 @@ public final class TrackGroupArray implements Parcelable {
// Lazily initialized hashcode. // Lazily initialized hashcode.
private int hashCode; private int hashCode;
/** @param trackGroups The groups. May be empty. */ /** Construct a {@code TrackGroupArray} from an array of (possibly empty) trackGroups. */
public TrackGroupArray(TrackGroup... trackGroups) { public TrackGroupArray(TrackGroup... trackGroups) {
this.trackGroups = trackGroups; this.trackGroups = trackGroups;
this.length = trackGroups.length; this.length = trackGroups.length;
} }
/* package */ TrackGroupArray(Parcel in) {
length = in.readInt();
trackGroups = new TrackGroup[length];
for (int i = 0; i < length; i++) {
trackGroups[i] = in.readParcelable(TrackGroup.class.getClassLoader());
}
}
/** /**
* Returns the group at a given index. * Returns the group at a given index.
* *
...@@ -102,32 +102,38 @@ public final class TrackGroupArray implements Parcelable { ...@@ -102,32 +102,38 @@ public final class TrackGroupArray implements Parcelable {
return length == other.length && Arrays.equals(trackGroups, other.trackGroups); return length == other.length && Arrays.equals(trackGroups, other.trackGroups);
} }
// Parcelable implementation. // Bundleable implementation.
@Override @Documented
public int describeContents() { @Retention(RetentionPolicy.SOURCE)
return 0; @IntDef({
} FIELD_TRACK_GROUPS,
})
private @interface FieldNumber {}
private static final int FIELD_TRACK_GROUPS = 0;
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public Bundle toBundle() {
dest.writeInt(length); Bundle bundle = new Bundle();
for (int i = 0; i < length; i++) { bundle.putParcelableArrayList(
dest.writeParcelable(trackGroups[i], 0); keyForField(FIELD_TRACK_GROUPS),
} BundleableUtils.toBundleArrayList(Lists.newArrayList(trackGroups)));
return bundle;
} }
public static final Parcelable.Creator<TrackGroupArray> CREATOR = /** Object that can restores a TrackGroupArray from a {@link Bundle}. */
new Parcelable.Creator<TrackGroupArray>() { public static final Creator<TrackGroupArray> CREATOR =
bundle -> {
@Override List<TrackGroup> trackGroups =
public TrackGroupArray createFromParcel(Parcel in) { BundleableUtils.fromBundleNullableList(
return new TrackGroupArray(in); TrackGroup.CREATOR,
} bundle.getParcelableArrayList(keyForField(FIELD_TRACK_GROUPS)),
/* defaultValue= */ ImmutableList.of());
@Override return new TrackGroupArray(trackGroups.toArray(new TrackGroup[0]));
public TrackGroupArray[] newArray(int size) {
return new TrackGroupArray[size];
}
}; };
private static String keyForField(@FieldNumber int field) {
return Integer.toString(field, Character.MAX_RADIX);
}
} }
library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
...@@ -16,23 +16,28 @@ ...@@ -16,23 +16,28 @@
package com.google.android.exoplayer2.trackselection; package com.google.android.exoplayer2.trackselection;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.common.base.MoreObjects.firstNonNull;
import android.content.Context; import android.content.Context;
import android.graphics.Point; import android.graphics.Point;
import android.os.Bundle;
import android.os.Looper; import android.os.Looper;
import android.os.Parcel;
import android.os.Parcelable;
import android.view.accessibility.CaptioningManager; import android.view.accessibility.CaptioningManager;
import androidx.annotation.CallSuper;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import com.google.android.exoplayer2.Bundleable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.util.ArrayList; import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Locale; import java.util.Locale;
/** Constraint parameters for track selection. */ /** Constraint parameters for track selection. */
public class TrackSelectionParameters implements Parcelable { public class TrackSelectionParameters implements Bundleable {
/** /**
* A builder for {@link TrackSelectionParameters}. See the {@link TrackSelectionParameters} * A builder for {@link TrackSelectionParameters}. See the {@link TrackSelectionParameters}
...@@ -108,10 +113,7 @@ public class TrackSelectionParameters implements Parcelable { ...@@ -108,10 +113,7 @@ public class TrackSelectionParameters implements Parcelable {
setViewportSizeToPhysicalDisplaySize(context, /* viewportOrientationMayChange= */ true); setViewportSizeToPhysicalDisplaySize(context, /* viewportOrientationMayChange= */ true);
} }
/** /** Creates a builder with the initial values specified in {@code initialValues}. */
* @param initialValues The {@link TrackSelectionParameters} from which the initial values of
* the builder are obtained.
*/
protected Builder(TrackSelectionParameters initialValues) { protected Builder(TrackSelectionParameters initialValues) {
// Video // Video
maxVideoWidth = initialValues.maxVideoWidth; maxVideoWidth = initialValues.maxVideoWidth;
...@@ -141,6 +143,89 @@ public class TrackSelectionParameters implements Parcelable { ...@@ -141,6 +143,89 @@ public class TrackSelectionParameters implements Parcelable {
forceHighestSupportedBitrate = initialValues.forceHighestSupportedBitrate; forceHighestSupportedBitrate = initialValues.forceHighestSupportedBitrate;
} }
/** Creates a builder with the initial values specified in {@code bundle}. */
protected Builder(Bundle bundle) {
// Video
maxVideoWidth =
bundle.getInt(keyForField(FIELD_MAX_VIDEO_WIDTH), DEFAULT_WITHOUT_CONTEXT.maxVideoWidth);
maxVideoHeight =
bundle.getInt(
keyForField(FIELD_MAX_VIDEO_HEIGHT), DEFAULT_WITHOUT_CONTEXT.maxVideoHeight);
maxVideoFrameRate =
bundle.getInt(
keyForField(FIELD_MAX_VIDEO_FRAMERATE), DEFAULT_WITHOUT_CONTEXT.maxVideoFrameRate);
maxVideoBitrate =
bundle.getInt(
keyForField(FIELD_MAX_VIDEO_BITRATE), DEFAULT_WITHOUT_CONTEXT.maxVideoBitrate);
minVideoWidth =
bundle.getInt(keyForField(FIELD_MIN_VIDEO_WIDTH), DEFAULT_WITHOUT_CONTEXT.minVideoWidth);
minVideoHeight =
bundle.getInt(
keyForField(FIELD_MIN_VIDEO_HEIGHT), DEFAULT_WITHOUT_CONTEXT.minVideoHeight);
minVideoFrameRate =
bundle.getInt(
keyForField(FIELD_MIN_VIDEO_FRAMERATE), DEFAULT_WITHOUT_CONTEXT.minVideoFrameRate);
minVideoBitrate =
bundle.getInt(
keyForField(FIELD_MIN_VIDEO_BITRATE), DEFAULT_WITHOUT_CONTEXT.minVideoBitrate);
viewportWidth =
bundle.getInt(keyForField(FIELD_VIEWPORT_WIDTH), DEFAULT_WITHOUT_CONTEXT.viewportWidth);
viewportHeight =
bundle.getInt(keyForField(FIELD_VIEWPORT_HEIGHT), DEFAULT_WITHOUT_CONTEXT.viewportHeight);
viewportOrientationMayChange =
bundle.getBoolean(
keyForField(FIELD_VIEWPORT_ORIENTATION_MAY_CHANGE),
DEFAULT_WITHOUT_CONTEXT.viewportOrientationMayChange);
preferredVideoMimeTypes =
ImmutableList.copyOf(
firstNonNull(
bundle.getStringArray(keyForField(FIELD_PREFERRED_VIDEO_MIMETYPES)),
new String[0]));
// Audio
String[] preferredAudioLanguages1 =
firstNonNull(
bundle.getStringArray(keyForField(FIELD_PREFERRED_AUDIO_LANGUAGES)), new String[0]);
preferredAudioLanguages = normalizeLanguageCodes(preferredAudioLanguages1);
preferredAudioRoleFlags =
bundle.getInt(
keyForField(FIELD_PREFERRED_AUDIO_ROLE_FLAGS),
DEFAULT_WITHOUT_CONTEXT.preferredAudioRoleFlags);
maxAudioChannelCount =
bundle.getInt(
keyForField(FIELD_MAX_AUDIO_CHANNEL_COUNT),
DEFAULT_WITHOUT_CONTEXT.maxAudioChannelCount);
maxAudioBitrate =
bundle.getInt(
keyForField(FIELD_MAX_AUDIO_BITRATE), DEFAULT_WITHOUT_CONTEXT.maxAudioBitrate);
preferredAudioMimeTypes =
ImmutableList.copyOf(
firstNonNull(
bundle.getStringArray(keyForField(FIELD_PREFERRED_AUDIO_MIME_TYPES)),
new String[0]));
// Text
preferredTextLanguages =
normalizeLanguageCodes(
firstNonNull(
bundle.getStringArray(keyForField(FIELD_PREFERRED_TEXT_LANGUAGES)),
new String[0]));
preferredTextRoleFlags =
bundle.getInt(
keyForField(FIELD_PREFERRED_TEXT_ROLE_FLAGS),
DEFAULT_WITHOUT_CONTEXT.preferredTextRoleFlags);
selectUndeterminedTextLanguage =
bundle.getBoolean(
keyForField(FIELD_SELECT_UNDETERMINED_TEXT_LANGUAGE),
DEFAULT_WITHOUT_CONTEXT.selectUndeterminedTextLanguage);
// General
forceLowestBitrate =
bundle.getBoolean(
keyForField(FIELD_FORCE_LOWEST_BITRATE), DEFAULT_WITHOUT_CONTEXT.forceLowestBitrate);
forceHighestSupportedBitrate =
bundle.getBoolean(
keyForField(FIELD_FORCE_HIGHEST_SUPPORTED_BITRATE),
DEFAULT_WITHOUT_CONTEXT.forceHighestSupportedBitrate);
}
// Video // Video
/** /**
...@@ -322,11 +407,7 @@ public class TrackSelectionParameters implements Parcelable { ...@@ -322,11 +407,7 @@ public class TrackSelectionParameters implements Parcelable {
* @return This builder. * @return This builder.
*/ */
public Builder setPreferredAudioLanguages(String... preferredAudioLanguages) { public Builder setPreferredAudioLanguages(String... preferredAudioLanguages) {
ImmutableList.Builder<String> listBuilder = ImmutableList.builder(); this.preferredAudioLanguages = normalizeLanguageCodes(preferredAudioLanguages);
for (String language : checkNotNull(preferredAudioLanguages)) {
listBuilder.add(Util.normalizeLanguageCode(checkNotNull(language)));
}
this.preferredAudioLanguages = listBuilder.build();
return this; return this;
} }
...@@ -427,11 +508,7 @@ public class TrackSelectionParameters implements Parcelable { ...@@ -427,11 +508,7 @@ public class TrackSelectionParameters implements Parcelable {
* @return This builder. * @return This builder.
*/ */
public Builder setPreferredTextLanguages(String... preferredTextLanguages) { public Builder setPreferredTextLanguages(String... preferredTextLanguages) {
ImmutableList.Builder<String> listBuilder = ImmutableList.builder(); this.preferredTextLanguages = normalizeLanguageCodes(preferredTextLanguages);
for (String language : checkNotNull(preferredTextLanguages)) {
listBuilder.add(Util.normalizeLanguageCode(checkNotNull(language)));
}
this.preferredTextLanguages = listBuilder.build();
return this; return this;
} }
...@@ -512,6 +589,14 @@ public class TrackSelectionParameters implements Parcelable { ...@@ -512,6 +589,14 @@ public class TrackSelectionParameters implements Parcelable {
preferredTextLanguages = ImmutableList.of(Util.getLocaleLanguageTag(preferredLocale)); preferredTextLanguages = ImmutableList.of(Util.getLocaleLanguageTag(preferredLocale));
} }
} }
private static ImmutableList<String> normalizeLanguageCodes(String[] preferredTextLanguages) {
ImmutableList.Builder<String> listBuilder = ImmutableList.builder();
for (String language : checkNotNull(preferredTextLanguages)) {
listBuilder.add(Util.normalizeLanguageCode(checkNotNull(language)));
}
return listBuilder.build();
}
} }
/** /**
...@@ -537,20 +622,6 @@ public class TrackSelectionParameters implements Parcelable { ...@@ -537,20 +622,6 @@ public class TrackSelectionParameters implements Parcelable {
*/ */
@Deprecated public static final TrackSelectionParameters DEFAULT = DEFAULT_WITHOUT_CONTEXT; @Deprecated public static final TrackSelectionParameters DEFAULT = DEFAULT_WITHOUT_CONTEXT;
public static final Creator<TrackSelectionParameters> CREATOR =
new Creator<TrackSelectionParameters>() {
@Override
public TrackSelectionParameters createFromParcel(Parcel in) {
return new TrackSelectionParameters(in);
}
@Override
public TrackSelectionParameters[] newArray(int size) {
return new TrackSelectionParameters[size];
}
};
/** Returns an instance configured with default values. */ /** Returns an instance configured with default values. */
public static TrackSelectionParameters getDefaults(Context context) { public static TrackSelectionParameters getDefaults(Context context) {
return new Builder(context).build(); return new Builder(context).build();
...@@ -707,42 +778,6 @@ public class TrackSelectionParameters implements Parcelable { ...@@ -707,42 +778,6 @@ public class TrackSelectionParameters implements Parcelable {
this.forceHighestSupportedBitrate = builder.forceHighestSupportedBitrate; this.forceHighestSupportedBitrate = builder.forceHighestSupportedBitrate;
} }
/* package */ TrackSelectionParameters(Parcel in) {
ArrayList<String> preferredAudioLanguages = new ArrayList<>();
in.readList(preferredAudioLanguages, /* loader= */ null);
this.preferredAudioLanguages = ImmutableList.copyOf(preferredAudioLanguages);
this.preferredAudioRoleFlags = in.readInt();
ArrayList<String> preferredTextLanguages1 = new ArrayList<>();
in.readList(preferredTextLanguages1, /* loader= */ null);
this.preferredTextLanguages = ImmutableList.copyOf(preferredTextLanguages1);
this.preferredTextRoleFlags = in.readInt();
this.selectUndeterminedTextLanguage = Util.readBoolean(in);
// Video
this.maxVideoWidth = in.readInt();
this.maxVideoHeight = in.readInt();
this.maxVideoFrameRate = in.readInt();
this.maxVideoBitrate = in.readInt();
this.minVideoWidth = in.readInt();
this.minVideoHeight = in.readInt();
this.minVideoFrameRate = in.readInt();
this.minVideoBitrate = in.readInt();
this.viewportWidth = in.readInt();
this.viewportHeight = in.readInt();
this.viewportOrientationMayChange = Util.readBoolean(in);
ArrayList<String> preferredVideoMimeTypes = new ArrayList<>();
in.readList(preferredVideoMimeTypes, /* loader= */ null);
this.preferredVideoMimeTypes = ImmutableList.copyOf(preferredVideoMimeTypes);
// Audio
this.maxAudioChannelCount = in.readInt();
this.maxAudioBitrate = in.readInt();
ArrayList<String> preferredAudioMimeTypes = new ArrayList<>();
in.readList(preferredAudioMimeTypes, /* loader= */ null);
this.preferredAudioMimeTypes = ImmutableList.copyOf(preferredAudioMimeTypes);
// General
this.forceLowestBitrate = Util.readBoolean(in);
this.forceHighestSupportedBitrate = Util.readBoolean(in);
}
/** Creates a new {@link Builder}, copying the initial values from this instance. */ /** Creates a new {@link Builder}, copying the initial values from this instance. */
public Builder buildUpon() { public Builder buildUpon() {
return new Builder(this); return new Builder(this);
...@@ -817,39 +852,109 @@ public class TrackSelectionParameters implements Parcelable { ...@@ -817,39 +852,109 @@ public class TrackSelectionParameters implements Parcelable {
return result; return result;
} }
// Parcelable implementation. // Bundleable implementation
@Documented
@Retention(RetentionPolicy.SOURCE)
@IntDef({
FIELD_PREFERRED_AUDIO_LANGUAGES,
FIELD_PREFERRED_AUDIO_ROLE_FLAGS,
FIELD_PREFERRED_TEXT_LANGUAGES,
FIELD_PREFERRED_TEXT_ROLE_FLAGS,
FIELD_SELECT_UNDETERMINED_TEXT_LANGUAGE,
FIELD_MAX_VIDEO_WIDTH,
FIELD_MAX_VIDEO_HEIGHT,
FIELD_MAX_VIDEO_FRAMERATE,
FIELD_MAX_VIDEO_BITRATE,
FIELD_MIN_VIDEO_WIDTH,
FIELD_MIN_VIDEO_HEIGHT,
FIELD_MIN_VIDEO_FRAMERATE,
FIELD_MIN_VIDEO_BITRATE,
FIELD_VIEWPORT_WIDTH,
FIELD_VIEWPORT_HEIGHT,
FIELD_VIEWPORT_ORIENTATION_MAY_CHANGE,
FIELD_PREFERRED_VIDEO_MIMETYPES,
FIELD_MAX_AUDIO_CHANNEL_COUNT,
FIELD_MAX_AUDIO_BITRATE,
FIELD_PREFERRED_AUDIO_MIME_TYPES,
FIELD_FORCE_LOWEST_BITRATE,
FIELD_FORCE_HIGHEST_SUPPORTED_BITRATE,
})
private @interface FieldNumber {}
private static final int FIELD_PREFERRED_AUDIO_LANGUAGES = 1;
private static final int FIELD_PREFERRED_AUDIO_ROLE_FLAGS = 2;
private static final int FIELD_PREFERRED_TEXT_LANGUAGES = 3;
private static final int FIELD_PREFERRED_TEXT_ROLE_FLAGS = 4;
private static final int FIELD_SELECT_UNDETERMINED_TEXT_LANGUAGE = 5;
private static final int FIELD_MAX_VIDEO_WIDTH = 6;
private static final int FIELD_MAX_VIDEO_HEIGHT = 7;
private static final int FIELD_MAX_VIDEO_FRAMERATE = 8;
private static final int FIELD_MAX_VIDEO_BITRATE = 9;
private static final int FIELD_MIN_VIDEO_WIDTH = 10;
private static final int FIELD_MIN_VIDEO_HEIGHT = 11;
private static final int FIELD_MIN_VIDEO_FRAMERATE = 12;
private static final int FIELD_MIN_VIDEO_BITRATE = 13;
private static final int FIELD_VIEWPORT_WIDTH = 14;
private static final int FIELD_VIEWPORT_HEIGHT = 15;
private static final int FIELD_VIEWPORT_ORIENTATION_MAY_CHANGE = 16;
private static final int FIELD_PREFERRED_VIDEO_MIMETYPES = 17;
private static final int FIELD_MAX_AUDIO_CHANNEL_COUNT = 18;
private static final int FIELD_MAX_AUDIO_BITRATE = 19;
private static final int FIELD_PREFERRED_AUDIO_MIME_TYPES = 20;
private static final int FIELD_FORCE_LOWEST_BITRATE = 21;
private static final int FIELD_FORCE_HIGHEST_SUPPORTED_BITRATE = 22;
@Override @Override
public int describeContents() { @CallSuper
return 0; public Bundle toBundle() {
} Bundle bundle = new Bundle();
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeList(preferredAudioLanguages);
dest.writeInt(preferredAudioRoleFlags);
dest.writeList(preferredTextLanguages);
dest.writeInt(preferredTextRoleFlags);
Util.writeBoolean(dest, selectUndeterminedTextLanguage);
// Video // Video
dest.writeInt(maxVideoWidth); bundle.putInt(keyForField(FIELD_MAX_VIDEO_WIDTH), maxVideoWidth);
dest.writeInt(maxVideoHeight); bundle.putInt(keyForField(FIELD_MAX_VIDEO_HEIGHT), maxVideoHeight);
dest.writeInt(maxVideoFrameRate); bundle.putInt(keyForField(FIELD_MAX_VIDEO_FRAMERATE), maxVideoFrameRate);
dest.writeInt(maxVideoBitrate); bundle.putInt(keyForField(FIELD_MAX_VIDEO_BITRATE), maxVideoBitrate);
dest.writeInt(minVideoWidth); bundle.putInt(keyForField(FIELD_MIN_VIDEO_WIDTH), minVideoWidth);
dest.writeInt(minVideoHeight); bundle.putInt(keyForField(FIELD_MIN_VIDEO_HEIGHT), minVideoHeight);
dest.writeInt(minVideoFrameRate); bundle.putInt(keyForField(FIELD_MIN_VIDEO_FRAMERATE), minVideoFrameRate);
dest.writeInt(minVideoBitrate); bundle.putInt(keyForField(FIELD_MIN_VIDEO_BITRATE), minVideoBitrate);
dest.writeInt(viewportWidth); bundle.putInt(keyForField(FIELD_VIEWPORT_WIDTH), viewportWidth);
dest.writeInt(viewportHeight); bundle.putInt(keyForField(FIELD_VIEWPORT_HEIGHT), viewportHeight);
Util.writeBoolean(dest, viewportOrientationMayChange); bundle.putBoolean(
dest.writeList(preferredVideoMimeTypes); keyForField(FIELD_VIEWPORT_ORIENTATION_MAY_CHANGE), viewportOrientationMayChange);
bundle.putStringArray(
keyForField(FIELD_PREFERRED_VIDEO_MIMETYPES),
preferredVideoMimeTypes.toArray(new String[0]));
// Audio // Audio
dest.writeInt(maxAudioChannelCount); bundle.putStringArray(
dest.writeInt(maxAudioBitrate); keyForField(FIELD_PREFERRED_AUDIO_LANGUAGES),
dest.writeList(preferredAudioMimeTypes); preferredAudioLanguages.toArray(new String[0]));
bundle.putInt(keyForField(FIELD_PREFERRED_AUDIO_ROLE_FLAGS), preferredAudioRoleFlags);
bundle.putInt(keyForField(FIELD_MAX_AUDIO_CHANNEL_COUNT), maxAudioChannelCount);
bundle.putInt(keyForField(FIELD_MAX_AUDIO_BITRATE), maxAudioBitrate);
bundle.putStringArray(
keyForField(FIELD_PREFERRED_AUDIO_MIME_TYPES),
preferredAudioMimeTypes.toArray(new String[0]));
// Text
bundle.putStringArray(
keyForField(FIELD_PREFERRED_TEXT_LANGUAGES), preferredTextLanguages.toArray(new String[0]));
bundle.putInt(keyForField(FIELD_PREFERRED_TEXT_ROLE_FLAGS), preferredTextRoleFlags);
bundle.putBoolean(
keyForField(FIELD_SELECT_UNDETERMINED_TEXT_LANGUAGE), selectUndeterminedTextLanguage);
// General // General
Util.writeBoolean(dest, forceLowestBitrate); bundle.putBoolean(keyForField(FIELD_FORCE_LOWEST_BITRATE), forceLowestBitrate);
Util.writeBoolean(dest, forceHighestSupportedBitrate); bundle.putBoolean(
keyForField(FIELD_FORCE_HIGHEST_SUPPORTED_BITRATE), forceHighestSupportedBitrate);
return bundle;
}
/** Object that can restore {@code TrackSelectionParameters} from a {@link Bundle}. */
public static final Creator<TrackSelectionParameters> CREATOR =
bundle -> new Builder(bundle).build();
private static String keyForField(@FieldNumber int field) {
return Integer.toString(field, Character.MAX_RADIX);
} }
} }
library/common/src/main/java/com/google/android/exoplayer2/util/BundleableUtils.java
...@@ -15,7 +15,11 @@ ...@@ -15,7 +15,11 @@
*/ */
package com.google.android.exoplayer2.util; package com.google.android.exoplayer2.util;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Util.castNonNull;
import android.os.Bundle; import android.os.Bundle;
import android.util.SparseArray;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Bundleable; import com.google.android.exoplayer2.Bundleable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
...@@ -68,7 +72,7 @@ public final class BundleableUtils { ...@@ -68,7 +72,7 @@ public final class BundleableUtils {
Bundleable.Creator<T> creator, List<Bundle> bundleList) { Bundleable.Creator<T> creator, List<Bundle> bundleList) {
ImmutableList.Builder<T> builder = ImmutableList.builder(); ImmutableList.Builder<T> builder = ImmutableList.builder();
for (int i = 0; i < bundleList.size(); i++) { for (int i = 0; i < bundleList.size(); i++) {
Bundle bundle = bundleList.get(i); Bundle bundle = checkNotNull(bundleList.get(i)); // Fail fast during parsing.
T bundleable = creator.fromBundle(bundle); T bundleable = creator.fromBundle(bundle);
builder.add(bundleable); builder.add(bundleable);
} }
...@@ -76,6 +80,34 @@ public final class BundleableUtils { ...@@ -76,6 +80,34 @@ public final class BundleableUtils {
} }
/** /**
* Converts a list of {@link Bundle} to a list of {@link Bundleable}. Returns {@code defaultValue}
* if {@code bundleList} is null.
*/
public static <T extends Bundleable> List<T> fromBundleNullableList(
Bundleable.Creator<T> creator, @Nullable List<Bundle> bundleList, List<T> defaultValue) {
return (bundleList == null) ? defaultValue : fromBundleList(creator, bundleList);
}
/**
* Converts a {@link SparseArray} of {@link Bundle} to a {@link SparseArray} of {@link
* Bundleable}. Returns {@code defaultValue} if {@code bundleSparseArray} is null.
*/
public static <T extends Bundleable> SparseArray<T> fromBundleNullableSparseArray(
Bundleable.Creator<T> creator,
@Nullable SparseArray<Bundle> bundleSparseArray,
SparseArray<T> defaultValue) {
if (bundleSparseArray == null) {
return defaultValue;
}
// Can't use ImmutableList as it doesn't support null elements.
SparseArray<T> result = new SparseArray<>(bundleSparseArray.size());
for (int i = 0; i < bundleSparseArray.size(); i++) {
result.put(bundleSparseArray.keyAt(i), creator.fromBundle(bundleSparseArray.valueAt(i)));
}
return result;
}
/**
* Converts a list of {@link Bundleable} to an {@link ArrayList} of {@link Bundle} so that the * Converts a list of {@link Bundleable} to an {@link ArrayList} of {@link Bundle} so that the
* returned list can be put to {@link Bundle} using {@link Bundle#putParcelableArrayList} * returned list can be put to {@link Bundle} using {@link Bundle#putParcelableArrayList}
* conveniently. * conveniently.
...@@ -88,5 +120,31 @@ public final class BundleableUtils { ...@@ -88,5 +120,31 @@ public final class BundleableUtils {
return arrayList; return arrayList;
} }
/**
* Converts a {@link SparseArray} of {@link Bundleable} to an {@link SparseArray} of {@link
* Bundle} so that the returned {@link SparseArray} can be put to {@link Bundle} using {@link
* Bundle#putSparseParcelableArray} conveniently.
*/
public static <T extends Bundleable> SparseArray<Bundle> toBundleSparseArray(
SparseArray<T> bundleableSparseArray) {
SparseArray<Bundle> sparseArray = new SparseArray<>(bundleableSparseArray.size());
for (int i = 0; i < bundleableSparseArray.size(); i++) {
sparseArray.put(bundleableSparseArray.keyAt(i), bundleableSparseArray.valueAt(i).toBundle());
}
return sparseArray;
}
/**
* Set the application class loader to the given {@link Bundle} if no class loader is present.
*
* <p>This assumes that all classes unparceled from {@code bundle} are sharing the class loader of
* {@code BundleableUtils}.
*/
public static void ensureClassLoader(@Nullable Bundle bundle) {
if (bundle != null) {
bundle.setClassLoader(castNonNull(BundleableUtils.class.getClassLoader()));
}
}
private BundleableUtils() {} private BundleableUtils() {}
} }
library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
...@@ -15,17 +15,20 @@ ...@@ -15,17 +15,20 @@
*/ */
package com.google.android.exoplayer2.video; package com.google.android.exoplayer2.video;
import android.os.Parcel; import android.os.Bundle;
import android.os.Parcelable; import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Bundleable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Util; import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Arrays; import java.util.Arrays;
import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.dataflow.qual.Pure;
/** Stores color info. */ /** Stores color info. */
public final class ColorInfo implements Parcelable { public final class ColorInfo implements Bundleable {
/** /**
* Returns the {@link C.ColorSpace} corresponding to the given ISO color primary code, as per * Returns the {@link C.ColorSpace} corresponding to the given ISO color primary code, as per
...@@ -116,16 +119,6 @@ public final class ColorInfo implements Parcelable { ...@@ -116,16 +119,6 @@ public final class ColorInfo implements Parcelable {
this.hdrStaticInfo = hdrStaticInfo; this.hdrStaticInfo = hdrStaticInfo;
} }
@SuppressWarnings("ResourceType")
/* package */ ColorInfo(Parcel in) {
colorSpace = in.readInt();
colorRange = in.readInt();
colorTransfer = in.readInt();
boolean hasHdrStaticInfo = Util.readBoolean(in);
hdrStaticInfo = hasHdrStaticInfo ? in.createByteArray() : null;
}
// Parcelable implementation.
@Override @Override
public boolean equals(@Nullable Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
...@@ -167,32 +160,42 @@ public final class ColorInfo implements Parcelable { ...@@ -167,32 +160,42 @@ public final class ColorInfo implements Parcelable {
return hashCode; return hashCode;
} }
@Override // Bundleable implementation
public int describeContents() {
return 0; @Documented
} @Retention(RetentionPolicy.SOURCE)
@IntDef({
FIELD_COLOR_SPACE,
FIELD_COLOR_RANGE,
FIELD_COLOR_TRANSFER,
FIELD_HDR_STATIC_INFO,
})
private @interface FieldNumber {}
private static final int FIELD_COLOR_SPACE = 0;
private static final int FIELD_COLOR_RANGE = 1;
private static final int FIELD_COLOR_TRANSFER = 2;
private static final int FIELD_HDR_STATIC_INFO = 3;
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public Bundle toBundle() {
dest.writeInt(colorSpace); Bundle bundle = new Bundle();
dest.writeInt(colorRange); bundle.putInt(keyForField(FIELD_COLOR_SPACE), colorSpace);
dest.writeInt(colorTransfer); bundle.putInt(keyForField(FIELD_COLOR_RANGE), colorRange);
Util.writeBoolean(dest, hdrStaticInfo != null); bundle.putInt(keyForField(FIELD_COLOR_TRANSFER), colorTransfer);
if (hdrStaticInfo != null) { bundle.putByteArray(keyForField(FIELD_HDR_STATIC_INFO), hdrStaticInfo);
dest.writeByteArray(hdrStaticInfo); return bundle;
}
} }
public static final Parcelable.Creator<ColorInfo> CREATOR = public static final Creator<ColorInfo> CREATOR =
new Parcelable.Creator<ColorInfo>() { bundle ->
@Override new ColorInfo(
public ColorInfo createFromParcel(Parcel in) { bundle.getInt(keyForField(FIELD_COLOR_SPACE), Format.NO_VALUE),
return new ColorInfo(in); bundle.getInt(keyForField(FIELD_COLOR_RANGE), Format.NO_VALUE),
} bundle.getInt(keyForField(FIELD_COLOR_TRANSFER), Format.NO_VALUE),
bundle.getByteArray(keyForField(FIELD_HDR_STATIC_INFO)));
@Override
public ColorInfo[] newArray(int size) { private static String keyForField(@FieldNumber int field) {
return new ColorInfo[size]; return Integer.toString(field, Character.MAX_RADIX);
} }
};
} }
library/common/src/test/java/com/google/android/exoplayer2/FormatTest.java
...@@ -20,7 +20,6 @@ import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4; ...@@ -20,7 +20,6 @@ import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_WEBM; import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_WEBM;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.drm.ExoMediaCrypto; import com.google.android.exoplayer2.drm.ExoMediaCrypto;
...@@ -46,21 +45,15 @@ public final class FormatTest { ...@@ -46,21 +45,15 @@ public final class FormatTest {
} }
@Test @Test
public void parcelFormat_createsEqualFormat_exceptExoMediaCryptoType() { public void roundTripViaBundle_ofParameters_yieldsEqualInstanceExceptExoMediaCryptoType() {
Format formatToParcel = createTestFormat(); Format formatToBundle = createTestFormat();
Parcel parcel = Parcel.obtain(); Format formatFromBundle = Format.CREATOR.fromBundle(formatToBundle.toBundle());
formatToParcel.writeToParcel(parcel, 0);
parcel.setDataPosition(0);
Format formatFromParcel = Format.CREATOR.createFromParcel(parcel); assertThat(formatFromBundle.exoMediaCryptoType).isEqualTo(UnsupportedMediaCrypto.class);
Format expectedFormat = assertThat(formatFromBundle)
formatToParcel.buildUpon().setExoMediaCryptoType(UnsupportedMediaCrypto.class).build(); .isEqualTo(
formatToBundle.buildUpon().setExoMediaCryptoType(UnsupportedMediaCrypto.class).build());
assertThat(formatFromParcel.exoMediaCryptoType).isEqualTo(UnsupportedMediaCrypto.class);
assertThat(formatFromParcel).isEqualTo(expectedFormat);
parcel.recycle();
} }
private static Format createTestFormat() { private static Format createTestFormat() {
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
...@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.C.FormatSupport; ...@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.C.FormatSupport;
import com.google.android.exoplayer2.source.MediaPeriodId; import com.google.android.exoplayer2.source.MediaPeriodId;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.BundleableUtils;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
...@@ -234,7 +235,9 @@ public final class ExoPlaybackException extends PlaybackException { ...@@ -234,7 +235,9 @@ public final class ExoPlaybackException extends PlaybackException {
rendererName = bundle.getString(keyForField(FIELD_RENDERER_NAME)); rendererName = bundle.getString(keyForField(FIELD_RENDERER_NAME));
rendererIndex = rendererIndex =
bundle.getInt(keyForField(FIELD_RENDERER_INDEX), /* defaultValue= */ C.INDEX_UNSET); bundle.getInt(keyForField(FIELD_RENDERER_INDEX), /* defaultValue= */ C.INDEX_UNSET);
rendererFormat = bundle.getParcelable(keyForField(FIELD_RENDERER_FORMAT)); rendererFormat =
BundleableUtils.fromNullableBundle(
Format.CREATOR, bundle.getBundle(keyForField(FIELD_RENDERER_FORMAT)));
rendererFormatSupport = rendererFormatSupport =
bundle.getInt( bundle.getInt(
keyForField(FIELD_RENDERER_FORMAT_SUPPORT), /* defaultValue= */ C.FORMAT_HANDLED); keyForField(FIELD_RENDERER_FORMAT_SUPPORT), /* defaultValue= */ C.FORMAT_HANDLED);
...@@ -396,7 +399,8 @@ public final class ExoPlaybackException extends PlaybackException { ...@@ -396,7 +399,8 @@ public final class ExoPlaybackException extends PlaybackException {
bundle.putInt(keyForField(FIELD_TYPE), type); bundle.putInt(keyForField(FIELD_TYPE), type);
bundle.putString(keyForField(FIELD_RENDERER_NAME), rendererName); bundle.putString(keyForField(FIELD_RENDERER_NAME), rendererName);
bundle.putInt(keyForField(FIELD_RENDERER_INDEX), rendererIndex); bundle.putInt(keyForField(FIELD_RENDERER_INDEX), rendererIndex);
bundle.putParcelable(keyForField(FIELD_RENDERER_FORMAT), rendererFormat); bundle.putBundle(
keyForField(FIELD_RENDERER_FORMAT), BundleableUtils.toNullableBundle(rendererFormat));
bundle.putInt(keyForField(FIELD_RENDERER_FORMAT_SUPPORT), rendererFormatSupport); bundle.putInt(keyForField(FIELD_RENDERER_FORMAT_SUPPORT), rendererFormatSupport);
bundle.putBoolean(keyForField(FIELD_IS_RECOVERABLE), isRecoverable); bundle.putBoolean(keyForField(FIELD_IS_RECOVERABLE), isRecoverable);
return bundle; return bundle;
......
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
...@@ -17,13 +17,14 @@ package com.google.android.exoplayer2.trackselection; ...@@ -17,13 +17,14 @@ package com.google.android.exoplayer2.trackselection;
import android.content.Context; import android.content.Context;
import android.graphics.Point; import android.graphics.Point;
import android.os.Parcel; import android.os.Bundle;
import android.os.Parcelable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Pair; import android.util.Pair;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Bundleable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.C.FormatSupport; import com.google.android.exoplayer2.C.FormatSupport;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
...@@ -39,11 +40,15 @@ import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId; ...@@ -39,11 +40,15 @@ import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.BundleableUtils;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.common.collect.ComparisonChain; import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Ordering; import com.google.common.collect.Ordering;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
...@@ -239,6 +244,66 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -239,6 +244,66 @@ public class DefaultTrackSelector extends MappingTrackSelector {
rendererDisabledFlags = initialValues.rendererDisabledFlags.clone(); rendererDisabledFlags = initialValues.rendererDisabledFlags.clone();
} }
@SuppressWarnings("method.invocation") // Only setter are invoked.
private ParametersBuilder(Bundle bundle) {
super(bundle);
Parameters defaultValue = Parameters.DEFAULT_WITHOUT_CONTEXT;
// Video
setExceedVideoConstraintsIfNecessary(
bundle.getBoolean(
Parameters.keyForField(Parameters.FIELD_EXCEED_VIDEO_CONSTRAINTS_IF_NECESSARY),
defaultValue.exceedVideoConstraintsIfNecessary));
setAllowVideoMixedMimeTypeAdaptiveness(
bundle.getBoolean(
Parameters.keyForField(Parameters.FIELD_ALLOW_VIDEO_MIXED_MIME_TYPE_ADAPTIVENESS),
defaultValue.allowVideoMixedMimeTypeAdaptiveness));
setAllowVideoNonSeamlessAdaptiveness(
bundle.getBoolean(
Parameters.keyForField(Parameters.FIELD_ALLOW_VIDEO_NON_SEAMLESS_ADAPTIVENESS),
defaultValue.allowVideoNonSeamlessAdaptiveness));
// Audio
setExceedAudioConstraintsIfNecessary(
bundle.getBoolean(
Parameters.keyForField(Parameters.FIELD_EXCEED_AUDIO_CONSTRAINTS_IF_NCESSARY),
defaultValue.exceedAudioConstraintsIfNecessary));
setAllowAudioMixedMimeTypeAdaptiveness(
bundle.getBoolean(
Parameters.keyForField(Parameters.FIELD_ALLOW_AUDIO_MIXED_MIME_TYPE_ADAPTIVENESS),
defaultValue.allowAudioMixedMimeTypeAdaptiveness));
setAllowAudioMixedSampleRateAdaptiveness(
bundle.getBoolean(
Parameters.keyForField(Parameters.FIELD_ALLOW_AUDIO_MIXED_SAMPLE_RATE_ADAPTIVENESS),
defaultValue.allowAudioMixedSampleRateAdaptiveness));
setAllowAudioMixedChannelCountAdaptiveness(
bundle.getBoolean(
Parameters.keyForField(Parameters.FIELD_ALLOW_AUDIO_MIXED_CHANNEL_COUNT_ADAPTIVENESS),
defaultValue.allowAudioMixedChannelCountAdaptiveness));
// Text
setDisabledTextTrackSelectionFlags(
bundle.getInt(
Parameters.keyForField(Parameters.FIELD_DISABLED_TEXT_TRACK_SELECTION_FLAGS),
defaultValue.disabledTextTrackSelectionFlags));
// General
setExceedRendererCapabilitiesIfNecessary(
bundle.getBoolean(
Parameters.keyForField(Parameters.FIELD_EXCEED_RENDERER_CAPABILITIES_IF_NECESSARY),
defaultValue.exceedRendererCapabilitiesIfNecessary));
setTunnelingEnabled(
bundle.getBoolean(
Parameters.keyForField(Parameters.FIELD_TUNNELING_ENABLED),
defaultValue.tunnelingEnabled));
setAllowMultipleAdaptiveSelections(
bundle.getBoolean(
Parameters.keyForField(Parameters.FIELD_ALLOW_MULTIPLE_ADAPTIVE_SELECTIONS),
defaultValue.allowMultipleAdaptiveSelections));
selectionOverrides = new SparseArray<>();
setSelectionOverridesFromBundle(bundle);
rendererDisabledFlags = new SparseBooleanArray();
setRendererDisableFlagsFromBundle(bundle);
}
// Video // Video
@Override @Override
...@@ -724,12 +789,52 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -724,12 +789,52 @@ public class DefaultTrackSelector extends MappingTrackSelector {
} }
return clone; return clone;
} }
private void setSelectionOverridesFromBundle(Bundle bundle) {
@Nullable
int[] rendererIndexes =
bundle.getIntArray(
Parameters.keyForField(Parameters.FIELD_SELECTION_OVERRIDES_RENDERER_INDEXES));
List<TrackGroupArray> trackGroupArrays =
BundleableUtils.fromBundleNullableList(
TrackGroupArray.CREATOR,
bundle.getParcelableArrayList(
Parameters.keyForField(Parameters.FIELD_SELECTION_OVERRIDES_TRACK_GROUP_ARRAYS)),
/* defaultValue= */ ImmutableList.of());
SparseArray<SelectionOverride> selectionOverrides =
BundleableUtils.fromBundleNullableSparseArray(
SelectionOverride.CREATOR,
bundle.getSparseParcelableArray(
Parameters.keyForField(Parameters.FIELD_SELECTION_OVERRIDES)),
/* defaultValue= */ new SparseArray<>());
if (rendererIndexes == null || rendererIndexes.length != trackGroupArrays.size()) {
return; // Incorrect format, ignore all overrides.
}
for (int i = 0; i < rendererIndexes.length; i++) {
int rendererIndex = rendererIndexes[i];
TrackGroupArray groups = trackGroupArrays.get(i);
@Nullable SelectionOverride selectionOverride = selectionOverrides.get(i);
setSelectionOverride(rendererIndex, groups, selectionOverride);
}
}
private void setRendererDisableFlagsFromBundle(Bundle bundle) {
int[] rendererIndexes =
bundle.getIntArray(Parameters.keyForField(Parameters.FIELD_RENDERER_DISABLED_INDEXES));
if (rendererIndexes == null) {
return;
}
for (int rendererIndex : rendererIndexes) {
setRendererDisabled(rendererIndex, true);
}
}
} }
/** /**
* Extends {@link Parameters} by adding fields that are specific to {@link DefaultTrackSelector}. * Extends {@link Parameters} by adding fields that are specific to {@link DefaultTrackSelector}.
*/ */
public static final class Parameters extends TrackSelectionParameters implements Parcelable { public static final class Parameters extends TrackSelectionParameters implements Bundleable {
/** /**
* An instance with default values, except those obtained from the {@link Context}. * An instance with default values, except those obtained from the {@link Context}.
...@@ -755,19 +860,6 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -755,19 +860,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
*/ */
@Deprecated public static final Parameters DEFAULT = DEFAULT_WITHOUT_CONTEXT; @Deprecated public static final Parameters DEFAULT = DEFAULT_WITHOUT_CONTEXT;
public static final Creator<Parameters> CREATOR =
new Creator<Parameters>() {
@Override
public Parameters createFromParcel(Parcel in) {
return new Parameters(in);
}
@Override
public Parameters[] newArray(int size) {
return new Parameters[size];
}
};
/** /**
* Bitmask of selection flags that are disabled for text track selections. See {@link * Bitmask of selection flags that are disabled for text track selections. See {@link
* C.SelectionFlags}. The default value is {@code 0} (i.e. no flags). * C.SelectionFlags}. The default value is {@code 0} (i.e. no flags).
...@@ -868,28 +960,6 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -868,28 +960,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
rendererDisabledFlags = builder.rendererDisabledFlags; rendererDisabledFlags = builder.rendererDisabledFlags;
} }
/* package */ Parameters(Parcel in) {
super(in);
// Video
this.exceedVideoConstraintsIfNecessary = Util.readBoolean(in);
this.allowVideoMixedMimeTypeAdaptiveness = Util.readBoolean(in);
this.allowVideoNonSeamlessAdaptiveness = Util.readBoolean(in);
// Audio
this.exceedAudioConstraintsIfNecessary = Util.readBoolean(in);
this.allowAudioMixedMimeTypeAdaptiveness = Util.readBoolean(in);
this.allowAudioMixedSampleRateAdaptiveness = Util.readBoolean(in);
this.allowAudioMixedChannelCountAdaptiveness = Util.readBoolean(in);
// Text
this.disabledTextTrackSelectionFlags = in.readInt();
// General
this.exceedRendererCapabilitiesIfNecessary = Util.readBoolean(in);
this.tunnelingEnabled = Util.readBoolean(in);
this.allowMultipleAdaptiveSelections = Util.readBoolean(in);
// Overrides
this.selectionOverrides = readSelectionOverrides(in);
this.rendererDisabledFlags = Util.castNonNull(in.readSparseBooleanArray());
}
/** /**
* Returns whether the renderer is disabled. * Returns whether the renderer is disabled.
* *
...@@ -928,6 +998,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -928,6 +998,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
} }
/** Creates a new {@link ParametersBuilder}, copying the initial values from this instance. */ /** Creates a new {@link ParametersBuilder}, copying the initial values from this instance. */
@Override
public ParametersBuilder buildUpon() { public ParametersBuilder buildUpon() {
return new ParametersBuilder(this); return new ParametersBuilder(this);
} }
...@@ -987,80 +1058,141 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -987,80 +1058,141 @@ public class DefaultTrackSelector extends MappingTrackSelector {
return result; return result;
} }
// Parcelable implementation. // Bundleable implementation.
@Documented
@Retention(RetentionPolicy.SOURCE)
@IntDef({
FIELD_EXCEED_VIDEO_CONSTRAINTS_IF_NECESSARY,
FIELD_ALLOW_VIDEO_MIXED_MIME_TYPE_ADAPTIVENESS,
FIELD_ALLOW_VIDEO_NON_SEAMLESS_ADAPTIVENESS,
FIELD_EXCEED_AUDIO_CONSTRAINTS_IF_NCESSARY,
FIELD_ALLOW_AUDIO_MIXED_MIME_TYPE_ADAPTIVENESS,
FIELD_ALLOW_AUDIO_MIXED_SAMPLE_RATE_ADAPTIVENESS,
FIELD_ALLOW_AUDIO_MIXED_CHANNEL_COUNT_ADAPTIVENESS,
FIELD_DISABLED_TEXT_TRACK_SELECTION_FLAGS,
FIELD_EXCEED_RENDERER_CAPABILITIES_IF_NECESSARY,
FIELD_TUNNELING_ENABLED,
FIELD_ALLOW_MULTIPLE_ADAPTIVE_SELECTIONS,
FIELD_SELECTION_OVERRIDES_RENDERER_INDEXES,
FIELD_SELECTION_OVERRIDES_TRACK_GROUP_ARRAYS,
FIELD_SELECTION_OVERRIDES,
FIELD_RENDERER_DISABLED_INDEXES,
})
private @interface FieldNumber {}
// Start at 1000 to avoid conflict with the base class fields.
private static final int FIELD_EXCEED_VIDEO_CONSTRAINTS_IF_NECESSARY = 1000;
private static final int FIELD_ALLOW_VIDEO_MIXED_MIME_TYPE_ADAPTIVENESS = 1001;
private static final int FIELD_ALLOW_VIDEO_NON_SEAMLESS_ADAPTIVENESS = 1002;
private static final int FIELD_EXCEED_AUDIO_CONSTRAINTS_IF_NCESSARY = 1003;
private static final int FIELD_ALLOW_AUDIO_MIXED_MIME_TYPE_ADAPTIVENESS = 1004;
private static final int FIELD_ALLOW_AUDIO_MIXED_SAMPLE_RATE_ADAPTIVENESS = 1005;
private static final int FIELD_ALLOW_AUDIO_MIXED_CHANNEL_COUNT_ADAPTIVENESS = 1006;
private static final int FIELD_DISABLED_TEXT_TRACK_SELECTION_FLAGS = 1007;
private static final int FIELD_EXCEED_RENDERER_CAPABILITIES_IF_NECESSARY = 1008;
private static final int FIELD_TUNNELING_ENABLED = 1009;
private static final int FIELD_ALLOW_MULTIPLE_ADAPTIVE_SELECTIONS = 1010;
private static final int FIELD_SELECTION_OVERRIDES_RENDERER_INDEXES = 1011;
private static final int FIELD_SELECTION_OVERRIDES_TRACK_GROUP_ARRAYS = 1012;
private static final int FIELD_SELECTION_OVERRIDES = 1013;
private static final int FIELD_RENDERER_DISABLED_INDEXES = 1014;
@Override @Override
public int describeContents() { public Bundle toBundle() {
return 0; Bundle bundle = super.toBundle();
}
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);
// Video // Video
Util.writeBoolean(dest, exceedVideoConstraintsIfNecessary); bundle.putBoolean(
Util.writeBoolean(dest, allowVideoMixedMimeTypeAdaptiveness); keyForField(FIELD_EXCEED_VIDEO_CONSTRAINTS_IF_NECESSARY),
Util.writeBoolean(dest, allowVideoNonSeamlessAdaptiveness); exceedVideoConstraintsIfNecessary);
bundle.putBoolean(
keyForField(FIELD_ALLOW_VIDEO_MIXED_MIME_TYPE_ADAPTIVENESS),
allowVideoMixedMimeTypeAdaptiveness);
bundle.putBoolean(
keyForField(FIELD_ALLOW_VIDEO_NON_SEAMLESS_ADAPTIVENESS),
allowVideoNonSeamlessAdaptiveness);
// Audio // Audio
Util.writeBoolean(dest, exceedAudioConstraintsIfNecessary); bundle.putBoolean(
Util.writeBoolean(dest, allowAudioMixedMimeTypeAdaptiveness); keyForField(FIELD_EXCEED_AUDIO_CONSTRAINTS_IF_NCESSARY),
Util.writeBoolean(dest, allowAudioMixedSampleRateAdaptiveness); exceedAudioConstraintsIfNecessary);
Util.writeBoolean(dest, allowAudioMixedChannelCountAdaptiveness); bundle.putBoolean(
keyForField(FIELD_ALLOW_AUDIO_MIXED_MIME_TYPE_ADAPTIVENESS),
allowAudioMixedMimeTypeAdaptiveness);
bundle.putBoolean(
keyForField(FIELD_ALLOW_AUDIO_MIXED_SAMPLE_RATE_ADAPTIVENESS),
allowAudioMixedSampleRateAdaptiveness);
bundle.putBoolean(
keyForField(FIELD_ALLOW_AUDIO_MIXED_CHANNEL_COUNT_ADAPTIVENESS),
allowAudioMixedChannelCountAdaptiveness);
// Text // Text
dest.writeInt(disabledTextTrackSelectionFlags); bundle.putInt(
keyForField(FIELD_DISABLED_TEXT_TRACK_SELECTION_FLAGS), disabledTextTrackSelectionFlags);
// General // General
Util.writeBoolean(dest, exceedRendererCapabilitiesIfNecessary); bundle.putBoolean(
Util.writeBoolean(dest, tunnelingEnabled); keyForField(FIELD_EXCEED_RENDERER_CAPABILITIES_IF_NECESSARY),
Util.writeBoolean(dest, allowMultipleAdaptiveSelections); exceedRendererCapabilitiesIfNecessary);
// Overrides bundle.putBoolean(keyForField(FIELD_TUNNELING_ENABLED), tunnelingEnabled);
writeSelectionOverridesToParcel(dest, selectionOverrides); bundle.putBoolean(
dest.writeSparseBooleanArray(rendererDisabledFlags); keyForField(FIELD_ALLOW_MULTIPLE_ADAPTIVE_SELECTIONS), allowMultipleAdaptiveSelections);
putSelectionOverridesToBundle(bundle, selectionOverrides);
putRendererDisabledFlagsToBundle(bundle, rendererDisabledFlags);
return bundle;
} }
// Static utility methods. /** Object that can restore {@code Parameters} from a {@link Bundle}. */
public static final Creator<Parameters> CREATOR =
bundle -> new ParametersBuilder(bundle).build();
private static SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>> private static String keyForField(@FieldNumber int field) {
readSelectionOverrides(Parcel in) { return Integer.toString(field, Character.MAX_RADIX);
int renderersWithOverridesCount = in.readInt();
SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>> selectionOverrides =
new SparseArray<>(renderersWithOverridesCount);
for (int i = 0; i < renderersWithOverridesCount; i++) {
int rendererIndex = in.readInt();
int overrideCount = in.readInt();
Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
new HashMap<>(overrideCount);
for (int j = 0; j < overrideCount; j++) {
TrackGroupArray trackGroups =
Assertions.checkNotNull(in.readParcelable(TrackGroupArray.class.getClassLoader()));
@Nullable
SelectionOverride override = in.readParcelable(SelectionOverride.class.getClassLoader());
overrides.put(trackGroups, override);
}
selectionOverrides.put(rendererIndex, overrides);
}
return selectionOverrides;
} }
private static void writeSelectionOverridesToParcel( /**
Parcel dest, * Bundles selection overrides in 3 arrays of equal length. Each triplet of matching index is -
* the selection override (stored in a sparse array as they can be null) - the trackGroupArray
* of that override - the rendererIndex of that override
*/
private static void putSelectionOverridesToBundle(
Bundle bundle,
SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>> selectionOverrides) { SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>> selectionOverrides) {
int renderersWithOverridesCount = selectionOverrides.size(); ArrayList<Integer> rendererIndexes = new ArrayList<>();
dest.writeInt(renderersWithOverridesCount); ArrayList<TrackGroupArray> trackGroupArrays = new ArrayList<>();
for (int i = 0; i < renderersWithOverridesCount; i++) { SparseArray<SelectionOverride> selections = new SparseArray<>();
for (int i = 0; i < selectionOverrides.size(); i++) {
int rendererIndex = selectionOverrides.keyAt(i); int rendererIndex = selectionOverrides.keyAt(i);
Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
selectionOverrides.valueAt(i);
int overrideCount = overrides.size();
dest.writeInt(rendererIndex);
dest.writeInt(overrideCount);
for (Map.Entry<TrackGroupArray, @NullableType SelectionOverride> override : for (Map.Entry<TrackGroupArray, @NullableType SelectionOverride> override :
overrides.entrySet()) { selectionOverrides.valueAt(i).entrySet()) {
dest.writeParcelable(override.getKey(), /* parcelableFlags= */ 0); @Nullable SelectionOverride selection = override.getValue();
dest.writeParcelable(override.getValue(), /* parcelableFlags= */ 0); if (selection != null) {
selections.put(trackGroupArrays.size(), selection);
}
trackGroupArrays.add(override.getKey());
rendererIndexes.add(rendererIndex);
} }
bundle.putIntArray(
keyForField(FIELD_SELECTION_OVERRIDES_RENDERER_INDEXES), Ints.toArray(rendererIndexes));
bundle.putParcelableArrayList(
keyForField(FIELD_SELECTION_OVERRIDES_TRACK_GROUP_ARRAYS),
BundleableUtils.toBundleArrayList(trackGroupArrays));
bundle.putSparseParcelableArray(
keyForField(FIELD_SELECTION_OVERRIDES),
BundleableUtils.toBundleSparseArray(selections));
} }
} }
private static void putRendererDisabledFlagsToBundle(
Bundle bundle, SparseBooleanArray rendererDisabledFlags) {
int[] rendererIndexes = new int[rendererDisabledFlags.size()];
for (int i = 0; i < rendererDisabledFlags.size(); i++) {
rendererIndexes[i] = rendererDisabledFlags.keyAt(i);
}
bundle.putIntArray(keyForField(FIELD_RENDERER_DISABLED_INDEXES), rendererIndexes);
}
private static boolean areRendererDisabledFlagsEqual( private static boolean areRendererDisabledFlagsEqual(
SparseBooleanArray first, SparseBooleanArray second) { SparseBooleanArray first, SparseBooleanArray second) {
int firstSize = first.size(); int firstSize = first.size();
...@@ -1113,7 +1245,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1113,7 +1245,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
} }
/** A track selection override. */ /** A track selection override. */
public static final class SelectionOverride implements Parcelable { public static final class SelectionOverride implements Bundleable {
public final int groupIndex; public final int groupIndex;
public final int[] tracks; public final int[] tracks;
...@@ -1121,6 +1253,8 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1121,6 +1253,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
public final int type; public final int type;
/** /**
* Constructs a {@code SelectionOverride} to override tracks of a group.
*
* @param groupIndex The overriding track group index. * @param groupIndex The overriding track group index.
* @param tracks The overriding track indices within the track group. * @param tracks The overriding track indices within the track group.
*/ */
...@@ -1129,6 +1263,8 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1129,6 +1263,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
} }
/** /**
* Constructs a {@code SelectionOverride} of the given type to override tracks of a group.
*
* @param groupIndex The overriding track group index. * @param groupIndex The overriding track group index.
* @param tracks The overriding track indices within the track group. * @param tracks The overriding track indices within the track group.
* @param type The type that will be returned from {@link TrackSelection#getType()}. * @param type The type that will be returned from {@link TrackSelection#getType()}.
...@@ -1141,14 +1277,6 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1141,14 +1277,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
Arrays.sort(this.tracks); Arrays.sort(this.tracks);
} }
/* package */ SelectionOverride(Parcel in) {
groupIndex = in.readInt();
length = in.readByte();
tracks = new int[length];
in.readIntArray(tracks);
type = in.readInt();
}
/** Returns whether this override contains the specified track index. */ /** Returns whether this override contains the specified track index. */
public boolean containsTrack(int track) { public boolean containsTrack(int track) {
for (int overrideTrack : tracks) { for (int overrideTrack : tracks) {
...@@ -1179,34 +1307,44 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1179,34 +1307,44 @@ public class DefaultTrackSelector extends MappingTrackSelector {
&& type == other.type; && type == other.type;
} }
// Parcelable implementation. // Bundleable implementation.
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(groupIndex);
dest.writeInt(tracks.length);
dest.writeIntArray(tracks);
dest.writeInt(type);
}
public static final Parcelable.Creator<SelectionOverride> CREATOR = @Documented
new Parcelable.Creator<SelectionOverride>() { @Retention(RetentionPolicy.SOURCE)
@IntDef({
FIELD_GROUP_INDEX,
FIELD_TRACKS,
FIELD_TRACK_TYPE,
})
private @interface FieldNumber {}
@Override private static final int FIELD_GROUP_INDEX = 0;
public SelectionOverride createFromParcel(Parcel in) { private static final int FIELD_TRACKS = 1;
return new SelectionOverride(in); private static final int FIELD_TRACK_TYPE = 2;
}
@Override @Override
public SelectionOverride[] newArray(int size) { public Bundle toBundle() {
return new SelectionOverride[size]; Bundle bundle = new Bundle();
} bundle.putInt(keyForField(FIELD_GROUP_INDEX), groupIndex);
bundle.putIntArray(keyForField(FIELD_TRACKS), tracks);
bundle.putInt(keyForField(FIELD_TRACK_TYPE), type);
return bundle;
}
/** Object that can restore {@code SelectionOverride} from a {@link Bundle}. */
public static final Creator<SelectionOverride> CREATOR =
bundle -> {
int groupIndex = bundle.getInt(keyForField(FIELD_GROUP_INDEX), -1);
@Nullable int[] tracks = bundle.getIntArray(keyForField(FIELD_TRACKS));
int trackType = bundle.getInt(keyForField(FIELD_TRACK_TYPE), -1);
Assertions.checkArgument(groupIndex >= 0 && trackType >= 0);
Assertions.checkNotNull(tracks);
return new SelectionOverride(groupIndex, tracks, trackType);
}; };
private static String keyForField(@FieldNumber int field) {
return Integer.toString(field, Character.MAX_RADIX);
}
} }
/** /**
......
library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupArrayTest.java
...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source; ...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
...@@ -29,7 +28,7 @@ import org.junit.runner.RunWith; ...@@ -29,7 +28,7 @@ import org.junit.runner.RunWith;
public final class TrackGroupArrayTest { public final class TrackGroupArrayTest {
@Test @Test
public void parcelable() { public void roundTripViaBundle_ofTrackGroupArray_yieldsEqualInstance() {
Format.Builder formatBuilder = new Format.Builder(); Format.Builder formatBuilder = new Format.Builder();
Format format1 = formatBuilder.setSampleMimeType(MimeTypes.VIDEO_H264).build(); Format format1 = formatBuilder.setSampleMimeType(MimeTypes.VIDEO_H264).build();
Format format2 = formatBuilder.setSampleMimeType(MimeTypes.AUDIO_AAC).build(); Format format2 = formatBuilder.setSampleMimeType(MimeTypes.AUDIO_AAC).build();
...@@ -38,15 +37,11 @@ public final class TrackGroupArrayTest { ...@@ -38,15 +37,11 @@ public final class TrackGroupArrayTest {
TrackGroup trackGroup1 = new TrackGroup(format1, format2); TrackGroup trackGroup1 = new TrackGroup(format1, format2);
TrackGroup trackGroup2 = new TrackGroup(format3); TrackGroup trackGroup2 = new TrackGroup(format3);
TrackGroupArray trackGroupArrayToParcel = new TrackGroupArray(trackGroup1, trackGroup2); TrackGroupArray trackGroupArrayToBundle = new TrackGroupArray(trackGroup1, trackGroup2);
Parcel parcel = Parcel.obtain(); TrackGroupArray trackGroupArrayFromBundle =
trackGroupArrayToParcel.writeToParcel(parcel, 0); TrackGroupArray.CREATOR.fromBundle(trackGroupArrayToBundle.toBundle());
parcel.setDataPosition(0);
TrackGroupArray trackGroupArrayFromParcel = TrackGroupArray.CREATOR.createFromParcel(parcel); assertThat(trackGroupArrayFromBundle).isEqualTo(trackGroupArrayToBundle);
assertThat(trackGroupArrayFromParcel).isEqualTo(trackGroupArrayToParcel);
parcel.recycle();
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupTest.java
...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source; ...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
...@@ -29,20 +28,15 @@ import org.junit.runner.RunWith; ...@@ -29,20 +28,15 @@ import org.junit.runner.RunWith;
public final class TrackGroupTest { public final class TrackGroupTest {
@Test @Test
public void parcelable() { public void roundTripViaBundle_ofTrackGroup_yieldsEqualInstance() {
Format.Builder formatBuilder = new Format.Builder(); Format.Builder formatBuilder = new Format.Builder();
Format format1 = formatBuilder.setSampleMimeType(MimeTypes.VIDEO_H264).build(); Format format1 = formatBuilder.setSampleMimeType(MimeTypes.VIDEO_H264).build();
Format format2 = formatBuilder.setSampleMimeType(MimeTypes.AUDIO_AAC).build(); Format format2 = formatBuilder.setSampleMimeType(MimeTypes.AUDIO_AAC).build();
TrackGroup trackGroupToParcel = new TrackGroup(format1, format2); TrackGroup trackGroupToBundle = new TrackGroup(format1, format2);
Parcel parcel = Parcel.obtain(); TrackGroup trackGroupFromBundle = TrackGroup.CREATOR.fromBundle(trackGroupToBundle.toBundle());
trackGroupToParcel.writeToParcel(parcel, 0);
parcel.setDataPosition(0);
TrackGroup trackGroupFromParcel = TrackGroup.CREATOR.createFromParcel(parcel); assertThat(trackGroupFromBundle).isEqualTo(trackGroupToBundle);
assertThat(trackGroupFromParcel).isEqualTo(trackGroupToParcel);
parcel.recycle();
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
...@@ -29,9 +29,9 @@ import static org.mockito.Mockito.when; ...@@ -29,9 +29,9 @@ import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks; import static org.mockito.MockitoAnnotations.initMocks;
import android.content.Context; import android.content.Context;
import android.os.Parcel;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Bundleable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
...@@ -139,37 +139,26 @@ public final class DefaultTrackSelectorTest { ...@@ -139,37 +139,26 @@ public final class DefaultTrackSelectorTest {
assertThat(parameters.buildUpon().build()).isEqualTo(parameters); assertThat(parameters.buildUpon().build()).isEqualTo(parameters);
} }
/** Tests {@link Parameters} {@link android.os.Parcelable} implementation. */ /** Tests {@link Parameters} {@link Bundleable} implementation. */
@Test @Test
public void parameters_parcelAndUnParcelable() { public void roundTripViaBundle_ofParameters_yieldsEqualInstance() {
Parameters parametersToParcel = buildParametersForEqualsTest(); Parameters parametersToBundle = buildParametersForEqualsTest();
Parcel parcel = Parcel.obtain(); Parameters parametersFromBundle = Parameters.CREATOR.fromBundle(parametersToBundle.toBundle());
parametersToParcel.writeToParcel(parcel, 0);
parcel.setDataPosition(0);
Parameters parametersFromParcel = Parameters.CREATOR.createFromParcel(parcel); assertThat(parametersFromBundle).isEqualTo(parametersToBundle);
assertThat(parametersFromParcel).isEqualTo(parametersToParcel);
parcel.recycle();
} }
/** Tests {@link SelectionOverride}'s {@link android.os.Parcelable} implementation. */ /** Tests {@link SelectionOverride}'s {@link Bundleable} implementation. */
@Test @Test
public void selectionOverrideParcelable() { public void roundTripViaBundle_ofSelectionOverride_yieldsEqualInstance() {
int[] tracks = new int[] {2, 3}; SelectionOverride selectionOverrideToBundle =
SelectionOverride selectionOverrideToParcel = new SelectionOverride(/* groupIndex= */ 1, /* tracks...= */ 2, 3);
new SelectionOverride(/* groupIndex= */ 1, tracks);
Parcel parcel = Parcel.obtain();
selectionOverrideToParcel.writeToParcel(parcel, 0);
parcel.setDataPosition(0);
SelectionOverride selectionOverrideFromParcel = SelectionOverride selectionOverrideFromBundle =
SelectionOverride.CREATOR.createFromParcel(parcel); SelectionOverride.CREATOR.fromBundle(selectionOverrideToBundle.toBundle());
assertThat(selectionOverrideFromParcel).isEqualTo(selectionOverrideToParcel);
parcel.recycle(); assertThat(selectionOverrideFromBundle).isEqualTo(selectionOverrideToBundle);
} }
/** Tests that a null override clears a track selection. */ /** Tests that a null override clears a track selection. */
...@@ -1764,7 +1753,13 @@ public final class DefaultTrackSelectorTest { ...@@ -1764,7 +1753,13 @@ public final class DefaultTrackSelectorTest {
/* rendererIndex= */ 2, /* rendererIndex= */ 2,
new TrackGroupArray(VIDEO_TRACK_GROUP), new TrackGroupArray(VIDEO_TRACK_GROUP),
new SelectionOverride(0, 1)) new SelectionOverride(0, 1))
.setSelectionOverride(
/* rendererIndex= */ 2, new TrackGroupArray(AUDIO_TRACK_GROUP), /* override= */ null)
.setSelectionOverride(
/* rendererIndex= */ 5, new TrackGroupArray(VIDEO_TRACK_GROUP), /* override= */ null)
.setRendererDisabled(1, true)
.setRendererDisabled(3, true) .setRendererDisabled(3, true)
.setRendererDisabled(5, false)
.build(); .build();
} }
......
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