listenersSnapshot;
+ private final ListenerInvocation listenerInvocation;
+
+ private ListenerNotificationTask(ListenerInvocation listenerInvocation) {
+ this.listenersSnapshot = listeners.iterator();
+ this.listenerInvocation = listenerInvocation;
+ }
+
+ public void execute() {
+ while (listenersSnapshot.hasNext()) {
+ listenersSnapshot.next().invoke(listenerInvocation);
}
}
}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
index 800c19047b..b84f1c1f2b 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
@@ -117,6 +117,7 @@ import java.util.Arrays;
Object tag = setTag ? ids[windowIndex] : null;
return window.set(
tag,
+ /* manifest= */ null,
/* presentationStartTimeMs= */ C.TIME_UNSET,
/* windowStartTimeMs= */ C.TIME_UNSET,
/* isSeekable= */ !isDynamic,
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
index d1660c3306..1dc25576a0 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
@@ -15,6 +15,7 @@
*/
package com.google.android.exoplayer2.ext.cast;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.gms.cast.CastStatusCodes;
@@ -33,7 +34,7 @@ import com.google.android.gms.cast.MediaTrack;
* @param mediaInfo The media info to get the duration from.
* @return The duration in microseconds, or {@link C#TIME_UNSET} if unknown or not applicable.
*/
- public static long getStreamDurationUs(MediaInfo mediaInfo) {
+ public static long getStreamDurationUs(@Nullable MediaInfo mediaInfo) {
if (mediaInfo == null) {
return C.TIME_UNSET;
}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java
index 06f0bec971..ebadb0a08a 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java
@@ -20,6 +20,7 @@ import com.google.android.gms.cast.CastMediaControlIntent;
import com.google.android.gms.cast.framework.CastOptions;
import com.google.android.gms.cast.framework.OptionsProvider;
import com.google.android.gms.cast.framework.SessionProvider;
+import java.util.Collections;
import java.util.List;
/**
@@ -27,16 +28,38 @@ import java.util.List;
*/
public final class DefaultCastOptionsProvider implements OptionsProvider {
+ /**
+ * App id of the Default Media Receiver app. Apps that do not require DRM support may use this
+ * receiver receiver app ID.
+ *
+ * See https://developers.google.com/cast/docs/caf_receiver/#default_media_receiver.
+ */
+ public static final String APP_ID_DEFAULT_RECEIVER =
+ CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID;
+
+ /**
+ * App id for receiver app with rudimentary support for DRM.
+ *
+ *
This app id is only suitable for ExoPlayer's Cast Demo app, and it is not intended for
+ * production use. In order to use DRM, custom receiver apps should be used. For environments that
+ * do not require DRM, the default receiver app should be used (see {@link
+ * #APP_ID_DEFAULT_RECEIVER}).
+ */
+ // TODO: Add a documentation resource link for DRM support in the receiver app [Internal ref:
+ // b/128603245].
+ public static final String APP_ID_DEFAULT_RECEIVER_WITH_DRM = "A12D4273";
+
@Override
public CastOptions getCastOptions(Context context) {
return new CastOptions.Builder()
- .setReceiverApplicationId(CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID)
- .setStopReceiverApplicationWhenEndingSession(true).build();
+ .setReceiverApplicationId(APP_ID_DEFAULT_RECEIVER_WITH_DRM)
+ .setStopReceiverApplicationWhenEndingSession(true)
+ .build();
}
@Override
public List getAdditionalSessionProviders(Context context) {
- return null;
+ return Collections.emptyList();
}
}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java
new file mode 100644
index 0000000000..098803a512
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import android.net.Uri;
+import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ext.cast.MediaItem.DrmConfiguration;
+import com.google.android.gms.cast.MediaInfo;
+import com.google.android.gms.cast.MediaMetadata;
+import com.google.android.gms.cast.MediaQueueItem;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.UUID;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/** Default {@link MediaItemConverter} implementation. */
+public final class DefaultMediaItemConverter implements MediaItemConverter {
+
+ private static final String KEY_MEDIA_ITEM = "mediaItem";
+ private static final String KEY_PLAYER_CONFIG = "exoPlayerConfig";
+ private static final String KEY_URI = "uri";
+ private static final String KEY_TITLE = "title";
+ private static final String KEY_MIME_TYPE = "mimeType";
+ private static final String KEY_DRM_CONFIGURATION = "drmConfiguration";
+ private static final String KEY_UUID = "uuid";
+ private static final String KEY_LICENSE_URI = "licenseUri";
+ private static final String KEY_REQUEST_HEADERS = "requestHeaders";
+
+ @Override
+ public MediaItem toMediaItem(MediaQueueItem item) {
+ return getMediaItem(item.getMedia().getCustomData());
+ }
+
+ @Override
+ public MediaQueueItem toMediaQueueItem(MediaItem item) {
+ if (item.mimeType == null) {
+ throw new IllegalArgumentException("The item must specify its mimeType");
+ }
+ MediaMetadata metadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
+ if (item.title != null) {
+ metadata.putString(MediaMetadata.KEY_TITLE, item.title);
+ }
+ MediaInfo mediaInfo =
+ new MediaInfo.Builder(item.uri.toString())
+ .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
+ .setContentType(item.mimeType)
+ .setMetadata(metadata)
+ .setCustomData(getCustomData(item))
+ .build();
+ return new MediaQueueItem.Builder(mediaInfo).build();
+ }
+
+ // Deserialization.
+
+ private static MediaItem getMediaItem(JSONObject customData) {
+ try {
+ JSONObject mediaItemJson = customData.getJSONObject(KEY_MEDIA_ITEM);
+ MediaItem.Builder builder = new MediaItem.Builder();
+ builder.setUri(Uri.parse(mediaItemJson.getString(KEY_URI)));
+ if (mediaItemJson.has(KEY_TITLE)) {
+ builder.setTitle(mediaItemJson.getString(KEY_TITLE));
+ }
+ if (mediaItemJson.has(KEY_MIME_TYPE)) {
+ builder.setMimeType(mediaItemJson.getString(KEY_MIME_TYPE));
+ }
+ if (mediaItemJson.has(KEY_DRM_CONFIGURATION)) {
+ builder.setDrmConfiguration(
+ getDrmConfiguration(mediaItemJson.getJSONObject(KEY_DRM_CONFIGURATION)));
+ }
+ return builder.build();
+ } catch (JSONException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static DrmConfiguration getDrmConfiguration(JSONObject json) throws JSONException {
+ UUID uuid = UUID.fromString(json.getString(KEY_UUID));
+ Uri licenseUri = Uri.parse(json.getString(KEY_LICENSE_URI));
+ JSONObject requestHeadersJson = json.getJSONObject(KEY_REQUEST_HEADERS);
+ HashMap requestHeaders = new HashMap<>();
+ for (Iterator iterator = requestHeadersJson.keys(); iterator.hasNext(); ) {
+ String key = iterator.next();
+ requestHeaders.put(key, requestHeadersJson.getString(key));
+ }
+ return new DrmConfiguration(uuid, licenseUri, requestHeaders);
+ }
+
+ // Serialization.
+
+ private static JSONObject getCustomData(MediaItem item) {
+ JSONObject json = new JSONObject();
+ try {
+ json.put(KEY_MEDIA_ITEM, getMediaItemJson(item));
+ JSONObject playerConfigJson = getPlayerConfigJson(item);
+ if (playerConfigJson != null) {
+ json.put(KEY_PLAYER_CONFIG, playerConfigJson);
+ }
+ } catch (JSONException e) {
+ throw new RuntimeException(e);
+ }
+ return json;
+ }
+
+ private static JSONObject getMediaItemJson(MediaItem item) throws JSONException {
+ JSONObject json = new JSONObject();
+ json.put(KEY_URI, item.uri.toString());
+ json.put(KEY_TITLE, item.title);
+ json.put(KEY_MIME_TYPE, item.mimeType);
+ if (item.drmConfiguration != null) {
+ json.put(KEY_DRM_CONFIGURATION, getDrmConfigurationJson(item.drmConfiguration));
+ }
+ return json;
+ }
+
+ private static JSONObject getDrmConfigurationJson(DrmConfiguration drmConfiguration)
+ throws JSONException {
+ JSONObject json = new JSONObject();
+ json.put(KEY_UUID, drmConfiguration.uuid);
+ json.put(KEY_LICENSE_URI, drmConfiguration.licenseUri);
+ json.put(KEY_REQUEST_HEADERS, new JSONObject(drmConfiguration.requestHeaders));
+ return json;
+ }
+
+ @Nullable
+ private static JSONObject getPlayerConfigJson(MediaItem item) throws JSONException {
+ DrmConfiguration drmConfiguration = item.drmConfiguration;
+ if (drmConfiguration == null) {
+ return null;
+ }
+
+ String drmScheme;
+ if (C.WIDEVINE_UUID.equals(drmConfiguration.uuid)) {
+ drmScheme = "widevine";
+ } else if (C.PLAYREADY_UUID.equals(drmConfiguration.uuid)) {
+ drmScheme = "playready";
+ } else {
+ return null;
+ }
+
+ JSONObject exoPlayerConfigJson = new JSONObject();
+ exoPlayerConfigJson.put("withCredentials", false);
+ exoPlayerConfigJson.put("protectionSystem", drmScheme);
+ if (drmConfiguration.licenseUri != null) {
+ exoPlayerConfigJson.put("licenseUrl", drmConfiguration.licenseUri);
+ }
+ if (!drmConfiguration.requestHeaders.isEmpty()) {
+ exoPlayerConfigJson.put("headers", new JSONObject(drmConfiguration.requestHeaders));
+ }
+
+ return exoPlayerConfigJson;
+ }
+}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
index adb8e59070..7ac0da7078 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
@@ -17,42 +17,31 @@ package com.google.android.exoplayer2.ext.cast;
import android.net.Uri;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util;
-import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
-/** Representation of an item that can be played by a media player. */
+/** Representation of a media item. */
public final class MediaItem {
/** A builder for {@link MediaItem} instances. */
public static final class Builder {
- @Nullable private UUID uuid;
- private String title;
- private String description;
- private MediaItem.UriBundle media;
- @Nullable private Object attachment;
- private List drmSchemes;
- private long startPositionUs;
- private long endPositionUs;
- private String mimeType;
+ @Nullable private Uri uri;
+ @Nullable private String title;
+ @Nullable private String mimeType;
+ @Nullable private DrmConfiguration drmConfiguration;
- /** Creates an builder with default field values. */
- public Builder() {
- clearInternal();
+ /** See {@link MediaItem#uri}. */
+ public Builder setUri(String uri) {
+ return setUri(Uri.parse(uri));
}
- /** See {@link MediaItem#uuid}. */
- public Builder setUuid(UUID uuid) {
- this.uuid = uuid;
+ /** See {@link MediaItem#uri}. */
+ public Builder setUri(Uri uri) {
+ this.uri = uri;
return this;
}
@@ -62,307 +51,125 @@ public final class MediaItem {
return this;
}
- /** See {@link MediaItem#description}. */
- public Builder setDescription(String description) {
- this.description = description;
- return this;
- }
-
- /** Equivalent to {@link #setMedia(UriBundle) setMedia(new UriBundle(Uri.parse(uri)))}. */
- public Builder setMedia(String uri) {
- return setMedia(new UriBundle(Uri.parse(uri)));
- }
-
- /** See {@link MediaItem#media}. */
- public Builder setMedia(UriBundle media) {
- this.media = media;
- return this;
- }
-
- /** See {@link MediaItem#attachment}. */
- public Builder setAttachment(Object attachment) {
- this.attachment = attachment;
- return this;
- }
-
- /** See {@link MediaItem#drmSchemes}. */
- public Builder setDrmSchemes(List drmSchemes) {
- this.drmSchemes = Collections.unmodifiableList(new ArrayList<>(drmSchemes));
- return this;
- }
-
- /** See {@link MediaItem#startPositionUs}. */
- public Builder setStartPositionUs(long startPositionUs) {
- this.startPositionUs = startPositionUs;
- return this;
- }
-
- /** See {@link MediaItem#endPositionUs}. */
- public Builder setEndPositionUs(long endPositionUs) {
- Assertions.checkArgument(endPositionUs != C.TIME_END_OF_SOURCE);
- this.endPositionUs = endPositionUs;
- return this;
- }
-
/** See {@link MediaItem#mimeType}. */
public Builder setMimeType(String mimeType) {
this.mimeType = mimeType;
return this;
}
- /**
- * Equivalent to {@link #build()}, except it also calls {@link #clear()} after creating the
- * {@link MediaItem}.
- */
- public MediaItem buildAndClear() {
- MediaItem item = build();
- clearInternal();
- return item;
- }
-
- /** Returns the builder to default values. */
- public Builder clear() {
- clearInternal();
+ /** See {@link MediaItem#drmConfiguration}. */
+ public Builder setDrmConfiguration(DrmConfiguration drmConfiguration) {
+ this.drmConfiguration = drmConfiguration;
return this;
}
- /**
- * Returns a new {@link MediaItem} instance with the current builder values. This method also
- * clears any values passed to {@link #setUuid(UUID)}.
- */
+ /** Returns a new {@link MediaItem} instance with the current builder values. */
public MediaItem build() {
- UUID uuid = this.uuid;
- this.uuid = null;
- return new MediaItem(
- uuid != null ? uuid : UUID.randomUUID(),
- title,
- description,
- media,
- attachment,
- drmSchemes,
- startPositionUs,
- endPositionUs,
- mimeType);
- }
-
- @EnsuresNonNull({"title", "description", "media", "drmSchemes", "mimeType"})
- private void clearInternal(@UnknownInitialization Builder this) {
- uuid = null;
- title = "";
- description = "";
- media = UriBundle.EMPTY;
- attachment = null;
- drmSchemes = Collections.emptyList();
- startPositionUs = C.TIME_UNSET;
- endPositionUs = C.TIME_UNSET;
- mimeType = "";
+ Assertions.checkNotNull(uri);
+ return new MediaItem(uri, title, mimeType, drmConfiguration);
}
}
- /** Bundles a resource's URI with headers to attach to any request to that URI. */
- public static final class UriBundle {
-
- /** An empty {@link UriBundle}. */
- public static final UriBundle EMPTY = new UriBundle(Uri.EMPTY);
-
- /** A URI. */
- public final Uri uri;
-
- /** The headers to attach to any request for the given URI. */
- public final Map requestHeaders;
-
- /**
- * Creates an instance with no request headers.
- *
- * @param uri See {@link #uri}.
- */
- public UriBundle(Uri uri) {
- this(uri, Collections.emptyMap());
- }
-
- /**
- * Creates an instance with the given URI and request headers.
- *
- * @param uri See {@link #uri}.
- * @param requestHeaders See {@link #requestHeaders}.
- */
- public UriBundle(Uri uri, Map requestHeaders) {
- this.uri = uri;
- this.requestHeaders = Collections.unmodifiableMap(new HashMap<>(requestHeaders));
- }
-
- @Override
- public boolean equals(@Nullable Object other) {
- if (this == other) {
- return true;
- }
- if (other == null || getClass() != other.getClass()) {
- return false;
- }
-
- UriBundle uriBundle = (UriBundle) other;
- return uri.equals(uriBundle.uri) && requestHeaders.equals(uriBundle.requestHeaders);
- }
-
- @Override
- public int hashCode() {
- int result = uri.hashCode();
- result = 31 * result + requestHeaders.hashCode();
- return result;
- }
- }
-
- /**
- * Represents a DRM protection scheme, and optionally provides information about how to acquire
- * the license for the media.
- */
- public static final class DrmScheme {
+ /** DRM configuration for a media item. */
+ public static final class DrmConfiguration {
/** The UUID of the protection scheme. */
public final UUID uuid;
/**
- * Optional {@link UriBundle} for the license server. If no license server is provided, the
- * server must be provided by the media.
+ * Optional license server {@link Uri}. If {@code null} then the license server must be
+ * specified by the media.
*/
- @Nullable public final UriBundle licenseServer;
+ @Nullable public final Uri licenseUri;
+
+ /** Headers that should be attached to any license requests. */
+ public final Map requestHeaders;
/**
* Creates an instance.
*
* @param uuid See {@link #uuid}.
- * @param licenseServer See {@link #licenseServer}.
+ * @param licenseUri See {@link #licenseUri}.
+ * @param requestHeaders See {@link #requestHeaders}.
*/
- public DrmScheme(UUID uuid, @Nullable UriBundle licenseServer) {
+ public DrmConfiguration(
+ UUID uuid, @Nullable Uri licenseUri, @Nullable Map requestHeaders) {
this.uuid = uuid;
- this.licenseServer = licenseServer;
+ this.licenseUri = licenseUri;
+ this.requestHeaders =
+ requestHeaders == null
+ ? Collections.emptyMap()
+ : Collections.unmodifiableMap(requestHeaders);
}
@Override
- public boolean equals(@Nullable Object other) {
- if (this == other) {
+ public boolean equals(@Nullable Object obj) {
+ if (this == obj) {
return true;
}
- if (other == null || getClass() != other.getClass()) {
+ if (obj == null || getClass() != obj.getClass()) {
return false;
}
- DrmScheme drmScheme = (DrmScheme) other;
- return uuid.equals(drmScheme.uuid) && Util.areEqual(licenseServer, drmScheme.licenseServer);
+ DrmConfiguration other = (DrmConfiguration) obj;
+ return uuid.equals(other.uuid)
+ && Util.areEqual(licenseUri, other.licenseUri)
+ && requestHeaders.equals(other.requestHeaders);
}
@Override
public int hashCode() {
int result = uuid.hashCode();
- result = 31 * result + (licenseServer != null ? licenseServer.hashCode() : 0);
+ result = 31 * result + (licenseUri != null ? licenseUri.hashCode() : 0);
+ result = 31 * result + requestHeaders.hashCode();
return result;
}
}
- /**
- * A UUID that identifies this item, potentially across different devices. The default value is
- * obtained by calling {@link UUID#randomUUID()}.
- */
- public final UUID uuid;
+ /** The media {@link Uri}. */
+ public final Uri uri;
- /** The title of the item. The default value is an empty string. */
- public final String title;
+ /** The title of the item, or {@code null} if unspecified. */
+ @Nullable public final String title;
- /** A description for the item. The default value is an empty string. */
- public final String description;
+ /** The mime type for the media, or {@code null} if unspecified. */
+ @Nullable public final String mimeType;
- /**
- * A {@link UriBundle} to fetch the media content. The default value is {@link UriBundle#EMPTY}.
- */
- public final UriBundle media;
+ /** Optional {@link DrmConfiguration} for the media. */
+ @Nullable public final DrmConfiguration drmConfiguration;
- /**
- * An optional opaque object to attach to the media item. Handling of this attachment is
- * implementation specific. The default value is null.
- */
- @Nullable public final Object attachment;
-
- /**
- * Immutable list of {@link DrmScheme} instances sorted in decreasing order of preference. The
- * default value is an empty list.
- */
- public final List drmSchemes;
-
- /**
- * The position in microseconds at which playback of this media item should start. {@link
- * C#TIME_UNSET} if playback should start at the default position. The default value is {@link
- * C#TIME_UNSET}.
- */
- public final long startPositionUs;
-
- /**
- * The position in microseconds at which playback of this media item should end. {@link
- * C#TIME_UNSET} if playback should end at the end of the media. The default value is {@link
- * C#TIME_UNSET}.
- */
- public final long endPositionUs;
-
- /**
- * The mime type of this media item. The default value is an empty string.
- *
- * The usage of this mime type is optional and player implementation specific.
- */
- public final String mimeType;
-
- // TODO: Add support for sideloaded tracks, artwork, icon, and subtitle.
+ private MediaItem(
+ Uri uri,
+ @Nullable String title,
+ @Nullable String mimeType,
+ @Nullable DrmConfiguration drmConfiguration) {
+ this.uri = uri;
+ this.title = title;
+ this.mimeType = mimeType;
+ this.drmConfiguration = drmConfiguration;
+ }
@Override
- public boolean equals(@Nullable Object other) {
- if (this == other) {
+ public boolean equals(@Nullable Object obj) {
+ if (this == obj) {
return true;
}
- if (other == null || getClass() != other.getClass()) {
+ if (obj == null || getClass() != obj.getClass()) {
return false;
}
- MediaItem mediaItem = (MediaItem) other;
- return startPositionUs == mediaItem.startPositionUs
- && endPositionUs == mediaItem.endPositionUs
- && uuid.equals(mediaItem.uuid)
- && title.equals(mediaItem.title)
- && description.equals(mediaItem.description)
- && media.equals(mediaItem.media)
- && Util.areEqual(attachment, mediaItem.attachment)
- && drmSchemes.equals(mediaItem.drmSchemes)
- && mimeType.equals(mediaItem.mimeType);
+ MediaItem other = (MediaItem) obj;
+ return uri.equals(other.uri)
+ && Util.areEqual(title, other.title)
+ && Util.areEqual(mimeType, other.mimeType)
+ && Util.areEqual(drmConfiguration, other.drmConfiguration);
}
@Override
public int hashCode() {
- int result = uuid.hashCode();
- result = 31 * result + title.hashCode();
- result = 31 * result + description.hashCode();
- result = 31 * result + media.hashCode();
- result = 31 * result + (attachment != null ? attachment.hashCode() : 0);
- result = 31 * result + drmSchemes.hashCode();
- result = 31 * result + (int) (startPositionUs ^ (startPositionUs >>> 32));
- result = 31 * result + (int) (endPositionUs ^ (endPositionUs >>> 32));
- result = 31 * result + mimeType.hashCode();
+ int result = uri.hashCode();
+ result = 31 * result + (title == null ? 0 : title.hashCode());
+ result = 31 * result + (drmConfiguration == null ? 0 : drmConfiguration.hashCode());
+ result = 31 * result + (mimeType == null ? 0 : mimeType.hashCode());
return result;
}
-
- private MediaItem(
- UUID uuid,
- String title,
- String description,
- UriBundle media,
- @Nullable Object attachment,
- List drmSchemes,
- long startPositionUs,
- long endPositionUs,
- String mimeType) {
- this.uuid = uuid;
- this.title = title;
- this.description = description;
- this.media = media;
- this.attachment = attachment;
- this.drmSchemes = drmSchemes;
- this.startPositionUs = startPositionUs;
- this.endPositionUs = endPositionUs;
- this.mimeType = mimeType;
- }
}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemConverter.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemConverter.java
new file mode 100644
index 0000000000..23633aa4d2
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemConverter.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import com.google.android.gms.cast.MediaQueueItem;
+
+/** Converts between {@link MediaItem} and the Cast SDK's {@link MediaQueueItem}. */
+public interface MediaItemConverter {
+
+ /**
+ * Converts a {@link MediaItem} to a {@link MediaQueueItem}.
+ *
+ * @param mediaItem The {@link MediaItem}.
+ * @return An equivalent {@link MediaQueueItem}.
+ */
+ MediaQueueItem toMediaQueueItem(MediaItem mediaItem);
+
+ /**
+ * Converts a {@link MediaQueueItem} to a {@link MediaItem}.
+ *
+ * @param mediaQueueItem The {@link MediaQueueItem}.
+ * @return The equivalent {@link MediaItem}.
+ */
+ MediaItem toMediaItem(MediaQueueItem mediaQueueItem);
+}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemQueue.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemQueue.java
deleted file mode 100644
index 184e347e1c..0000000000
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemQueue.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.ext.cast;
-
-/** Represents a sequence of {@link MediaItem MediaItems}. */
-public interface MediaItemQueue {
-
- /**
- * Returns the item at the given index.
- *
- * @param index The index of the item to retrieve.
- * @return The item at the given index.
- * @throws IndexOutOfBoundsException If {@code index < 0 || index >= getSize()}.
- */
- MediaItem get(int index);
-
- /** Returns the number of items in this queue. */
- int getSize();
-
- /**
- * Appends the given sequence of items to the queue.
- *
- * @param items The sequence of items to append.
- */
- void add(MediaItem... items);
-
- /**
- * Adds the given sequence of items to the queue at the given position, so that the first of
- * {@code items} is placed at the given index.
- *
- * @param index The index at which {@code items} will be inserted.
- * @param items The sequence of items to append.
- * @throws IndexOutOfBoundsException If {@code index < 0 || index > getSize()}.
- */
- void add(int index, MediaItem... items);
-
- /**
- * Moves an existing item within the playlist.
- *
- * Calling this method is equivalent to removing the item at position {@code indexFrom} and
- * immediately inserting it at position {@code indexTo}. If the moved item is being played at the
- * moment of the invocation, playback will stick with the moved item.
- *
- * @param indexFrom The index of the item to move.
- * @param indexTo The index at which the item will be placed after this operation.
- * @throws IndexOutOfBoundsException If for either index, {@code index < 0 || index >= getSize()}.
- */
- void move(int indexFrom, int indexTo);
-
- /**
- * Removes an item from the queue.
- *
- * @param index The index of the item to remove from the queue.
- * @throws IndexOutOfBoundsException If {@code index < 0 || index >= getSize()}.
- */
- void remove(int index);
-
- /**
- * Removes a range of items from the queue.
- *
- *
Does nothing if an empty range ({@code from == exclusiveTo}) is passed.
- *
- * @param from The inclusive index at which the range to remove starts.
- * @param exclusiveTo The exclusive index at which the range to remove ends.
- * @throws IndexOutOfBoundsException If {@code from < 0 || exclusiveTo > getSize() || from >
- * exclusiveTo}.
- */
- void removeRange(int from, int exclusiveTo);
-
- /** Removes all items in the queue. */
- void clear();
-}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/package-info.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/package-info.java
new file mode 100644
index 0000000000..07055905a6
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.cast;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/cast/src/test/AndroidManifest.xml b/extensions/cast/src/test/AndroidManifest.xml
index aea8bda663..35a5150a47 100644
--- a/extensions/cast/src/test/AndroidManifest.xml
+++ b/extensions/cast/src/test/AndroidManifest.xml
@@ -14,4 +14,6 @@
limitations under the License.
-->
-
+
+
+
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java
new file mode 100644
index 0000000000..cf9b9d3496
--- /dev/null
+++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ext.cast.MediaItem.DrmConfiguration;
+import com.google.android.gms.cast.MediaQueueItem;
+import java.util.Collections;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Test for {@link DefaultMediaItemConverter}. */
+@RunWith(AndroidJUnit4.class)
+public class DefaultMediaItemConverterTest {
+
+ @Test
+ public void serialize_deserialize_minimal() {
+ MediaItem.Builder builder = new MediaItem.Builder();
+ MediaItem item = builder.setUri(Uri.parse("http://example.com")).setMimeType("mime").build();
+
+ DefaultMediaItemConverter converter = new DefaultMediaItemConverter();
+ MediaQueueItem queueItem = converter.toMediaQueueItem(item);
+ MediaItem reconstructedItem = converter.toMediaItem(queueItem);
+
+ assertThat(reconstructedItem).isEqualTo(item);
+ }
+
+ @Test
+ public void serialize_deserialize_complete() {
+ MediaItem.Builder builder = new MediaItem.Builder();
+ MediaItem item =
+ builder
+ .setUri(Uri.parse("http://example.com"))
+ .setTitle("title")
+ .setMimeType("mime")
+ .setDrmConfiguration(
+ new DrmConfiguration(
+ C.WIDEVINE_UUID,
+ Uri.parse("http://license.com"),
+ Collections.singletonMap("key", "value")))
+ .build();
+
+ DefaultMediaItemConverter converter = new DefaultMediaItemConverter();
+ MediaQueueItem queueItem = converter.toMediaQueueItem(item);
+ MediaItem reconstructedItem = converter.toMediaItem(queueItem);
+
+ assertThat(reconstructedItem).isEqualTo(item);
+ }
+}
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
index 9cdc073b06..7b410a8fbc 100644
--- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
+++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
@@ -21,10 +21,7 @@ import android.net.Uri;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.MimeTypes;
-import java.util.Arrays;
import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,113 +29,58 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
public class MediaItemTest {
- @Test
- public void buildMediaItem_resetsUuid() {
- MediaItem.Builder builder = new MediaItem.Builder();
- UUID uuid = new UUID(1, 1);
- MediaItem item1 = builder.setUuid(uuid).build();
- MediaItem item2 = builder.build();
- MediaItem item3 = builder.build();
- assertThat(item1.uuid).isEqualTo(uuid);
- assertThat(item2.uuid).isNotEqualTo(uuid);
- assertThat(item3.uuid).isNotEqualTo(item2.uuid);
- assertThat(item3.uuid).isNotEqualTo(uuid);
- }
-
@Test
public void buildMediaItem_doesNotChangeState() {
MediaItem.Builder builder = new MediaItem.Builder();
MediaItem item1 =
builder
- .setUuid(new UUID(0, 1))
- .setMedia("http://example.com")
+ .setUri(Uri.parse("http://example.com"))
.setTitle("title")
.setMimeType(MimeTypes.AUDIO_MP4)
- .setStartPositionUs(3)
- .setEndPositionUs(4)
.build();
- MediaItem item2 = builder.setUuid(new UUID(0, 1)).build();
+ MediaItem item2 = builder.build();
assertThat(item1).isEqualTo(item2);
}
- @Test
- public void buildMediaItem_assertDefaultValues() {
- assertDefaultValues(new MediaItem.Builder().build());
- }
-
- @Test
- public void buildAndClear_assertDefaultValues() {
- MediaItem.Builder builder = new MediaItem.Builder();
- builder
- .setMedia("http://example.com")
- .setTitle("title")
- .setMimeType(MimeTypes.AUDIO_MP4)
- .setStartPositionUs(3)
- .setEndPositionUs(4)
- .buildAndClear();
- assertDefaultValues(builder.build());
- }
-
@Test
public void equals_withEqualDrmSchemes_returnsTrue() {
- MediaItem.Builder builder = new MediaItem.Builder();
+ MediaItem.Builder builder1 = new MediaItem.Builder();
MediaItem mediaItem1 =
- builder
- .setUuid(new UUID(0, 1))
- .setMedia("www.google.com")
- .setDrmSchemes(createDummyDrmSchemes(1))
- .buildAndClear();
+ builder1
+ .setUri(Uri.parse("www.google.com"))
+ .setDrmConfiguration(buildDrmConfiguration(1))
+ .build();
+ MediaItem.Builder builder2 = new MediaItem.Builder();
MediaItem mediaItem2 =
- builder
- .setUuid(new UUID(0, 1))
- .setMedia("www.google.com")
- .setDrmSchemes(createDummyDrmSchemes(1))
- .buildAndClear();
+ builder2
+ .setUri(Uri.parse("www.google.com"))
+ .setDrmConfiguration(buildDrmConfiguration(1))
+ .build();
assertThat(mediaItem1).isEqualTo(mediaItem2);
}
@Test
public void equals_withDifferentDrmRequestHeaders_returnsFalse() {
- MediaItem.Builder builder = new MediaItem.Builder();
+ MediaItem.Builder builder1 = new MediaItem.Builder();
MediaItem mediaItem1 =
- builder
- .setUuid(new UUID(0, 1))
- .setMedia("www.google.com")
- .setDrmSchemes(createDummyDrmSchemes(1))
- .buildAndClear();
+ builder1
+ .setUri(Uri.parse("www.google.com"))
+ .setDrmConfiguration(buildDrmConfiguration(1))
+ .build();
+ MediaItem.Builder builder2 = new MediaItem.Builder();
MediaItem mediaItem2 =
- builder
- .setUuid(new UUID(0, 1))
- .setMedia("www.google.com")
- .setDrmSchemes(createDummyDrmSchemes(2))
- .buildAndClear();
+ builder2
+ .setUri(Uri.parse("www.google.com"))
+ .setDrmConfiguration(buildDrmConfiguration(2))
+ .build();
assertThat(mediaItem1).isNotEqualTo(mediaItem2);
}
- private static void assertDefaultValues(MediaItem item) {
- assertThat(item.title).isEmpty();
- assertThat(item.description).isEmpty();
- assertThat(item.media.uri).isEqualTo(Uri.EMPTY);
- assertThat(item.attachment).isNull();
- assertThat(item.drmSchemes).isEmpty();
- assertThat(item.startPositionUs).isEqualTo(C.TIME_UNSET);
- assertThat(item.endPositionUs).isEqualTo(C.TIME_UNSET);
- assertThat(item.mimeType).isEmpty();
- }
-
- private static List createDummyDrmSchemes(int seed) {
- HashMap requestHeaders1 = new HashMap<>();
- requestHeaders1.put("key1", "value1");
- requestHeaders1.put("key2", "value1");
- MediaItem.UriBundle uriBundle1 =
- new MediaItem.UriBundle(Uri.parse("www.uri1.com"), requestHeaders1);
- MediaItem.DrmScheme drmScheme1 = new MediaItem.DrmScheme(C.WIDEVINE_UUID, uriBundle1);
- HashMap requestHeaders2 = new HashMap<>();
- requestHeaders2.put("key3", "value3");
- requestHeaders2.put("key4", "valueWithSeed" + seed);
- MediaItem.UriBundle uriBundle2 =
- new MediaItem.UriBundle(Uri.parse("www.uri2.com"), requestHeaders2);
- MediaItem.DrmScheme drmScheme2 = new MediaItem.DrmScheme(C.PLAYREADY_UUID, uriBundle2);
- return Arrays.asList(drmScheme1, drmScheme2);
+ private static MediaItem.DrmConfiguration buildDrmConfiguration(int seed) {
+ HashMap requestHeaders = new HashMap<>();
+ requestHeaders.put("key1", "value1");
+ requestHeaders.put("key2", "value2" + seed);
+ return new MediaItem.DrmConfiguration(
+ C.WIDEVINE_UUID, Uri.parse("www.uri1.com"), requestHeaders);
}
}
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index 76972a3530..9c49ba94e1 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -31,11 +31,13 @@ android {
}
dependencies {
- api 'org.chromium.net:cronet-embedded:73.3683.76'
+ api 'org.chromium.net:cronet-embedded:75.3770.101'
implementation project(modulePrefix + 'library-core')
- implementation 'androidx.annotation:annotation:1.0.2'
+ implementation 'androidx.annotation:annotation:1.1.0'
+ compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
testImplementation project(modulePrefix + 'library')
- testImplementation project(modulePrefix + 'testutils-robolectric')
+ testImplementation project(modulePrefix + 'testutils')
+ testImplementation 'org.robolectric:robolectric:' + robolectricVersion
}
ext {
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
index ca196b1d2f..ed92523017 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
@@ -15,6 +15,8 @@
*/
package com.google.android.exoplayer2.ext.cronet;
+import static com.google.android.exoplayer2.util.Util.castNonNull;
+
import android.net.Uri;
import androidx.annotation.Nullable;
import android.text.TextUtils;
@@ -41,6 +43,7 @@ import java.util.Map.Entry;
import java.util.concurrent.Executor;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.chromium.net.CronetEngine;
import org.chromium.net.CronetException;
import org.chromium.net.NetworkException;
@@ -113,16 +116,17 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
private final CronetEngine cronetEngine;
private final Executor executor;
- @Nullable private final Predicate contentTypePredicate;
private final int connectTimeoutMs;
private final int readTimeoutMs;
private final boolean resetTimeoutOnRedirects;
private final boolean handleSetCookieRequests;
- private final RequestProperties defaultRequestProperties;
+ @Nullable private final RequestProperties defaultRequestProperties;
private final RequestProperties requestProperties;
private final ConditionVariable operation;
private final Clock clock;
+ @Nullable private Predicate contentTypePredicate;
+
// Accessed by the calling thread only.
private boolean opened;
private long bytesToSkip;
@@ -130,18 +134,18 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
// Written from the calling thread only. currentUrlRequest.start() calls ensure writes are visible
// to reads made by the Cronet thread.
- private UrlRequest currentUrlRequest;
- private DataSpec currentDataSpec;
+ @Nullable private UrlRequest currentUrlRequest;
+ @Nullable private DataSpec currentDataSpec;
// Reference written and read by calling thread only. Passed to Cronet thread as a local variable.
// operation.open() calls ensure writes into the buffer are visible to reads made by the calling
// thread.
- private ByteBuffer readBuffer;
+ @Nullable private ByteBuffer readBuffer;
// Written from the Cronet thread only. operation.open() calls ensure writes are visible to reads
// made by the calling thread.
- private UrlResponseInfo responseInfo;
- private IOException exception;
+ @Nullable private UrlResponseInfo responseInfo;
+ @Nullable private IOException exception;
private boolean finished;
private volatile long currentConnectTimeoutMs;
@@ -155,7 +159,78 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
* handling is a fast operation when using a direct executor.
*/
public CronetDataSource(CronetEngine cronetEngine, Executor executor) {
- this(cronetEngine, executor, /* contentTypePredicate= */ null);
+ this(
+ cronetEngine,
+ executor,
+ DEFAULT_CONNECT_TIMEOUT_MILLIS,
+ DEFAULT_READ_TIMEOUT_MILLIS,
+ /* resetTimeoutOnRedirects= */ false,
+ /* defaultRequestProperties= */ null);
+ }
+
+ /**
+ * @param cronetEngine A CronetEngine.
+ * @param executor The {@link java.util.concurrent.Executor} that will handle responses. This may
+ * be a direct executor (i.e. executes tasks on the calling thread) in order to avoid a thread
+ * hop from Cronet's internal network thread to the response handling thread. However, to
+ * avoid slowing down overall network performance, care must be taken to make sure response
+ * handling is a fast operation when using a direct executor.
+ * @param connectTimeoutMs The connection timeout, in milliseconds.
+ * @param readTimeoutMs The read timeout, in milliseconds.
+ * @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
+ * @param defaultRequestProperties Optional default {@link RequestProperties} to be sent to the
+ * server as HTTP headers on every request.
+ */
+ public CronetDataSource(
+ CronetEngine cronetEngine,
+ Executor executor,
+ int connectTimeoutMs,
+ int readTimeoutMs,
+ boolean resetTimeoutOnRedirects,
+ @Nullable RequestProperties defaultRequestProperties) {
+ this(
+ cronetEngine,
+ executor,
+ connectTimeoutMs,
+ readTimeoutMs,
+ resetTimeoutOnRedirects,
+ Clock.DEFAULT,
+ defaultRequestProperties,
+ /* handleSetCookieRequests= */ false);
+ }
+
+ /**
+ * @param cronetEngine A CronetEngine.
+ * @param executor The {@link java.util.concurrent.Executor} that will handle responses. This may
+ * be a direct executor (i.e. executes tasks on the calling thread) in order to avoid a thread
+ * hop from Cronet's internal network thread to the response handling thread. However, to
+ * avoid slowing down overall network performance, care must be taken to make sure response
+ * handling is a fast operation when using a direct executor.
+ * @param connectTimeoutMs The connection timeout, in milliseconds.
+ * @param readTimeoutMs The read timeout, in milliseconds.
+ * @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
+ * @param defaultRequestProperties Optional default {@link RequestProperties} to be sent to the
+ * server as HTTP headers on every request.
+ * @param handleSetCookieRequests Whether "Set-Cookie" requests on redirect should be forwarded to
+ * the redirect url in the "Cookie" header.
+ */
+ public CronetDataSource(
+ CronetEngine cronetEngine,
+ Executor executor,
+ int connectTimeoutMs,
+ int readTimeoutMs,
+ boolean resetTimeoutOnRedirects,
+ @Nullable RequestProperties defaultRequestProperties,
+ boolean handleSetCookieRequests) {
+ this(
+ cronetEngine,
+ executor,
+ connectTimeoutMs,
+ readTimeoutMs,
+ resetTimeoutOnRedirects,
+ Clock.DEFAULT,
+ defaultRequestProperties,
+ handleSetCookieRequests);
}
/**
@@ -168,7 +243,10 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
* @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
* predicate then an {@link InvalidContentTypeException} is thrown from {@link
* #open(DataSpec)}.
+ * @deprecated Use {@link #CronetDataSource(CronetEngine, Executor)} and {@link
+ * #setContentTypePredicate(Predicate)}.
*/
+ @Deprecated
public CronetDataSource(
CronetEngine cronetEngine,
Executor executor,
@@ -179,9 +257,8 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
contentTypePredicate,
DEFAULT_CONNECT_TIMEOUT_MILLIS,
DEFAULT_READ_TIMEOUT_MILLIS,
- false,
- null,
- false);
+ /* resetTimeoutOnRedirects= */ false,
+ /* defaultRequestProperties= */ null);
}
/**
@@ -197,8 +274,12 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
* @param connectTimeoutMs The connection timeout, in milliseconds.
* @param readTimeoutMs The read timeout, in milliseconds.
* @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
- * @param defaultRequestProperties The default request properties to be used.
+ * @param defaultRequestProperties Optional default {@link RequestProperties} to be sent to the
+ * server as HTTP headers on every request.
+ * @deprecated Use {@link #CronetDataSource(CronetEngine, Executor, int, int, boolean,
+ * RequestProperties)} and {@link #setContentTypePredicate(Predicate)}.
*/
+ @Deprecated
public CronetDataSource(
CronetEngine cronetEngine,
Executor executor,
@@ -206,7 +287,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
int connectTimeoutMs,
int readTimeoutMs,
boolean resetTimeoutOnRedirects,
- RequestProperties defaultRequestProperties) {
+ @Nullable RequestProperties defaultRequestProperties) {
this(
cronetEngine,
executor,
@@ -214,9 +295,8 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
connectTimeoutMs,
readTimeoutMs,
resetTimeoutOnRedirects,
- Clock.DEFAULT,
defaultRequestProperties,
- false);
+ /* handleSetCookieRequests= */ false);
}
/**
@@ -232,10 +312,14 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
* @param connectTimeoutMs The connection timeout, in milliseconds.
* @param readTimeoutMs The read timeout, in milliseconds.
* @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
- * @param defaultRequestProperties The default request properties to be used.
+ * @param defaultRequestProperties Optional default {@link RequestProperties} to be sent to the
+ * server as HTTP headers on every request.
* @param handleSetCookieRequests Whether "Set-Cookie" requests on redirect should be forwarded to
* the redirect url in the "Cookie" header.
+ * @deprecated Use {@link #CronetDataSource(CronetEngine, Executor, int, int, boolean,
+ * RequestProperties, boolean)} and {@link #setContentTypePredicate(Predicate)}.
*/
+ @Deprecated
public CronetDataSource(
CronetEngine cronetEngine,
Executor executor,
@@ -243,35 +327,33 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
int connectTimeoutMs,
int readTimeoutMs,
boolean resetTimeoutOnRedirects,
- RequestProperties defaultRequestProperties,
+ @Nullable RequestProperties defaultRequestProperties,
boolean handleSetCookieRequests) {
this(
cronetEngine,
executor,
- contentTypePredicate,
connectTimeoutMs,
readTimeoutMs,
resetTimeoutOnRedirects,
Clock.DEFAULT,
defaultRequestProperties,
handleSetCookieRequests);
+ this.contentTypePredicate = contentTypePredicate;
}
/* package */ CronetDataSource(
CronetEngine cronetEngine,
Executor executor,
- @Nullable Predicate contentTypePredicate,
int connectTimeoutMs,
int readTimeoutMs,
boolean resetTimeoutOnRedirects,
Clock clock,
- RequestProperties defaultRequestProperties,
+ @Nullable RequestProperties defaultRequestProperties,
boolean handleSetCookieRequests) {
super(/* isNetwork= */ true);
this.urlRequestCallback = new UrlRequestCallback();
this.cronetEngine = Assertions.checkNotNull(cronetEngine);
this.executor = Assertions.checkNotNull(executor);
- this.contentTypePredicate = contentTypePredicate;
this.connectTimeoutMs = connectTimeoutMs;
this.readTimeoutMs = readTimeoutMs;
this.resetTimeoutOnRedirects = resetTimeoutOnRedirects;
@@ -282,6 +364,17 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
operation = new ConditionVariable();
}
+ /**
+ * Sets a content type {@link Predicate}. If a content type is rejected by the predicate then a
+ * {@link HttpDataSource.InvalidContentTypeException} is thrown from {@link #open(DataSpec)}.
+ *
+ * @param contentTypePredicate The content type {@link Predicate}, or {@code null} to clear a
+ * predicate that was previously set.
+ */
+ public void setContentTypePredicate(@Nullable Predicate contentTypePredicate) {
+ this.contentTypePredicate = contentTypePredicate;
+ }
+
// HttpDataSource implementation.
@Override
@@ -305,6 +398,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
}
@Override
+ @Nullable
public Uri getUri() {
return responseInfo == null ? null : Uri.parse(responseInfo.getUrl());
}
@@ -317,22 +411,23 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
operation.close();
resetConnectTimeout();
currentDataSpec = dataSpec;
+ UrlRequest urlRequest;
try {
- currentUrlRequest = buildRequestBuilder(dataSpec).build();
+ urlRequest = buildRequestBuilder(dataSpec).build();
+ currentUrlRequest = urlRequest;
} catch (IOException e) {
- throw new OpenException(e, currentDataSpec, Status.IDLE);
+ throw new OpenException(e, dataSpec, Status.IDLE);
}
- currentUrlRequest.start();
+ urlRequest.start();
transferInitializing(dataSpec);
try {
boolean connectionOpened = blockUntilConnectTimeout();
if (exception != null) {
- throw new OpenException(exception, currentDataSpec, getStatus(currentUrlRequest));
+ throw new OpenException(exception, dataSpec, getStatus(urlRequest));
} else if (!connectionOpened) {
// The timeout was reached before the connection was opened.
- throw new OpenException(
- new SocketTimeoutException(), dataSpec, getStatus(currentUrlRequest));
+ throw new OpenException(new SocketTimeoutException(), dataSpec, getStatus(urlRequest));
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
@@ -340,6 +435,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
}
// Check for a valid response code.
+ UrlResponseInfo responseInfo = Assertions.checkNotNull(this.responseInfo);
int responseCode = responseInfo.getHttpStatusCode();
if (responseCode < 200 || responseCode > 299) {
InvalidResponseCodeException exception =
@@ -347,7 +443,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
responseCode,
responseInfo.getHttpStatusText(),
responseInfo.getAllHeaders(),
- currentDataSpec);
+ dataSpec);
if (responseCode == 416) {
exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE));
}
@@ -355,11 +451,12 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
}
// Check for a valid content type.
+ Predicate contentTypePredicate = this.contentTypePredicate;
if (contentTypePredicate != null) {
List contentTypeHeaders = responseInfo.getAllHeaders().get(CONTENT_TYPE);
String contentType = isEmpty(contentTypeHeaders) ? null : contentTypeHeaders.get(0);
- if (!contentTypePredicate.evaluate(contentType)) {
- throw new InvalidContentTypeException(contentType, currentDataSpec);
+ if (contentType != null && !contentTypePredicate.evaluate(contentType)) {
+ throw new InvalidContentTypeException(contentType, dataSpec);
}
}
@@ -369,7 +466,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
bytesToSkip = responseCode == 200 && dataSpec.position != 0 ? dataSpec.position : 0;
// Calculate the content length.
- if (!getIsCompressed(responseInfo)) {
+ if (!isCompressed(responseInfo)) {
if (dataSpec.length != C.LENGTH_UNSET) {
bytesRemaining = dataSpec.length;
} else {
@@ -378,7 +475,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
} else {
// If the response is compressed then the content length will be that of the compressed data
// which isn't what we want. Always use the dataSpec length in this case.
- bytesRemaining = currentDataSpec.length;
+ bytesRemaining = dataSpec.length;
}
opened = true;
@@ -397,37 +494,19 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
return C.RESULT_END_OF_INPUT;
}
+ ByteBuffer readBuffer = this.readBuffer;
if (readBuffer == null) {
readBuffer = ByteBuffer.allocateDirect(READ_BUFFER_SIZE_BYTES);
readBuffer.limit(0);
+ this.readBuffer = readBuffer;
}
while (!readBuffer.hasRemaining()) {
// Fill readBuffer with more data from Cronet.
operation.close();
readBuffer.clear();
- currentUrlRequest.read(readBuffer);
- try {
- if (!operation.block(readTimeoutMs)) {
- throw new SocketTimeoutException();
- }
- } catch (InterruptedException e) {
- // The operation is ongoing so replace readBuffer to avoid it being written to by this
- // operation during a subsequent request.
- readBuffer = null;
- Thread.currentThread().interrupt();
- throw new HttpDataSourceException(
- new InterruptedIOException(e), currentDataSpec, HttpDataSourceException.TYPE_READ);
- } catch (SocketTimeoutException e) {
- // The operation is ongoing so replace readBuffer to avoid it being written to by this
- // operation during a subsequent request.
- readBuffer = null;
- throw new HttpDataSourceException(e, currentDataSpec, HttpDataSourceException.TYPE_READ);
- }
+ readInternal(castNonNull(readBuffer));
- if (exception != null) {
- throw new HttpDataSourceException(exception, currentDataSpec,
- HttpDataSourceException.TYPE_READ);
- } else if (finished) {
+ if (finished) {
bytesRemaining = 0;
return C.RESULT_END_OF_INPUT;
} else {
@@ -452,6 +531,115 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
return bytesRead;
}
+ /**
+ * Reads up to {@code buffer.remaining()} bytes of data and stores them into {@code buffer},
+ * starting at {@code buffer.position()}. Advances the position of the buffer by the number of
+ * bytes read and returns this length.
+ *
+ * If there is an error, a {@link HttpDataSourceException} is thrown and the contents of {@code
+ * buffer} should be ignored. If the exception has error code {@code
+ * HttpDataSourceException.TYPE_READ}, note that Cronet may continue writing into {@code buffer}
+ * after the method has returned. Thus the caller should not attempt to reuse the buffer.
+ *
+ *
If {@code buffer.remaining()} is zero then 0 is returned. Otherwise, if no data is available
+ * because the end of the opened range has been reached, then {@link C#RESULT_END_OF_INPUT} is
+ * returned. Otherwise, the call will block until at least one byte of data has been read and the
+ * number of bytes read is returned.
+ *
+ *
Passed buffer must be direct ByteBuffer. If you have a non-direct ByteBuffer, consider the
+ * alternative read method with its backed array.
+ *
+ * @param buffer The ByteBuffer into which the read data should be stored. Must be a direct
+ * ByteBuffer.
+ * @return The number of bytes read, or {@link C#RESULT_END_OF_INPUT} if no data is available
+ * because the end of the opened range has been reached.
+ * @throws HttpDataSourceException If an error occurs reading from the source.
+ * @throws IllegalArgumentException If {@code buffer} is not a direct ByteBuffer.
+ */
+ public int read(ByteBuffer buffer) throws HttpDataSourceException {
+ Assertions.checkState(opened);
+
+ if (!buffer.isDirect()) {
+ throw new IllegalArgumentException("Passed buffer is not a direct ByteBuffer");
+ }
+ if (!buffer.hasRemaining()) {
+ return 0;
+ } else if (bytesRemaining == 0) {
+ return C.RESULT_END_OF_INPUT;
+ }
+ int readLength = buffer.remaining();
+
+ if (readBuffer != null) {
+ // Skip all the bytes we can from readBuffer if there are still bytes to skip.
+ if (bytesToSkip != 0) {
+ if (bytesToSkip >= readBuffer.remaining()) {
+ bytesToSkip -= readBuffer.remaining();
+ readBuffer.position(readBuffer.limit());
+ } else {
+ readBuffer.position(readBuffer.position() + (int) bytesToSkip);
+ bytesToSkip = 0;
+ }
+ }
+
+ // If there is existing data in the readBuffer, read as much as possible. Return if any read.
+ int copyBytes = copyByteBuffer(/* src= */ readBuffer, /* dst= */ buffer);
+ if (copyBytes != 0) {
+ if (bytesRemaining != C.LENGTH_UNSET) {
+ bytesRemaining -= copyBytes;
+ }
+ bytesTransferred(copyBytes);
+ return copyBytes;
+ }
+ }
+
+ boolean readMore = true;
+ while (readMore) {
+ // If bytesToSkip > 0, read into intermediate buffer that we can discard instead of caller's
+ // buffer. If we do not need to skip bytes, we may write to buffer directly.
+ final boolean useCallerBuffer = bytesToSkip == 0;
+
+ operation.close();
+
+ if (!useCallerBuffer) {
+ if (readBuffer == null) {
+ readBuffer = ByteBuffer.allocateDirect(READ_BUFFER_SIZE_BYTES);
+ } else {
+ readBuffer.clear();
+ }
+ if (bytesToSkip < READ_BUFFER_SIZE_BYTES) {
+ readBuffer.limit((int) bytesToSkip);
+ }
+ }
+
+ // Fill buffer with more data from Cronet.
+ readInternal(useCallerBuffer ? buffer : castNonNull(readBuffer));
+
+ if (finished) {
+ bytesRemaining = 0;
+ return C.RESULT_END_OF_INPUT;
+ } else {
+ // The operation didn't time out, fail or finish, and therefore data must have been read.
+ Assertions.checkState(
+ useCallerBuffer
+ ? readLength > buffer.remaining()
+ : castNonNull(readBuffer).position() > 0);
+ // If we meant to skip bytes, subtract what was left and repeat, otherwise, continue.
+ if (useCallerBuffer) {
+ readMore = false;
+ } else {
+ bytesToSkip -= castNonNull(readBuffer).position();
+ }
+ }
+ }
+
+ final int bytesRead = readLength - buffer.remaining();
+ if (bytesRemaining != C.LENGTH_UNSET) {
+ bytesRemaining -= bytesRead;
+ }
+ bytesTransferred(bytesRead);
+ return bytesRead;
+ }
+
@Override
public synchronized void close() {
if (currentUrlRequest != null) {
@@ -524,7 +712,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
}
requestBuilder.addHeader("Range", rangeValue.toString());
}
- // TODO: Uncomment when https://bugs.chromium.org/p/chromium/issues/detail?id=767025 is fixed
+ // TODO: Uncomment when https://bugs.chromium.org/p/chromium/issues/detail?id=711810 is fixed
// (adjusting the code as necessary).
// Force identity encoding unless gzip is allowed.
// if (!dataSpec.isFlagSet(DataSpec.FLAG_ALLOW_GZIP)) {
@@ -553,7 +741,49 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
currentConnectTimeoutMs = clock.elapsedRealtime() + connectTimeoutMs;
}
- private static boolean getIsCompressed(UrlResponseInfo info) {
+ /**
+ * Reads up to {@code buffer.remaining()} bytes of data from {@code currentUrlRequest} and stores
+ * them into {@code buffer}. If there is an error and {@code buffer == readBuffer}, then it resets
+ * the current {@code readBuffer} object so that it is not reused in the future.
+ *
+ * @param buffer The ByteBuffer into which the read data is stored. Must be a direct ByteBuffer.
+ * @throws HttpDataSourceException If an error occurs reading from the source.
+ */
+ @SuppressWarnings("ReferenceEquality")
+ private void readInternal(ByteBuffer buffer) throws HttpDataSourceException {
+ castNonNull(currentUrlRequest).read(buffer);
+ try {
+ if (!operation.block(readTimeoutMs)) {
+ throw new SocketTimeoutException();
+ }
+ } catch (InterruptedException e) {
+ // The operation is ongoing so replace buffer to avoid it being written to by this
+ // operation during a subsequent request.
+ if (buffer == readBuffer) {
+ readBuffer = null;
+ }
+ Thread.currentThread().interrupt();
+ throw new HttpDataSourceException(
+ new InterruptedIOException(e),
+ castNonNull(currentDataSpec),
+ HttpDataSourceException.TYPE_READ);
+ } catch (SocketTimeoutException e) {
+ // The operation is ongoing so replace buffer to avoid it being written to by this
+ // operation during a subsequent request.
+ if (buffer == readBuffer) {
+ readBuffer = null;
+ }
+ throw new HttpDataSourceException(
+ e, castNonNull(currentDataSpec), HttpDataSourceException.TYPE_READ);
+ }
+
+ if (exception != null) {
+ throw new HttpDataSourceException(
+ exception, castNonNull(currentDataSpec), HttpDataSourceException.TYPE_READ);
+ }
+ }
+
+ private static boolean isCompressed(UrlResponseInfo info) {
for (Map.Entry entry : info.getAllHeadersAsList()) {
if (entry.getKey().equalsIgnoreCase("Content-Encoding")) {
return !entry.getValue().equalsIgnoreCase("identity");
@@ -631,10 +861,22 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
return statusHolder[0];
}
- private static boolean isEmpty(List list) {
+ @EnsuresNonNullIf(result = false, expression = "#1")
+ private static boolean isEmpty(@Nullable List list) {
return list == null || list.isEmpty();
}
+ // Copy as much as possible from the src buffer into dst buffer.
+ // Returns the number of bytes copied.
+ private static int copyByteBuffer(ByteBuffer src, ByteBuffer dst) {
+ int remaining = Math.min(src.remaining(), dst.remaining());
+ int limit = src.limit();
+ src.limit(src.position() + remaining);
+ dst.put(src);
+ src.limit(limit);
+ return remaining;
+ }
+
private final class UrlRequestCallback extends UrlRequest.Callback {
@Override
@@ -643,13 +885,15 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
if (request != currentUrlRequest) {
return;
}
- if (currentDataSpec.httpMethod == DataSpec.HTTP_METHOD_POST) {
+ UrlRequest urlRequest = Assertions.checkNotNull(currentUrlRequest);
+ DataSpec dataSpec = Assertions.checkNotNull(currentDataSpec);
+ if (dataSpec.httpMethod == DataSpec.HTTP_METHOD_POST) {
int responseCode = info.getHttpStatusCode();
// The industry standard is to disregard POST redirects when the status code is 307 or 308.
if (responseCode == 307 || responseCode == 308) {
exception =
new InvalidResponseCodeException(
- responseCode, info.getHttpStatusText(), info.getAllHeaders(), currentDataSpec);
+ responseCode, info.getHttpStatusText(), info.getAllHeaders(), dataSpec);
operation.open();
return;
}
@@ -658,40 +902,46 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
resetConnectTimeout();
}
- Map> headers = info.getAllHeaders();
- if (!handleSetCookieRequests || isEmpty(headers.get(SET_COOKIE))) {
+ if (!handleSetCookieRequests) {
request.followRedirect();
- } else {
- currentUrlRequest.cancel();
- DataSpec redirectUrlDataSpec;
- if (currentDataSpec.httpMethod == DataSpec.HTTP_METHOD_POST) {
- // For POST redirects that aren't 307 or 308, the redirect is followed but request is
- // transformed into a GET.
- redirectUrlDataSpec =
- new DataSpec(
- Uri.parse(newLocationUrl),
- DataSpec.HTTP_METHOD_GET,
- /* httpBody= */ null,
- currentDataSpec.absoluteStreamPosition,
- currentDataSpec.position,
- currentDataSpec.length,
- currentDataSpec.key,
- currentDataSpec.flags);
- } else {
- redirectUrlDataSpec = currentDataSpec.withUri(Uri.parse(newLocationUrl));
- }
- UrlRequest.Builder requestBuilder;
- try {
- requestBuilder = buildRequestBuilder(redirectUrlDataSpec);
- } catch (IOException e) {
- exception = e;
- return;
- }
- String cookieHeadersValue = parseCookies(headers.get(SET_COOKIE));
- attachCookies(requestBuilder, cookieHeadersValue);
- currentUrlRequest = requestBuilder.build();
- currentUrlRequest.start();
+ return;
}
+
+ List setCookieHeaders = info.getAllHeaders().get(SET_COOKIE);
+ if (isEmpty(setCookieHeaders)) {
+ request.followRedirect();
+ return;
+ }
+
+ urlRequest.cancel();
+ DataSpec redirectUrlDataSpec;
+ if (dataSpec.httpMethod == DataSpec.HTTP_METHOD_POST) {
+ // For POST redirects that aren't 307 or 308, the redirect is followed but request is
+ // transformed into a GET.
+ redirectUrlDataSpec =
+ new DataSpec(
+ Uri.parse(newLocationUrl),
+ DataSpec.HTTP_METHOD_GET,
+ /* httpBody= */ null,
+ dataSpec.absoluteStreamPosition,
+ dataSpec.position,
+ dataSpec.length,
+ dataSpec.key,
+ dataSpec.flags);
+ } else {
+ redirectUrlDataSpec = dataSpec.withUri(Uri.parse(newLocationUrl));
+ }
+ UrlRequest.Builder requestBuilder;
+ try {
+ requestBuilder = buildRequestBuilder(redirectUrlDataSpec);
+ } catch (IOException e) {
+ exception = e;
+ return;
+ }
+ String cookieHeadersValue = parseCookies(setCookieHeaders);
+ attachCookies(requestBuilder, cookieHeadersValue);
+ currentUrlRequest = requestBuilder.build();
+ currentUrlRequest.start();
}
@Override
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
index 93edb4e893..4086011b4f 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
@@ -20,9 +20,7 @@ import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
import com.google.android.exoplayer2.upstream.HttpDataSource;
import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory;
import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
-import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidContentTypeException;
import com.google.android.exoplayer2.upstream.TransferListener;
-import com.google.android.exoplayer2.util.Predicate;
import java.util.concurrent.Executor;
import org.chromium.net.CronetEngine;
@@ -45,8 +43,7 @@ public final class CronetDataSourceFactory extends BaseFactory {
private final CronetEngineWrapper cronetEngineWrapper;
private final Executor executor;
- private final Predicate contentTypePredicate;
- private final @Nullable TransferListener transferListener;
+ @Nullable private final TransferListener transferListener;
private final int connectTimeoutMs;
private final int readTimeoutMs;
private final boolean resetTimeoutOnRedirects;
@@ -64,21 +61,16 @@ public final class CronetDataSourceFactory extends BaseFactory {
*
* @param cronetEngineWrapper A {@link CronetEngineWrapper}.
* @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
- * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
- * predicate then an {@link InvalidContentTypeException} is thrown from {@link
- * CronetDataSource#open}.
* @param fallbackFactory A {@link HttpDataSource.Factory} which is used as a fallback in case no
* suitable CronetEngine can be build.
*/
public CronetDataSourceFactory(
CronetEngineWrapper cronetEngineWrapper,
Executor executor,
- Predicate contentTypePredicate,
HttpDataSource.Factory fallbackFactory) {
this(
cronetEngineWrapper,
executor,
- contentTypePredicate,
/* transferListener= */ null,
DEFAULT_CONNECT_TIMEOUT_MILLIS,
DEFAULT_READ_TIMEOUT_MILLIS,
@@ -98,20 +90,15 @@ public final class CronetDataSourceFactory extends BaseFactory {
*
* @param cronetEngineWrapper A {@link CronetEngineWrapper}.
* @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
- * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
- * predicate then an {@link InvalidContentTypeException} is thrown from {@link
- * CronetDataSource#open}.
* @param userAgent A user agent used to create a fallback HttpDataSource if needed.
*/
public CronetDataSourceFactory(
CronetEngineWrapper cronetEngineWrapper,
Executor executor,
- Predicate contentTypePredicate,
String userAgent) {
this(
cronetEngineWrapper,
executor,
- contentTypePredicate,
/* transferListener= */ null,
DEFAULT_CONNECT_TIMEOUT_MILLIS,
DEFAULT_READ_TIMEOUT_MILLIS,
@@ -132,9 +119,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
*
* @param cronetEngineWrapper A {@link CronetEngineWrapper}.
* @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
- * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
- * predicate then an {@link InvalidContentTypeException} is thrown from {@link
- * CronetDataSource#open}.
* @param connectTimeoutMs The connection timeout, in milliseconds.
* @param readTimeoutMs The read timeout, in milliseconds.
* @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
@@ -143,7 +127,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
public CronetDataSourceFactory(
CronetEngineWrapper cronetEngineWrapper,
Executor executor,
- Predicate contentTypePredicate,
int connectTimeoutMs,
int readTimeoutMs,
boolean resetTimeoutOnRedirects,
@@ -151,7 +134,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
this(
cronetEngineWrapper,
executor,
- contentTypePredicate,
/* transferListener= */ null,
DEFAULT_CONNECT_TIMEOUT_MILLIS,
DEFAULT_READ_TIMEOUT_MILLIS,
@@ -172,9 +154,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
*
* @param cronetEngineWrapper A {@link CronetEngineWrapper}.
* @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
- * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
- * predicate then an {@link InvalidContentTypeException} is thrown from {@link
- * CronetDataSource#open}.
* @param connectTimeoutMs The connection timeout, in milliseconds.
* @param readTimeoutMs The read timeout, in milliseconds.
* @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
@@ -184,7 +163,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
public CronetDataSourceFactory(
CronetEngineWrapper cronetEngineWrapper,
Executor executor,
- Predicate contentTypePredicate,
int connectTimeoutMs,
int readTimeoutMs,
boolean resetTimeoutOnRedirects,
@@ -192,7 +170,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
this(
cronetEngineWrapper,
executor,
- contentTypePredicate,
/* transferListener= */ null,
connectTimeoutMs,
readTimeoutMs,
@@ -212,9 +189,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
*
* @param cronetEngineWrapper A {@link CronetEngineWrapper}.
* @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
- * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
- * predicate then an {@link InvalidContentTypeException} is thrown from {@link
- * CronetDataSource#open}.
* @param transferListener An optional listener.
* @param fallbackFactory A {@link HttpDataSource.Factory} which is used as a fallback in case no
* suitable CronetEngine can be build.
@@ -222,11 +196,16 @@ public final class CronetDataSourceFactory extends BaseFactory {
public CronetDataSourceFactory(
CronetEngineWrapper cronetEngineWrapper,
Executor executor,
- Predicate contentTypePredicate,
@Nullable TransferListener transferListener,
HttpDataSource.Factory fallbackFactory) {
- this(cronetEngineWrapper, executor, contentTypePredicate, transferListener,
- DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS, false, fallbackFactory);
+ this(
+ cronetEngineWrapper,
+ executor,
+ transferListener,
+ DEFAULT_CONNECT_TIMEOUT_MILLIS,
+ DEFAULT_READ_TIMEOUT_MILLIS,
+ false,
+ fallbackFactory);
}
/**
@@ -241,22 +220,27 @@ public final class CronetDataSourceFactory extends BaseFactory {
*
* @param cronetEngineWrapper A {@link CronetEngineWrapper}.
* @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
- * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
- * predicate then an {@link InvalidContentTypeException} is thrown from {@link
- * CronetDataSource#open}.
* @param transferListener An optional listener.
* @param userAgent A user agent used to create a fallback HttpDataSource if needed.
*/
public CronetDataSourceFactory(
CronetEngineWrapper cronetEngineWrapper,
Executor executor,
- Predicate contentTypePredicate,
@Nullable TransferListener transferListener,
String userAgent) {
- this(cronetEngineWrapper, executor, contentTypePredicate, transferListener,
- DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS, false,
- new DefaultHttpDataSourceFactory(userAgent, transferListener,
- DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS, false));
+ this(
+ cronetEngineWrapper,
+ executor,
+ transferListener,
+ DEFAULT_CONNECT_TIMEOUT_MILLIS,
+ DEFAULT_READ_TIMEOUT_MILLIS,
+ false,
+ new DefaultHttpDataSourceFactory(
+ userAgent,
+ transferListener,
+ DEFAULT_CONNECT_TIMEOUT_MILLIS,
+ DEFAULT_READ_TIMEOUT_MILLIS,
+ false));
}
/**
@@ -267,9 +251,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
*
* @param cronetEngineWrapper A {@link CronetEngineWrapper}.
* @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
- * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
- * predicate then an {@link InvalidContentTypeException} is thrown from {@link
- * CronetDataSource#open}.
* @param transferListener An optional listener.
* @param connectTimeoutMs The connection timeout, in milliseconds.
* @param readTimeoutMs The read timeout, in milliseconds.
@@ -279,16 +260,20 @@ public final class CronetDataSourceFactory extends BaseFactory {
public CronetDataSourceFactory(
CronetEngineWrapper cronetEngineWrapper,
Executor executor,
- Predicate contentTypePredicate,
@Nullable TransferListener transferListener,
int connectTimeoutMs,
int readTimeoutMs,
boolean resetTimeoutOnRedirects,
String userAgent) {
- this(cronetEngineWrapper, executor, contentTypePredicate, transferListener,
- DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS, resetTimeoutOnRedirects,
- new DefaultHttpDataSourceFactory(userAgent, transferListener, connectTimeoutMs,
- readTimeoutMs, resetTimeoutOnRedirects));
+ this(
+ cronetEngineWrapper,
+ executor,
+ transferListener,
+ DEFAULT_CONNECT_TIMEOUT_MILLIS,
+ DEFAULT_READ_TIMEOUT_MILLIS,
+ resetTimeoutOnRedirects,
+ new DefaultHttpDataSourceFactory(
+ userAgent, transferListener, connectTimeoutMs, readTimeoutMs, resetTimeoutOnRedirects));
}
/**
@@ -299,9 +284,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
*
* @param cronetEngineWrapper A {@link CronetEngineWrapper}.
* @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
- * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
- * predicate then an {@link InvalidContentTypeException} is thrown from {@link
- * CronetDataSource#open}.
* @param transferListener An optional listener.
* @param connectTimeoutMs The connection timeout, in milliseconds.
* @param readTimeoutMs The read timeout, in milliseconds.
@@ -312,7 +294,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
public CronetDataSourceFactory(
CronetEngineWrapper cronetEngineWrapper,
Executor executor,
- Predicate contentTypePredicate,
@Nullable TransferListener transferListener,
int connectTimeoutMs,
int readTimeoutMs,
@@ -320,7 +301,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
HttpDataSource.Factory fallbackFactory) {
this.cronetEngineWrapper = cronetEngineWrapper;
this.executor = executor;
- this.contentTypePredicate = contentTypePredicate;
this.transferListener = transferListener;
this.connectTimeoutMs = connectTimeoutMs;
this.readTimeoutMs = readTimeoutMs;
@@ -339,7 +319,6 @@ public final class CronetDataSourceFactory extends BaseFactory {
new CronetDataSource(
cronetEngine,
executor,
- contentTypePredicate,
connectTimeoutMs,
readTimeoutMs,
resetTimeoutOnRedirects,
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
index 270c1f6323..7d549be7cb 100644
--- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.ext.cronet;
import android.content.Context;
import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
@@ -37,8 +38,8 @@ public final class CronetEngineWrapper {
private static final String TAG = "CronetEngineWrapper";
- private final CronetEngine cronetEngine;
- private final @CronetEngineSource int cronetEngineSource;
+ @Nullable private final CronetEngine cronetEngine;
+ @CronetEngineSource private final int cronetEngineSource;
/**
* Source of {@link CronetEngine}. One of {@link #SOURCE_NATIVE}, {@link #SOURCE_GMS}, {@link
@@ -144,7 +145,8 @@ public final class CronetEngineWrapper {
*
* @return A {@link CronetEngineSource} value.
*/
- public @CronetEngineSource int getCronetEngineSource() {
+ @CronetEngineSource
+ public int getCronetEngineSource() {
return cronetEngineSource;
}
@@ -153,13 +155,14 @@ public final class CronetEngineWrapper {
*
* @return The CronetEngine, or null if no CronetEngine is available.
*/
+ @Nullable
/* package */ CronetEngine getCronetEngine() {
return cronetEngine;
}
private static class CronetProviderComparator implements Comparator {
- private final String gmsCoreCronetName;
+ @Nullable private final String gmsCoreCronetName;
private final boolean preferGMSCoreCronet;
// Multi-catch can only be used for API 19+ in this case.
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/package-info.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/package-info.java
new file mode 100644
index 0000000000..ec0cf8df05
--- /dev/null
+++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.cronet;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/cronet/src/test/AndroidManifest.xml b/extensions/cronet/src/test/AndroidManifest.xml
index 82cffe17c2..d6e09107a7 100644
--- a/extensions/cronet/src/test/AndroidManifest.xml
+++ b/extensions/cronet/src/test/AndroidManifest.xml
@@ -14,4 +14,6 @@
limitations under the License.
-->
-
+
+
+
diff --git a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
index 7c4c03dd87..2be369bad9 100644
--- a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
+++ b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
@@ -17,8 +17,8 @@ package com.google.android.exoplayer2.ext.cronet;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
@@ -38,7 +38,6 @@ import com.google.android.exoplayer2.upstream.HttpDataSource;
import com.google.android.exoplayer2.upstream.HttpDataSource.HttpDataSourceException;
import com.google.android.exoplayer2.upstream.TransferListener;
import com.google.android.exoplayer2.util.Clock;
-import com.google.android.exoplayer2.util.Predicate;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException;
import java.net.SocketTimeoutException;
@@ -85,7 +84,6 @@ public final class CronetDataSourceTest {
@Mock private UrlRequest.Builder mockUrlRequestBuilder;
@Mock private UrlRequest mockUrlRequest;
- @Mock private Predicate mockContentTypePredicate;
@Mock private TransferListener mockTransferListener;
@Mock private Executor mockExecutor;
@Mock private NetworkException mockNetworkException;
@@ -95,21 +93,19 @@ public final class CronetDataSourceTest {
private boolean redirectCalled;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
dataSourceUnderTest =
new CronetDataSource(
mockCronetEngine,
mockExecutor,
- mockContentTypePredicate,
TEST_CONNECT_TIMEOUT_MS,
TEST_READ_TIMEOUT_MS,
- true, // resetTimeoutOnRedirects
+ /* resetTimeoutOnRedirects= */ true,
Clock.DEFAULT,
- null,
- false);
+ /* defaultRequestProperties= */ null,
+ /* handleSetCookieRequests= */ false);
dataSourceUnderTest.addTransferListener(mockTransferListener);
- when(mockContentTypePredicate.evaluate(anyString())).thenReturn(true);
when(mockCronetEngine.newUrlRequestBuilder(
anyString(), any(UrlRequest.Callback.class), any(Executor.class)))
.thenReturn(mockUrlRequestBuilder);
@@ -283,7 +279,13 @@ public final class CronetDataSourceTest {
@Test
public void testRequestOpenValidatesContentTypePredicate() {
mockResponseStartSuccess();
- when(mockContentTypePredicate.evaluate(anyString())).thenReturn(false);
+
+ ArrayList testedContentTypes = new ArrayList<>();
+ dataSourceUnderTest.setContentTypePredicate(
+ (String input) -> {
+ testedContentTypes.add(input);
+ return false;
+ });
try {
dataSourceUnderTest.open(testDataSpec);
@@ -292,7 +294,8 @@ public final class CronetDataSourceTest {
assertThat(e instanceof HttpDataSource.InvalidContentTypeException).isTrue();
// Check for connection not automatically closed.
verify(mockUrlRequest, never()).cancel();
- verify(mockContentTypePredicate).evaluate(TEST_CONTENT_TYPE);
+ assertThat(testedContentTypes).hasSize(1);
+ assertThat(testedContentTypes.get(0)).isEqualTo(TEST_CONTENT_TYPE);
}
}
@@ -551,6 +554,260 @@ public final class CronetDataSourceTest {
assertThat(bytesRead).isEqualTo(16);
}
+ @Test
+ public void testRequestReadByteBufferTwice() throws HttpDataSourceException {
+ mockResponseStartSuccess();
+ mockReadSuccess(0, 16);
+
+ dataSourceUnderTest.open(testDataSpec);
+
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(8);
+ int bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ assertThat(bytesRead).isEqualTo(8);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(0, 8));
+
+ // Use a wrapped ByteBuffer instead of direct for coverage.
+ returnedBuffer.rewind();
+ bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(8, 8));
+ assertThat(bytesRead).isEqualTo(8);
+
+ // Separate cronet calls for each read.
+ verify(mockUrlRequest, times(2)).read(any(ByteBuffer.class));
+ verify(mockTransferListener, times(2))
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 8);
+ }
+
+ @Test
+ public void testRequestIntermixRead() throws HttpDataSourceException {
+ mockResponseStartSuccess();
+ // Chunking reads into parts 6, 7, 8, 9.
+ mockReadSuccess(0, 30);
+
+ dataSourceUnderTest.open(testDataSpec);
+
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(6);
+ int bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(0, 6));
+ assertThat(bytesRead).isEqualTo(6);
+
+ byte[] returnedBytes = new byte[7];
+ bytesRead += dataSourceUnderTest.read(returnedBytes, 0, 7);
+ assertThat(returnedBytes).isEqualTo(buildTestDataArray(6, 7));
+ assertThat(bytesRead).isEqualTo(6 + 7);
+
+ returnedBuffer = ByteBuffer.allocateDirect(8);
+ bytesRead += dataSourceUnderTest.read(returnedBuffer);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(13, 8));
+ assertThat(bytesRead).isEqualTo(6 + 7 + 8);
+
+ returnedBytes = new byte[9];
+ bytesRead += dataSourceUnderTest.read(returnedBytes, 0, 9);
+ assertThat(returnedBytes).isEqualTo(buildTestDataArray(21, 9));
+ assertThat(bytesRead).isEqualTo(6 + 7 + 8 + 9);
+
+ // First ByteBuffer call. The first byte[] call populates enough bytes for the rest.
+ verify(mockUrlRequest, times(2)).read(any(ByteBuffer.class));
+ verify(mockTransferListener, times(1))
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 6);
+ verify(mockTransferListener, times(1))
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 7);
+ verify(mockTransferListener, times(1))
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 8);
+ verify(mockTransferListener, times(1))
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 9);
+ }
+
+ @Test
+ public void testSecondRequestNoContentLengthReadByteBuffer() throws HttpDataSourceException {
+ mockResponseStartSuccess();
+ testResponseHeader.put("Content-Length", Long.toString(1L));
+ mockReadSuccess(0, 16);
+
+ // First request.
+ dataSourceUnderTest.open(testDataSpec);
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(8);
+ dataSourceUnderTest.read(returnedBuffer);
+ dataSourceUnderTest.close();
+
+ testResponseHeader.remove("Content-Length");
+ mockReadSuccess(0, 16);
+
+ // Second request.
+ dataSourceUnderTest.open(testDataSpec);
+ returnedBuffer = ByteBuffer.allocateDirect(16);
+ returnedBuffer.limit(10);
+ int bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ assertThat(bytesRead).isEqualTo(10);
+ returnedBuffer.limit(returnedBuffer.capacity());
+ bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ assertThat(bytesRead).isEqualTo(6);
+ returnedBuffer.rewind();
+ bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ assertThat(bytesRead).isEqualTo(C.RESULT_END_OF_INPUT);
+ }
+
+ @Test
+ public void testRangeRequestWith206ResponseReadByteBuffer() throws HttpDataSourceException {
+ mockResponseStartSuccess();
+ mockReadSuccess(1000, 5000);
+ testUrlResponseInfo = createUrlResponseInfo(206); // Server supports range requests.
+ testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null);
+
+ dataSourceUnderTest.open(testDataSpec);
+
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(16);
+ int bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ assertThat(bytesRead).isEqualTo(16);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(1000, 16));
+ verify(mockTransferListener)
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 16);
+ }
+
+ @Test
+ public void testRangeRequestWith200ResponseReadByteBuffer() throws HttpDataSourceException {
+ // Tests for skipping bytes.
+ mockResponseStartSuccess();
+ mockReadSuccess(0, 7000);
+ testUrlResponseInfo = createUrlResponseInfo(200); // Server does not support range requests.
+ testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null);
+
+ dataSourceUnderTest.open(testDataSpec);
+
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(16);
+ int bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ assertThat(bytesRead).isEqualTo(16);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(1000, 16));
+ verify(mockTransferListener)
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 16);
+ }
+
+ @Test
+ public void testReadByteBufferWithUnsetLength() throws HttpDataSourceException {
+ testResponseHeader.remove("Content-Length");
+ mockResponseStartSuccess();
+ mockReadSuccess(0, 16);
+
+ dataSourceUnderTest.open(testDataSpec);
+
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(16);
+ returnedBuffer.limit(8);
+ int bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(0, 8));
+ assertThat(bytesRead).isEqualTo(8);
+ verify(mockTransferListener)
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 8);
+ }
+
+ @Test
+ public void testReadByteBufferReturnsWhatItCan() throws HttpDataSourceException {
+ mockResponseStartSuccess();
+ mockReadSuccess(0, 16);
+
+ dataSourceUnderTest.open(testDataSpec);
+
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(24);
+ int bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(0, 16));
+ assertThat(bytesRead).isEqualTo(16);
+ verify(mockTransferListener)
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 16);
+ }
+
+ @Test
+ public void testOverreadByteBuffer() throws HttpDataSourceException {
+ testDataSpec = new DataSpec(Uri.parse(TEST_URL), 0, 16, null);
+ testResponseHeader.put("Content-Length", Long.toString(16L));
+ mockResponseStartSuccess();
+ mockReadSuccess(0, 16);
+
+ dataSourceUnderTest.open(testDataSpec);
+
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(8);
+ int bytesRead = dataSourceUnderTest.read(returnedBuffer);
+ assertThat(bytesRead).isEqualTo(8);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(0, 8));
+
+ // The current buffer is kept if not completely consumed by DataSource reader.
+ returnedBuffer = ByteBuffer.allocateDirect(6);
+ bytesRead += dataSourceUnderTest.read(returnedBuffer);
+ assertThat(bytesRead).isEqualTo(14);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(8, 6));
+
+ // 2 bytes left at this point.
+ returnedBuffer = ByteBuffer.allocateDirect(8);
+ bytesRead += dataSourceUnderTest.read(returnedBuffer);
+ assertThat(bytesRead).isEqualTo(16);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(14, 2));
+
+ // Called on each.
+ verify(mockUrlRequest, times(3)).read(any(ByteBuffer.class));
+ verify(mockTransferListener, times(1))
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 8);
+ verify(mockTransferListener, times(1))
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 6);
+ verify(mockTransferListener, times(1))
+ .onBytesTransferred(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, 2);
+
+ // Now we already returned the 16 bytes initially asked.
+ // Try to read again even though all requested 16 bytes are already returned.
+ // Return C.RESULT_END_OF_INPUT
+ returnedBuffer = ByteBuffer.allocateDirect(16);
+ int bytesOverRead = dataSourceUnderTest.read(returnedBuffer);
+ assertThat(bytesOverRead).isEqualTo(C.RESULT_END_OF_INPUT);
+ assertThat(returnedBuffer.position()).isEqualTo(0);
+ // C.RESULT_END_OF_INPUT should not be reported though the TransferListener.
+ verify(mockTransferListener, never())
+ .onBytesTransferred(
+ dataSourceUnderTest, testDataSpec, /* isNetwork= */ true, C.RESULT_END_OF_INPUT);
+ // Number of calls to cronet should not have increased.
+ verify(mockUrlRequest, times(3)).read(any(ByteBuffer.class));
+ // Check for connection not automatically closed.
+ verify(mockUrlRequest, never()).cancel();
+ assertThat(bytesRead).isEqualTo(16);
+ }
+
+ @Test
+ public void testClosedMeansClosedReadByteBuffer() throws HttpDataSourceException {
+ mockResponseStartSuccess();
+ mockReadSuccess(0, 16);
+
+ int bytesRead = 0;
+ dataSourceUnderTest.open(testDataSpec);
+
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(16);
+ returnedBuffer.limit(8);
+ bytesRead += dataSourceUnderTest.read(returnedBuffer);
+ returnedBuffer.flip();
+ assertThat(copyByteBufferToArray(returnedBuffer)).isEqualTo(buildTestDataArray(0, 8));
+ assertThat(bytesRead).isEqualTo(8);
+
+ dataSourceUnderTest.close();
+ verify(mockTransferListener)
+ .onTransferEnd(dataSourceUnderTest, testDataSpec, /* isNetwork= */ true);
+
+ try {
+ bytesRead += dataSourceUnderTest.read(returnedBuffer);
+ fail();
+ } catch (IllegalStateException e) {
+ // Expected.
+ }
+
+ // 16 bytes were attempted but only 8 should have been successfully read.
+ assertThat(bytesRead).isEqualTo(8);
+ }
+
@Test
public void testConnectTimeout() throws InterruptedException {
long startTimeMs = SystemClock.elapsedRealtime();
@@ -734,7 +991,6 @@ public final class CronetDataSourceTest {
new CronetDataSource(
mockCronetEngine,
mockExecutor,
- mockContentTypePredicate,
TEST_CONNECT_TIMEOUT_MS,
TEST_READ_TIMEOUT_MS,
true, // resetTimeoutOnRedirects
@@ -765,13 +1021,12 @@ public final class CronetDataSourceTest {
new CronetDataSource(
mockCronetEngine,
mockExecutor,
- mockContentTypePredicate,
TEST_CONNECT_TIMEOUT_MS,
TEST_READ_TIMEOUT_MS,
- true, // resetTimeoutOnRedirects
+ /* resetTimeoutOnRedirects= */ true,
Clock.DEFAULT,
- null,
- true);
+ /* defaultRequestProperties= */ null,
+ /* handleSetCookieRequests= */ true);
dataSourceUnderTest.addTransferListener(mockTransferListener);
dataSourceUnderTest.setRequestProperty("Content-Type", TEST_CONTENT_TYPE);
@@ -804,13 +1059,12 @@ public final class CronetDataSourceTest {
new CronetDataSource(
mockCronetEngine,
mockExecutor,
- mockContentTypePredicate,
TEST_CONNECT_TIMEOUT_MS,
TEST_READ_TIMEOUT_MS,
- true, // resetTimeoutOnRedirects
+ /* resetTimeoutOnRedirects= */ true,
Clock.DEFAULT,
- null,
- true);
+ /* defaultRequestProperties= */ null,
+ /* handleSetCookieRequests= */ true);
dataSourceUnderTest.addTransferListener(mockTransferListener);
mockSingleRedirectSuccess();
mockFollowRedirectSuccess();
@@ -855,6 +1109,36 @@ public final class CronetDataSourceTest {
}
}
+ @Test
+ public void testReadByteBufferFailure() throws HttpDataSourceException {
+ mockResponseStartSuccess();
+ mockReadFailure();
+
+ dataSourceUnderTest.open(testDataSpec);
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(8);
+ try {
+ dataSourceUnderTest.read(returnedBuffer);
+ fail("dataSourceUnderTest.read() returned, but IOException expected");
+ } catch (IOException e) {
+ // Expected.
+ }
+ }
+
+ @Test
+ public void testReadNonDirectedByteBufferFailure() throws HttpDataSourceException {
+ mockResponseStartSuccess();
+ mockReadFailure();
+
+ dataSourceUnderTest.open(testDataSpec);
+ byte[] returnedBuffer = new byte[8];
+ try {
+ dataSourceUnderTest.read(ByteBuffer.wrap(returnedBuffer));
+ fail("dataSourceUnderTest.read() returned, but IllegalArgumentException expected");
+ } catch (IllegalArgumentException e) {
+ // Expected.
+ }
+ }
+
@Test
public void testReadInterrupted() throws HttpDataSourceException, InterruptedException {
mockResponseStartSuccess();
@@ -886,6 +1170,37 @@ public final class CronetDataSourceTest {
timedOutLatch.await();
}
+ @Test
+ public void testReadByteBufferInterrupted() throws HttpDataSourceException, InterruptedException {
+ mockResponseStartSuccess();
+ dataSourceUnderTest.open(testDataSpec);
+
+ final ConditionVariable startCondition = buildReadStartedCondition();
+ final CountDownLatch timedOutLatch = new CountDownLatch(1);
+ ByteBuffer returnedBuffer = ByteBuffer.allocateDirect(8);
+ Thread thread =
+ new Thread() {
+ @Override
+ public void run() {
+ try {
+ dataSourceUnderTest.read(returnedBuffer);
+ fail();
+ } catch (HttpDataSourceException e) {
+ // Expected.
+ assertThat(e.getCause() instanceof CronetDataSource.InterruptedIOException).isTrue();
+ timedOutLatch.countDown();
+ }
+ }
+ };
+ thread.start();
+ startCondition.block();
+
+ assertNotCountedDown(timedOutLatch);
+ // Now we interrupt.
+ thread.interrupt();
+ timedOutLatch.await();
+ }
+
@Test
public void testAllowDirectExecutor() throws HttpDataSourceException {
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null);
@@ -1064,4 +1379,17 @@ public final class CronetDataSourceTest {
testBuffer.flip();
return testBuffer;
}
+
+ // Returns a copy of what is remaining in the src buffer from the current position to capacity.
+ private static byte[] copyByteBufferToArray(ByteBuffer src) {
+ if (src == null) {
+ return null;
+ }
+ byte[] copy = new byte[src.remaining()];
+ int index = 0;
+ while (src.hasRemaining()) {
+ copy[index++] = src.get();
+ }
+ return copy;
+ }
}
diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle
index ffecdcd16f..2b5a6010a9 100644
--- a/extensions/ffmpeg/build.gradle
+++ b/extensions/ffmpeg/build.gradle
@@ -38,9 +38,10 @@ android {
dependencies {
implementation project(modulePrefix + 'library-core')
- implementation 'androidx.annotation:annotation:1.0.2'
+ implementation 'androidx.annotation:annotation:1.1.0'
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
- testImplementation project(modulePrefix + 'testutils-robolectric')
+ testImplementation project(modulePrefix + 'testutils')
+ testImplementation 'org.robolectric:robolectric:' + robolectricVersion
}
ext {
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
index c5d80aa32b..39d1ee4094 100644
--- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
@@ -92,8 +92,8 @@ public final class FfmpegAudioRenderer extends SimpleDecoderAudioRenderer {
}
@Override
- protected int supportsFormatInternal(DrmSessionManager drmSessionManager,
- Format format) {
+ protected int supportsFormatInternal(
+ @Nullable DrmSessionManager drmSessionManager, Format format) {
Assertions.checkNotNull(format.sampleMimeType);
if (!FfmpegLibrary.isAvailable()) {
return FORMAT_UNSUPPORTED_TYPE;
@@ -113,7 +113,7 @@ public final class FfmpegAudioRenderer extends SimpleDecoderAudioRenderer {
}
@Override
- protected FfmpegDecoder createDecoder(Format format, ExoMediaCrypto mediaCrypto)
+ protected FfmpegDecoder createDecoder(Format format, @Nullable ExoMediaCrypto mediaCrypto)
throws FfmpegDecoderException {
int initialInputBufferSize =
format.maxInputSize != Format.NO_VALUE ? format.maxInputSize : DEFAULT_INPUT_BUFFER_SIZE;
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
index 7c5864420a..c78b02aa5b 100644
--- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
@@ -42,7 +42,7 @@ import java.util.List;
private static final int DECODER_ERROR_OTHER = -2;
private final String codecName;
- private final @Nullable byte[] extraData;
+ @Nullable private final byte[] extraData;
private final @C.Encoding int encoding;
private final int outputBufferSize;
@@ -172,28 +172,49 @@ import java.util.List;
private static @Nullable byte[] getExtraData(String mimeType, List initializationData) {
switch (mimeType) {
case MimeTypes.AUDIO_AAC:
- case MimeTypes.AUDIO_ALAC:
case MimeTypes.AUDIO_OPUS:
return initializationData.get(0);
+ case MimeTypes.AUDIO_ALAC:
+ return getAlacExtraData(initializationData);
case MimeTypes.AUDIO_VORBIS:
- byte[] header0 = initializationData.get(0);
- byte[] header1 = initializationData.get(1);
- byte[] extraData = new byte[header0.length + header1.length + 6];
- extraData[0] = (byte) (header0.length >> 8);
- extraData[1] = (byte) (header0.length & 0xFF);
- System.arraycopy(header0, 0, extraData, 2, header0.length);
- extraData[header0.length + 2] = 0;
- extraData[header0.length + 3] = 0;
- extraData[header0.length + 4] = (byte) (header1.length >> 8);
- extraData[header0.length + 5] = (byte) (header1.length & 0xFF);
- System.arraycopy(header1, 0, extraData, header0.length + 6, header1.length);
- return extraData;
+ return getVorbisExtraData(initializationData);
default:
// Other codecs do not require extra data.
return null;
}
}
+ private static byte[] getAlacExtraData(List initializationData) {
+ // FFmpeg's ALAC decoder expects an ALAC atom, which contains the ALAC "magic cookie", as extra
+ // data. initializationData[0] contains only the magic cookie, and so we need to package it into
+ // an ALAC atom. See:
+ // https://ffmpeg.org/doxygen/0.6/alac_8c.html
+ // https://github.com/macosforge/alac/blob/master/ALACMagicCookieDescription.txt
+ byte[] magicCookie = initializationData.get(0);
+ int alacAtomLength = 12 + magicCookie.length;
+ ByteBuffer alacAtom = ByteBuffer.allocate(alacAtomLength);
+ alacAtom.putInt(alacAtomLength);
+ alacAtom.putInt(0x616c6163); // type=alac
+ alacAtom.putInt(0); // version=0, flags=0
+ alacAtom.put(magicCookie, /* offset= */ 0, magicCookie.length);
+ return alacAtom.array();
+ }
+
+ private static byte[] getVorbisExtraData(List initializationData) {
+ byte[] header0 = initializationData.get(0);
+ byte[] header1 = initializationData.get(1);
+ byte[] extraData = new byte[header0.length + header1.length + 6];
+ extraData[0] = (byte) (header0.length >> 8);
+ extraData[1] = (byte) (header0.length & 0xFF);
+ System.arraycopy(header0, 0, extraData, 2, header0.length);
+ extraData[header0.length + 2] = 0;
+ extraData[header0.length + 3] = 0;
+ extraData[header0.length + 4] = (byte) (header1.length >> 8);
+ extraData[header0.length + 5] = (byte) (header1.length & 0xFF);
+ System.arraycopy(header1, 0, extraData, header0.length + 6, header1.length);
+ return extraData;
+ }
+
private native long ffmpegInitialize(
String codecName,
@Nullable byte[] extraData,
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/package-info.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/package-info.java
new file mode 100644
index 0000000000..a9fedb19cb
--- /dev/null
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.ffmpeg;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/ffmpeg/src/test/AndroidManifest.xml b/extensions/ffmpeg/src/test/AndroidManifest.xml
index d53bca4ca2..6ec1cea289 100644
--- a/extensions/ffmpeg/src/test/AndroidManifest.xml
+++ b/extensions/ffmpeg/src/test/AndroidManifest.xml
@@ -14,4 +14,6 @@
limitations under the License.
-->
-
+
+
+
diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
index 06a5888404..dfac2e1c26 100644
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@@ -39,10 +39,12 @@ android {
dependencies {
implementation project(modulePrefix + 'library-core')
- implementation 'androidx.annotation:annotation:1.0.2'
+ implementation 'androidx.annotation:annotation:1.1.0'
+ compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
androidTestImplementation project(modulePrefix + 'testutils')
androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
- testImplementation project(modulePrefix + 'testutils-robolectric')
+ testImplementation project(modulePrefix + 'testutils')
+ testImplementation 'org.robolectric:robolectric:' + robolectricVersion
}
ext {
diff --git a/extensions/flac/proguard-rules.txt b/extensions/flac/proguard-rules.txt
index ee0a9fa5b5..3e52f643e7 100644
--- a/extensions/flac/proguard-rules.txt
+++ b/extensions/flac/proguard-rules.txt
@@ -9,6 +9,9 @@
-keep class com.google.android.exoplayer2.ext.flac.FlacDecoderJni {
*;
}
--keep class com.google.android.exoplayer2.util.FlacStreamInfo {
+-keep class com.google.android.exoplayer2.util.FlacStreamMetadata {
+ *;
+}
+-keep class com.google.android.exoplayer2.metadata.flac.PictureFrame {
*;
}
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java
index 435279fc45..a3770afc78 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java
@@ -52,7 +52,10 @@ public final class FlacBinarySearchSeekerTest {
FlacBinarySearchSeeker seeker =
new FlacBinarySearchSeeker(
- decoderJni.decodeMetadata(), /* firstFramePosition= */ 0, data.length, decoderJni);
+ decoderJni.decodeStreamMetadata(),
+ /* firstFramePosition= */ 0,
+ data.length,
+ decoderJni);
SeekMap seekMap = seeker.getSeekMap();
assertThat(seekMap).isNotNull();
@@ -70,7 +73,10 @@ public final class FlacBinarySearchSeekerTest {
decoderJni.setData(input);
FlacBinarySearchSeeker seeker =
new FlacBinarySearchSeeker(
- decoderJni.decodeMetadata(), /* firstFramePosition= */ 0, data.length, decoderJni);
+ decoderJni.decodeStreamMetadata(),
+ /* firstFramePosition= */ 0,
+ data.length,
+ decoderJni);
seeker.setSeekTargetUs(/* timeUs= */ 1000);
assertThat(seeker.isSeeking()).isTrue();
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
index 6008d99448..3beb4d0103 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
@@ -228,7 +228,8 @@ public final class FlacExtractorSeekTest {
}
}
- private @Nullable SeekMap extractSeekMap(FlacExtractor extractor, FakeExtractorOutput output)
+ @Nullable
+ private SeekMap extractSeekMap(FlacExtractor extractor, FakeExtractorOutput output)
throws IOException, InterruptedException {
try {
ExtractorInput input = getExtractorInputFromPosition(0);
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
index d9cbac6ad5..97f152cea4 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
public class FlacExtractorTest {
@Before
- public void setUp() throws Exception {
+ public void setUp() {
if (!FlacLibrary.isAvailable()) {
fail("Flac library not available.");
}
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
index 12ef68ee3c..c10d6fdb27 100644
--- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
+++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
@@ -82,7 +82,7 @@ public class FlacPlaybackTest {
public void run() {
Looper.prepare();
LibflacAudioRenderer audioRenderer = new LibflacAudioRenderer();
- DefaultTrackSelector trackSelector = new DefaultTrackSelector();
+ DefaultTrackSelector trackSelector = new DefaultTrackSelector(context);
player = ExoPlayerFactory.newInstance(context, new Renderer[] {audioRenderer}, trackSelector);
player.addListener(this);
MediaSource mediaSource =
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeeker.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeeker.java
index b9c6ea06dd..4bfcc003ec 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeeker.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeeker.java
@@ -19,7 +19,7 @@ import com.google.android.exoplayer2.extractor.BinarySearchSeeker;
import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.FlacStreamInfo;
+import com.google.android.exoplayer2.util.FlacStreamMetadata;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -34,20 +34,20 @@ import java.nio.ByteBuffer;
private final FlacDecoderJni decoderJni;
public FlacBinarySearchSeeker(
- FlacStreamInfo streamInfo,
+ FlacStreamMetadata streamMetadata,
long firstFramePosition,
long inputLength,
FlacDecoderJni decoderJni) {
super(
- new FlacSeekTimestampConverter(streamInfo),
+ new FlacSeekTimestampConverter(streamMetadata),
new FlacTimestampSeeker(decoderJni),
- streamInfo.durationUs(),
+ streamMetadata.durationUs(),
/* floorTimePosition= */ 0,
- /* ceilingTimePosition= */ streamInfo.totalSamples,
+ /* ceilingTimePosition= */ streamMetadata.totalSamples,
/* floorBytePosition= */ firstFramePosition,
/* ceilingBytePosition= */ inputLength,
- /* approxBytesPerFrame= */ streamInfo.getApproxBytesPerFrame(),
- /* minimumSearchRange= */ Math.max(1, streamInfo.minFrameSize));
+ /* approxBytesPerFrame= */ streamMetadata.getApproxBytesPerFrame(),
+ /* minimumSearchRange= */ Math.max(1, streamMetadata.minFrameSize));
this.decoderJni = Assertions.checkNotNull(decoderJni);
}
@@ -112,15 +112,15 @@ import java.nio.ByteBuffer;
* the timestamp for a stream seek time position.
*/
private static final class FlacSeekTimestampConverter implements SeekTimestampConverter {
- private final FlacStreamInfo streamInfo;
+ private final FlacStreamMetadata streamMetadata;
- public FlacSeekTimestampConverter(FlacStreamInfo streamInfo) {
- this.streamInfo = streamInfo;
+ public FlacSeekTimestampConverter(FlacStreamMetadata streamMetadata) {
+ this.streamMetadata = streamMetadata;
}
@Override
public long timeUsToTargetTime(long timeUs) {
- return Assertions.checkNotNull(streamInfo).getSampleIndex(timeUs);
+ return Assertions.checkNotNull(streamMetadata).getSampleIndex(timeUs);
}
}
}
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java
index 2d74bce5f1..50eb048d98 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java
@@ -15,11 +15,13 @@
*/
package com.google.android.exoplayer2.ext.flac;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
import com.google.android.exoplayer2.decoder.SimpleDecoder;
import com.google.android.exoplayer2.decoder.SimpleOutputBuffer;
-import com.google.android.exoplayer2.util.FlacStreamInfo;
+import com.google.android.exoplayer2.util.FlacStreamMetadata;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.List;
@@ -56,21 +58,20 @@ import java.util.List;
}
decoderJni = new FlacDecoderJni();
decoderJni.setData(ByteBuffer.wrap(initializationData.get(0)));
- FlacStreamInfo streamInfo;
+ FlacStreamMetadata streamMetadata;
try {
- streamInfo = decoderJni.decodeMetadata();
+ streamMetadata = decoderJni.decodeStreamMetadata();
+ } catch (ParserException e) {
+ throw new FlacDecoderException("Failed to decode StreamInfo", e);
} catch (IOException | InterruptedException e) {
// Never happens.
throw new IllegalStateException(e);
}
- if (streamInfo == null) {
- throw new FlacDecoderException("Metadata decoding failed");
- }
int initialInputBufferSize =
- maxInputBufferSize != Format.NO_VALUE ? maxInputBufferSize : streamInfo.maxFrameSize;
+ maxInputBufferSize != Format.NO_VALUE ? maxInputBufferSize : streamMetadata.maxFrameSize;
setInitialInputBufferSize(initialInputBufferSize);
- maxOutputBufferSize = streamInfo.maxDecodedFrameSize();
+ maxOutputBufferSize = streamMetadata.maxDecodedFrameSize();
}
@Override
@@ -94,6 +95,7 @@ import java.util.List;
}
@Override
+ @Nullable
protected FlacDecoderException decode(
DecoderInputBuffer inputBuffer, SimpleOutputBuffer outputBuffer, boolean reset) {
if (reset) {
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java
index de038921aa..f454e28c68 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java
@@ -15,9 +15,12 @@
*/
package com.google.android.exoplayer2.ext.flac;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.extractor.ExtractorInput;
-import com.google.android.exoplayer2.util.FlacStreamInfo;
+import com.google.android.exoplayer2.util.FlacStreamMetadata;
+import com.google.android.exoplayer2.util.Util;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -37,14 +40,14 @@ import java.nio.ByteBuffer;
}
}
- private static final int TEMP_BUFFER_SIZE = 8192; // The same buffer size which libflac has
+ private static final int TEMP_BUFFER_SIZE = 8192; // The same buffer size as libflac.
private final long nativeDecoderContext;
- private ByteBuffer byteBufferData;
- private ExtractorInput extractorInput;
+ @Nullable private ByteBuffer byteBufferData;
+ @Nullable private ExtractorInput extractorInput;
+ @Nullable private byte[] tempBuffer;
private boolean endOfExtractorInput;
- private byte[] tempBuffer;
public FlacDecoderJni() throws FlacDecoderException {
if (!FlacLibrary.isAvailable()) {
@@ -57,67 +60,79 @@ import java.nio.ByteBuffer;
}
/**
- * Sets data to be parsed by libflac.
- * @param byteBufferData Source {@link ByteBuffer}
+ * Sets the data to be parsed.
+ *
+ * @param byteBufferData Source {@link ByteBuffer}.
*/
public void setData(ByteBuffer byteBufferData) {
this.byteBufferData = byteBufferData;
this.extractorInput = null;
- this.tempBuffer = null;
}
/**
- * Sets data to be parsed by libflac.
- * @param extractorInput Source {@link ExtractorInput}
+ * Sets the data to be parsed.
+ *
+ * @param extractorInput Source {@link ExtractorInput}.
*/
public void setData(ExtractorInput extractorInput) {
this.byteBufferData = null;
this.extractorInput = extractorInput;
- if (tempBuffer == null) {
- this.tempBuffer = new byte[TEMP_BUFFER_SIZE];
- }
endOfExtractorInput = false;
+ if (tempBuffer == null) {
+ tempBuffer = new byte[TEMP_BUFFER_SIZE];
+ }
}
+ /**
+ * Returns whether the end of the data to be parsed has been reached, or true if no data was set.
+ */
public boolean isEndOfData() {
if (byteBufferData != null) {
return byteBufferData.remaining() == 0;
} else if (extractorInput != null) {
return endOfExtractorInput;
+ } else {
+ return true;
}
- return true;
+ }
+
+ /** Clears the data to be parsed. */
+ public void clearData() {
+ byteBufferData = null;
+ extractorInput = null;
}
/**
* Reads up to {@code length} bytes from the data source.
- *
- * This method blocks until at least one byte of data can be read, the end of the input is
+ *
+ *
This method blocks until at least one byte of data can be read, the end of the input is
* detected or an exception is thrown.
- *
- * This method is called from the native code.
*
* @param target A target {@link ByteBuffer} into which data should be written.
- * @return Returns the number of bytes read, or -1 on failure. It's not an error if this returns
- * zero; it just means all the data read from the source.
+ * @return Returns the number of bytes read, or -1 on failure. If all of the data has already been
+ * read from the source, then 0 is returned.
*/
+ @SuppressWarnings("unused") // Called from native code.
public int read(ByteBuffer target) throws IOException, InterruptedException {
int byteCount = target.remaining();
if (byteBufferData != null) {
byteCount = Math.min(byteCount, byteBufferData.remaining());
int originalLimit = byteBufferData.limit();
byteBufferData.limit(byteBufferData.position() + byteCount);
-
target.put(byteBufferData);
-
byteBufferData.limit(originalLimit);
} else if (extractorInput != null) {
+ ExtractorInput extractorInput = this.extractorInput;
+ byte[] tempBuffer = Util.castNonNull(this.tempBuffer);
byteCount = Math.min(byteCount, TEMP_BUFFER_SIZE);
- int read = readFromExtractorInput(0, byteCount);
+ int read = readFromExtractorInput(extractorInput, tempBuffer, /* offset= */ 0, byteCount);
if (read < 4) {
// Reading less than 4 bytes, most of the time, happens because of getting the bytes left in
// the buffer of the input. Do another read to reduce the number of calls to this method
// from the native code.
- read += readFromExtractorInput(read, byteCount - read);
+ read +=
+ readFromExtractorInput(
+ extractorInput, tempBuffer, read, /* length= */ byteCount - read);
}
byteCount = read;
target.put(tempBuffer, 0, byteCount);
@@ -127,9 +142,13 @@ import java.nio.ByteBuffer;
return byteCount;
}
- /** Decodes and consumes the StreamInfo section from the FLAC stream. */
- public FlacStreamInfo decodeMetadata() throws IOException, InterruptedException {
- return flacDecodeMetadata(nativeDecoderContext);
+ /** Decodes and consumes the metadata from the FLAC stream. */
+ public FlacStreamMetadata decodeStreamMetadata() throws IOException, InterruptedException {
+ FlacStreamMetadata streamMetadata = flacDecodeMetadata(nativeDecoderContext);
+ if (streamMetadata == null) {
+ throw new ParserException("Failed to decode stream metadata");
+ }
+ return streamMetadata;
}
/**
@@ -234,7 +253,8 @@ import java.nio.ByteBuffer;
flacRelease(nativeDecoderContext);
}
- private int readFromExtractorInput(int offset, int length)
+ private int readFromExtractorInput(
+ ExtractorInput extractorInput, byte[] tempBuffer, int offset, int length)
throws IOException, InterruptedException {
int read = extractorInput.read(tempBuffer, offset, length);
if (read == C.RESULT_END_OF_INPUT) {
@@ -246,7 +266,7 @@ import java.nio.ByteBuffer;
private native long flacInit();
- private native FlacStreamInfo flacDecodeMetadata(long context)
+ private native FlacStreamMetadata flacDecodeMetadata(long context)
throws IOException, InterruptedException;
private native int flacDecodeToBuffer(long context, ByteBuffer outputBuffer)
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
index bb72e114fe..cd91b06288 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
@@ -21,7 +21,7 @@ import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.extractor.BinarySearchSeeker;
+import com.google.android.exoplayer2.extractor.BinarySearchSeeker.OutputFrameHolder;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.extractor.ExtractorOutput;
@@ -33,7 +33,8 @@ import com.google.android.exoplayer2.extractor.SeekPoint;
import com.google.android.exoplayer2.extractor.TrackOutput;
import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.id3.Id3Decoder;
-import com.google.android.exoplayer2.util.FlacStreamInfo;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.FlacStreamMetadata;
import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.ParsableByteArray;
import java.io.IOException;
@@ -42,6 +43,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
+import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/**
* Facilitates the extraction of data from the FLAC container format.
@@ -74,23 +78,20 @@ public final class FlacExtractor implements Extractor {
*/
private static final byte[] FLAC_SIGNATURE = {'f', 'L', 'a', 'C', 0, 0, 0, 0x22};
+ private final ParsableByteArray outputBuffer;
private final Id3Peeker id3Peeker;
- private final boolean isId3MetadataDisabled;
+ private final boolean id3MetadataDisabled;
- private FlacDecoderJni decoderJni;
+ @Nullable private FlacDecoderJni decoderJni;
+ private @MonotonicNonNull ExtractorOutput extractorOutput;
+ private @MonotonicNonNull TrackOutput trackOutput;
- private ExtractorOutput extractorOutput;
- private TrackOutput trackOutput;
+ private boolean streamMetadataDecoded;
+ private @MonotonicNonNull FlacStreamMetadata streamMetadata;
+ private @MonotonicNonNull OutputFrameHolder outputFrameHolder;
- private ParsableByteArray outputBuffer;
- private ByteBuffer outputByteBuffer;
- private BinarySearchSeeker.OutputFrameHolder outputFrameHolder;
- private FlacStreamInfo streamInfo;
-
- private Metadata id3Metadata;
- private @Nullable FlacBinarySearchSeeker flacBinarySearchSeeker;
-
- private boolean readPastStreamInfo;
+ @Nullable private Metadata id3Metadata;
+ @Nullable private FlacBinarySearchSeeker binarySearchSeeker;
/** Constructs an instance with flags = 0. */
public FlacExtractor() {
@@ -103,8 +104,9 @@ public final class FlacExtractor implements Extractor {
* @param flags Flags that control the extractor's behavior.
*/
public FlacExtractor(int flags) {
+ outputBuffer = new ParsableByteArray();
id3Peeker = new Id3Peeker();
- isId3MetadataDisabled = (flags & FLAG_DISABLE_ID3_METADATA) != 0;
+ id3MetadataDisabled = (flags & FLAG_DISABLE_ID3_METADATA) != 0;
}
@Override
@@ -130,48 +132,53 @@ public final class FlacExtractor implements Extractor {
@Override
public int read(final ExtractorInput input, PositionHolder seekPosition)
throws IOException, InterruptedException {
- if (input.getPosition() == 0 && !isId3MetadataDisabled && id3Metadata == null) {
+ if (input.getPosition() == 0 && !id3MetadataDisabled && id3Metadata == null) {
id3Metadata = peekId3Data(input);
}
- decoderJni.setData(input);
- readPastStreamInfo(input);
-
- if (flacBinarySearchSeeker != null && flacBinarySearchSeeker.isSeeking()) {
- return handlePendingSeek(input, seekPosition);
- }
-
- long lastDecodePosition = decoderJni.getDecodePosition();
+ FlacDecoderJni decoderJni = initDecoderJni(input);
try {
- decoderJni.decodeSampleWithBacktrackPosition(outputByteBuffer, lastDecodePosition);
- } catch (FlacDecoderJni.FlacFrameDecodeException e) {
- throw new IOException("Cannot read frame at position " + lastDecodePosition, e);
- }
- int outputSize = outputByteBuffer.limit();
- if (outputSize == 0) {
- return RESULT_END_OF_INPUT;
- }
+ decodeStreamMetadata(input);
- writeLastSampleToOutput(outputSize, decoderJni.getLastFrameTimestamp());
- return decoderJni.isEndOfData() ? RESULT_END_OF_INPUT : RESULT_CONTINUE;
+ if (binarySearchSeeker != null && binarySearchSeeker.isSeeking()) {
+ return handlePendingSeek(input, seekPosition, outputBuffer, outputFrameHolder, trackOutput);
+ }
+
+ ByteBuffer outputByteBuffer = outputFrameHolder.byteBuffer;
+ long lastDecodePosition = decoderJni.getDecodePosition();
+ try {
+ decoderJni.decodeSampleWithBacktrackPosition(outputByteBuffer, lastDecodePosition);
+ } catch (FlacDecoderJni.FlacFrameDecodeException e) {
+ throw new IOException("Cannot read frame at position " + lastDecodePosition, e);
+ }
+ int outputSize = outputByteBuffer.limit();
+ if (outputSize == 0) {
+ return RESULT_END_OF_INPUT;
+ }
+
+ outputSample(outputBuffer, outputSize, decoderJni.getLastFrameTimestamp(), trackOutput);
+ return decoderJni.isEndOfData() ? RESULT_END_OF_INPUT : RESULT_CONTINUE;
+ } finally {
+ decoderJni.clearData();
+ }
}
@Override
public void seek(long position, long timeUs) {
if (position == 0) {
- readPastStreamInfo = false;
+ streamMetadataDecoded = false;
}
if (decoderJni != null) {
decoderJni.reset(position);
}
- if (flacBinarySearchSeeker != null) {
- flacBinarySearchSeeker.setSeekTargetUs(timeUs);
+ if (binarySearchSeeker != null) {
+ binarySearchSeeker.setSeekTargetUs(timeUs);
}
}
@Override
public void release() {
- flacBinarySearchSeeker = null;
+ binarySearchSeeker = null;
if (decoderJni != null) {
decoderJni.release();
decoderJni = null;
@@ -179,123 +186,141 @@ public final class FlacExtractor implements Extractor {
}
/**
- * Peeks ID3 tag data (if present) at the beginning of the input.
+ * Peeks ID3 tag data at the beginning of the input.
*
- * @return The first ID3 tag decoded into a {@link Metadata} object. May be null if ID3 tag is not
- * present in the input.
+ * @return The first ID3 tag {@link Metadata}, or null if an ID3 tag is not present in the input.
*/
@Nullable
private Metadata peekId3Data(ExtractorInput input) throws IOException, InterruptedException {
input.resetPeekPosition();
Id3Decoder.FramePredicate id3FramePredicate =
- isId3MetadataDisabled ? Id3Decoder.NO_FRAMES_PREDICATE : null;
+ id3MetadataDisabled ? Id3Decoder.NO_FRAMES_PREDICATE : null;
return id3Peeker.peekId3Data(input, id3FramePredicate);
}
+ @EnsuresNonNull({"decoderJni", "extractorOutput", "trackOutput"}) // Ensures initialized.
+ @SuppressWarnings({"contracts.postcondition.not.satisfied"})
+ private FlacDecoderJni initDecoderJni(ExtractorInput input) {
+ FlacDecoderJni decoderJni = Assertions.checkNotNull(this.decoderJni);
+ decoderJni.setData(input);
+ return decoderJni;
+ }
+
+ @RequiresNonNull({"decoderJni", "extractorOutput", "trackOutput"}) // Requires initialized.
+ @EnsuresNonNull({"streamMetadata", "outputFrameHolder"}) // Ensures stream metadata decoded.
+ @SuppressWarnings({"contracts.postcondition.not.satisfied"})
+ private void decodeStreamMetadata(ExtractorInput input) throws InterruptedException, IOException {
+ if (streamMetadataDecoded) {
+ return;
+ }
+
+ FlacStreamMetadata streamMetadata;
+ try {
+ streamMetadata = decoderJni.decodeStreamMetadata();
+ } catch (IOException e) {
+ decoderJni.reset(/* newPosition= */ 0);
+ input.setRetryPosition(/* position= */ 0, e);
+ throw e;
+ }
+
+ streamMetadataDecoded = true;
+ if (this.streamMetadata == null) {
+ this.streamMetadata = streamMetadata;
+ binarySearchSeeker =
+ outputSeekMap(decoderJni, streamMetadata, input.getLength(), extractorOutput);
+ Metadata metadata = id3MetadataDisabled ? null : id3Metadata;
+ if (streamMetadata.metadata != null) {
+ metadata = streamMetadata.metadata.copyWithAppendedEntriesFrom(metadata);
+ }
+ outputFormat(streamMetadata, metadata, trackOutput);
+ outputBuffer.reset(streamMetadata.maxDecodedFrameSize());
+ outputFrameHolder = new OutputFrameHolder(ByteBuffer.wrap(outputBuffer.data));
+ }
+ }
+
+ @RequiresNonNull("binarySearchSeeker")
+ private int handlePendingSeek(
+ ExtractorInput input,
+ PositionHolder seekPosition,
+ ParsableByteArray outputBuffer,
+ OutputFrameHolder outputFrameHolder,
+ TrackOutput trackOutput)
+ throws InterruptedException, IOException {
+ int seekResult = binarySearchSeeker.handlePendingSeek(input, seekPosition, outputFrameHolder);
+ ByteBuffer outputByteBuffer = outputFrameHolder.byteBuffer;
+ if (seekResult == RESULT_CONTINUE && outputByteBuffer.limit() > 0) {
+ outputSample(outputBuffer, outputByteBuffer.limit(), outputFrameHolder.timeUs, trackOutput);
+ }
+ return seekResult;
+ }
+
/**
* Peeks from the beginning of the input to see if {@link #FLAC_SIGNATURE} is present.
*
* @return Whether the input begins with {@link #FLAC_SIGNATURE}.
*/
- private boolean peekFlacSignature(ExtractorInput input) throws IOException, InterruptedException {
+ private static boolean peekFlacSignature(ExtractorInput input)
+ throws IOException, InterruptedException {
byte[] header = new byte[FLAC_SIGNATURE.length];
- input.peekFully(header, 0, FLAC_SIGNATURE.length);
+ input.peekFully(header, /* offset= */ 0, FLAC_SIGNATURE.length);
return Arrays.equals(header, FLAC_SIGNATURE);
}
- private void readPastStreamInfo(ExtractorInput input) throws InterruptedException, IOException {
- if (readPastStreamInfo) {
- return;
- }
-
- FlacStreamInfo streamInfo = decodeStreamInfo(input);
- readPastStreamInfo = true;
- if (this.streamInfo == null) {
- updateFlacStreamInfo(input, streamInfo);
- }
- }
-
- private void updateFlacStreamInfo(ExtractorInput input, FlacStreamInfo streamInfo) {
- this.streamInfo = streamInfo;
- outputSeekMap(input, streamInfo);
- outputFormat(streamInfo);
- outputBuffer = new ParsableByteArray(streamInfo.maxDecodedFrameSize());
- outputByteBuffer = ByteBuffer.wrap(outputBuffer.data);
- outputFrameHolder = new BinarySearchSeeker.OutputFrameHolder(outputByteBuffer);
- }
-
- private FlacStreamInfo decodeStreamInfo(ExtractorInput input)
- throws InterruptedException, IOException {
- try {
- FlacStreamInfo streamInfo = decoderJni.decodeMetadata();
- if (streamInfo == null) {
- throw new IOException("Metadata decoding failed");
- }
- return streamInfo;
- } catch (IOException e) {
- decoderJni.reset(0);
- input.setRetryPosition(0, e);
- throw e;
- }
- }
-
- private void outputSeekMap(ExtractorInput input, FlacStreamInfo streamInfo) {
- boolean hasSeekTable = decoderJni.getSeekPosition(0) != -1;
- SeekMap seekMap =
- hasSeekTable
- ? new FlacSeekMap(streamInfo.durationUs(), decoderJni)
- : getSeekMapForNonSeekTableFlac(input, streamInfo);
- extractorOutput.seekMap(seekMap);
- }
-
- private SeekMap getSeekMapForNonSeekTableFlac(ExtractorInput input, FlacStreamInfo streamInfo) {
- long inputLength = input.getLength();
- if (inputLength != C.LENGTH_UNSET) {
+ /**
+ * Outputs a {@link SeekMap} and returns a {@link FlacBinarySearchSeeker} if one is required to
+ * handle seeks.
+ */
+ @Nullable
+ private static FlacBinarySearchSeeker outputSeekMap(
+ FlacDecoderJni decoderJni,
+ FlacStreamMetadata streamMetadata,
+ long streamLength,
+ ExtractorOutput output) {
+ boolean hasSeekTable = decoderJni.getSeekPosition(/* timeUs= */ 0) != -1;
+ FlacBinarySearchSeeker binarySearchSeeker = null;
+ SeekMap seekMap;
+ if (hasSeekTable) {
+ seekMap = new FlacSeekMap(streamMetadata.durationUs(), decoderJni);
+ } else if (streamLength != C.LENGTH_UNSET) {
long firstFramePosition = decoderJni.getDecodePosition();
- flacBinarySearchSeeker =
- new FlacBinarySearchSeeker(streamInfo, firstFramePosition, inputLength, decoderJni);
- return flacBinarySearchSeeker.getSeekMap();
- } else { // can't seek at all, because there's no SeekTable and the input length is unknown.
- return new SeekMap.Unseekable(streamInfo.durationUs());
+ binarySearchSeeker =
+ new FlacBinarySearchSeeker(streamMetadata, firstFramePosition, streamLength, decoderJni);
+ seekMap = binarySearchSeeker.getSeekMap();
+ } else {
+ seekMap = new SeekMap.Unseekable(streamMetadata.durationUs());
}
+ output.seekMap(seekMap);
+ return binarySearchSeeker;
}
- private void outputFormat(FlacStreamInfo streamInfo) {
+ private static void outputFormat(
+ FlacStreamMetadata streamMetadata, @Nullable Metadata metadata, TrackOutput output) {
Format mediaFormat =
Format.createAudioSampleFormat(
/* id= */ null,
MimeTypes.AUDIO_RAW,
/* codecs= */ null,
- streamInfo.bitRate(),
- streamInfo.maxDecodedFrameSize(),
- streamInfo.channels,
- streamInfo.sampleRate,
- getPcmEncoding(streamInfo.bitsPerSample),
+ streamMetadata.bitRate(),
+ streamMetadata.maxDecodedFrameSize(),
+ streamMetadata.channels,
+ streamMetadata.sampleRate,
+ getPcmEncoding(streamMetadata.bitsPerSample),
/* encoderDelay= */ 0,
/* encoderPadding= */ 0,
/* initializationData= */ null,
/* drmInitData= */ null,
/* selectionFlags= */ 0,
/* language= */ null,
- isId3MetadataDisabled ? null : id3Metadata);
- trackOutput.format(mediaFormat);
+ metadata);
+ output.format(mediaFormat);
}
- private int handlePendingSeek(ExtractorInput input, PositionHolder seekPosition)
- throws InterruptedException, IOException {
- int seekResult =
- flacBinarySearchSeeker.handlePendingSeek(input, seekPosition, outputFrameHolder);
- ByteBuffer outputByteBuffer = outputFrameHolder.byteBuffer;
- if (seekResult == RESULT_CONTINUE && outputByteBuffer.limit() > 0) {
- writeLastSampleToOutput(outputByteBuffer.limit(), outputFrameHolder.timeUs);
- }
- return seekResult;
- }
-
- private void writeLastSampleToOutput(int size, long lastSampleTimestamp) {
- outputBuffer.setPosition(0);
- trackOutput.sampleData(outputBuffer, size);
- trackOutput.sampleMetadata(lastSampleTimestamp, C.BUFFER_FLAG_KEY_FRAME, size, 0, null);
+ private static void outputSample(
+ ParsableByteArray sampleData, int size, long timeUs, TrackOutput output) {
+ sampleData.setPosition(0);
+ output.sampleData(sampleData, size);
+ output.sampleMetadata(
+ timeUs, C.BUFFER_FLAG_KEY_FRAME, size, /* offset= */ 0, /* encryptionData= */ null);
}
/** A {@link SeekMap} implementation using a SeekTable within the Flac stream. */
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
index ac7646cc4b..d833c47d14 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
@@ -16,6 +16,7 @@
package com.google.android.exoplayer2.ext.flac;
import android.os.Handler;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.audio.AudioProcessor;
@@ -33,7 +34,7 @@ public class LibflacAudioRenderer extends SimpleDecoderAudioRenderer {
private static final int NUM_BUFFERS = 16;
public LibflacAudioRenderer() {
- this(null, null);
+ this(/* eventHandler= */ null, /* eventListener= */ null);
}
/**
@@ -43,15 +44,15 @@ public class LibflacAudioRenderer extends SimpleDecoderAudioRenderer {
* @param audioProcessors Optional {@link AudioProcessor}s that will process audio before output.
*/
public LibflacAudioRenderer(
- Handler eventHandler,
- AudioRendererEventListener eventListener,
+ @Nullable Handler eventHandler,
+ @Nullable AudioRendererEventListener eventListener,
AudioProcessor... audioProcessors) {
super(eventHandler, eventListener, audioProcessors);
}
@Override
- protected int supportsFormatInternal(DrmSessionManager drmSessionManager,
- Format format) {
+ protected int supportsFormatInternal(
+ @Nullable DrmSessionManager drmSessionManager, Format format) {
if (!FlacLibrary.isAvailable()
|| !MimeTypes.AUDIO_FLAC.equalsIgnoreCase(format.sampleMimeType)) {
return FORMAT_UNSUPPORTED_TYPE;
@@ -65,7 +66,7 @@ public class LibflacAudioRenderer extends SimpleDecoderAudioRenderer {
}
@Override
- protected FlacDecoder createDecoder(Format format, ExoMediaCrypto mediaCrypto)
+ protected FlacDecoder createDecoder(Format format, @Nullable ExoMediaCrypto mediaCrypto)
throws FlacDecoderException {
return new FlacDecoder(
NUM_BUFFERS, NUM_BUFFERS, format.maxInputSize, format.initializationData);
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/package-info.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/package-info.java
new file mode 100644
index 0000000000..ef6da7e3c6
--- /dev/null
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.flac;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/flac/src/main/jni/flac_jni.cc b/extensions/flac/src/main/jni/flac_jni.cc
index 298719d48d..d60a7cead2 100644
--- a/extensions/flac/src/main/jni/flac_jni.cc
+++ b/extensions/flac/src/main/jni/flac_jni.cc
@@ -14,9 +14,12 @@
* limitations under the License.
*/
-#include
#include
+#include
+
#include
+#include
+
#include "include/flac_parser.h"
#define LOG_TAG "flac_jni"
@@ -95,19 +98,68 @@ DECODER_FUNC(jobject, flacDecodeMetadata, jlong jContext) {
return NULL;
}
+ jclass arrayListClass = env->FindClass("java/util/ArrayList");
+ jmethodID arrayListConstructor =
+ env->GetMethodID(arrayListClass, "", "()V");
+ jobject commentList = env->NewObject(arrayListClass, arrayListConstructor);
+ jmethodID arrayListAddMethod =
+ env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+
+ if (context->parser->areVorbisCommentsValid()) {
+ std::vector vorbisComments =
+ context->parser->getVorbisComments();
+ for (std::vector::const_iterator vorbisComment =
+ vorbisComments.begin();
+ vorbisComment != vorbisComments.end(); ++vorbisComment) {
+ jstring commentString = env->NewStringUTF((*vorbisComment).c_str());
+ env->CallBooleanMethod(commentList, arrayListAddMethod, commentString);
+ env->DeleteLocalRef(commentString);
+ }
+ }
+
+ jobject pictureFrames = env->NewObject(arrayListClass, arrayListConstructor);
+ bool picturesValid = context->parser->arePicturesValid();
+ if (picturesValid) {
+ std::vector pictures = context->parser->getPictures();
+ jclass pictureFrameClass = env->FindClass(
+ "com/google/android/exoplayer2/metadata/flac/PictureFrame");
+ jmethodID pictureFrameConstructor =
+ env->GetMethodID(pictureFrameClass, "",
+ "(ILjava/lang/String;Ljava/lang/String;IIII[B)V");
+ for (std::vector::const_iterator picture = pictures.begin();
+ picture != pictures.end(); ++picture) {
+ jstring mimeType = env->NewStringUTF(picture->mimeType.c_str());
+ jstring description = env->NewStringUTF(picture->description.c_str());
+ jbyteArray pictureData = env->NewByteArray(picture->data.size());
+ env->SetByteArrayRegion(pictureData, 0, picture->data.size(),
+ (signed char *)&picture->data[0]);
+ jobject pictureFrame = env->NewObject(
+ pictureFrameClass, pictureFrameConstructor, picture->type, mimeType,
+ description, picture->width, picture->height, picture->depth,
+ picture->colors, pictureData);
+ env->CallBooleanMethod(pictureFrames, arrayListAddMethod, pictureFrame);
+ env->DeleteLocalRef(mimeType);
+ env->DeleteLocalRef(description);
+ env->DeleteLocalRef(pictureData);
+ }
+ }
+
const FLAC__StreamMetadata_StreamInfo &streamInfo =
context->parser->getStreamInfo();
- jclass cls = env->FindClass(
+ jclass flacStreamMetadataClass = env->FindClass(
"com/google/android/exoplayer2/util/"
- "FlacStreamInfo");
- jmethodID constructor = env->GetMethodID(cls, "", "(IIIIIIIJ)V");
+ "FlacStreamMetadata");
+ jmethodID flacStreamMetadataConstructor =
+ env->GetMethodID(flacStreamMetadataClass, "",
+ "(IIIIIIIJLjava/util/List;Ljava/util/List;)V");
- return env->NewObject(cls, constructor, streamInfo.min_blocksize,
- streamInfo.max_blocksize, streamInfo.min_framesize,
- streamInfo.max_framesize, streamInfo.sample_rate,
- streamInfo.channels, streamInfo.bits_per_sample,
- streamInfo.total_samples);
+ return env->NewObject(flacStreamMetadataClass, flacStreamMetadataConstructor,
+ streamInfo.min_blocksize, streamInfo.max_blocksize,
+ streamInfo.min_framesize, streamInfo.max_framesize,
+ streamInfo.sample_rate, streamInfo.channels,
+ streamInfo.bits_per_sample, streamInfo.total_samples,
+ commentList, pictureFrames);
}
DECODER_FUNC(jint, flacDecodeToBuffer, jlong jContext, jobject jOutputBuffer) {
diff --git a/extensions/flac/src/main/jni/flac_parser.cc b/extensions/flac/src/main/jni/flac_parser.cc
index 83d3367415..830f3e2178 100644
--- a/extensions/flac/src/main/jni/flac_parser.cc
+++ b/extensions/flac/src/main/jni/flac_parser.cc
@@ -172,6 +172,43 @@ void FLACParser::metadataCallback(const FLAC__StreamMetadata *metadata) {
case FLAC__METADATA_TYPE_SEEKTABLE:
mSeekTable = &metadata->data.seek_table;
break;
+ case FLAC__METADATA_TYPE_VORBIS_COMMENT:
+ if (!mVorbisCommentsValid) {
+ FLAC__StreamMetadata_VorbisComment vorbisComment =
+ metadata->data.vorbis_comment;
+ for (FLAC__uint32 i = 0; i < vorbisComment.num_comments; ++i) {
+ FLAC__StreamMetadata_VorbisComment_Entry vorbisCommentEntry =
+ vorbisComment.comments[i];
+ if (vorbisCommentEntry.entry != NULL) {
+ std::string comment(
+ reinterpret_cast(vorbisCommentEntry.entry),
+ vorbisCommentEntry.length);
+ mVorbisComments.push_back(comment);
+ }
+ }
+ mVorbisCommentsValid = true;
+ } else {
+ ALOGE("FLACParser::metadataCallback unexpected VORBISCOMMENT");
+ }
+ break;
+ case FLAC__METADATA_TYPE_PICTURE: {
+ const FLAC__StreamMetadata_Picture *parsedPicture =
+ &metadata->data.picture;
+ FlacPicture picture;
+ picture.mimeType.assign(std::string(parsedPicture->mime_type));
+ picture.description.assign(
+ std::string((char *)parsedPicture->description));
+ picture.data.assign(parsedPicture->data,
+ parsedPicture->data + parsedPicture->data_length);
+ picture.width = parsedPicture->width;
+ picture.height = parsedPicture->height;
+ picture.depth = parsedPicture->depth;
+ picture.colors = parsedPicture->colors;
+ picture.type = parsedPicture->type;
+ mPictures.push_back(picture);
+ mPicturesValid = true;
+ break;
+ }
default:
ALOGE("FLACParser::metadataCallback unexpected type %u", metadata->type);
break;
@@ -233,6 +270,8 @@ FLACParser::FLACParser(DataSource *source)
mCurrentPos(0LL),
mEOF(false),
mStreamInfoValid(false),
+ mVorbisCommentsValid(false),
+ mPicturesValid(false),
mWriteRequested(false),
mWriteCompleted(false),
mWriteBuffer(NULL),
@@ -266,6 +305,10 @@ bool FLACParser::init() {
FLAC__METADATA_TYPE_STREAMINFO);
FLAC__stream_decoder_set_metadata_respond(mDecoder,
FLAC__METADATA_TYPE_SEEKTABLE);
+ FLAC__stream_decoder_set_metadata_respond(mDecoder,
+ FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ FLAC__stream_decoder_set_metadata_respond(mDecoder,
+ FLAC__METADATA_TYPE_PICTURE);
FLAC__StreamDecoderInitStatus initStatus;
initStatus = FLAC__stream_decoder_init_stream(
mDecoder, read_callback, seek_callback, tell_callback, length_callback,
diff --git a/extensions/flac/src/main/jni/include/flac_parser.h b/extensions/flac/src/main/jni/include/flac_parser.h
index cea7fbe33b..fd3e36a806 100644
--- a/extensions/flac/src/main/jni/include/flac_parser.h
+++ b/extensions/flac/src/main/jni/include/flac_parser.h
@@ -19,6 +19,10 @@
#include
+#include
+#include
+#include
+
// libFLAC parser
#include "FLAC/stream_decoder.h"
@@ -26,6 +30,17 @@
typedef int status_t;
+struct FlacPicture {
+ int type;
+ std::string mimeType;
+ std::string description;
+ FLAC__uint32 width;
+ FLAC__uint32 height;
+ FLAC__uint32 depth;
+ FLAC__uint32 colors;
+ std::vector data;
+};
+
class FLACParser {
public:
FLACParser(DataSource *source);
@@ -44,6 +59,16 @@ class FLACParser {
return mStreamInfo;
}
+ bool areVorbisCommentsValid() const { return mVorbisCommentsValid; }
+
+ const std::vector& getVorbisComments() const {
+ return mVorbisComments;
+ }
+
+ bool arePicturesValid() const { return mPicturesValid; }
+
+ const std::vector &getPictures() const { return mPictures; }
+
int64_t getLastFrameTimestamp() const {
return (1000000LL * mWriteHeader.number.sample_number) / getSampleRate();
}
@@ -71,6 +96,10 @@ class FLACParser {
mEOF = false;
if (newPosition == 0) {
mStreamInfoValid = false;
+ mVorbisCommentsValid = false;
+ mPicturesValid = false;
+ mVorbisComments.clear();
+ mPictures.clear();
FLAC__stream_decoder_reset(mDecoder);
} else {
FLAC__stream_decoder_flush(mDecoder);
@@ -116,6 +145,14 @@ class FLACParser {
const FLAC__StreamMetadata_SeekTable *mSeekTable;
uint64_t firstFrameOffset;
+ // cached when the VORBIS_COMMENT metadata is parsed by libFLAC
+ std::vector mVorbisComments;
+ bool mVorbisCommentsValid;
+
+ // cached when the PICTURE metadata is parsed by libFLAC
+ std::vector mPictures;
+ bool mPicturesValid;
+
// cached when a decoded PCM block is "written" by libFLAC parser
bool mWriteRequested;
bool mWriteCompleted;
diff --git a/extensions/flac/src/test/AndroidManifest.xml b/extensions/flac/src/test/AndroidManifest.xml
index 1d68b376ac..509151aa21 100644
--- a/extensions/flac/src/test/AndroidManifest.xml
+++ b/extensions/flac/src/test/AndroidManifest.xml
@@ -14,4 +14,6 @@
limitations under the License.
-->
-
+
+
+
diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle
index 50acd6c040..1031d6f4b7 100644
--- a/extensions/gvr/build.gradle
+++ b/extensions/gvr/build.gradle
@@ -33,7 +33,7 @@ android {
dependencies {
implementation project(modulePrefix + 'library-core')
implementation project(modulePrefix + 'library-ui')
- implementation 'androidx.annotation:annotation:1.0.2'
+ implementation 'androidx.annotation:annotation:1.1.0'
api 'com.google.vr:sdk-base:1.190.0'
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
}
diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
index 2c912c17f2..e22c97859a 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
@@ -50,7 +50,10 @@ import com.google.vr.sdk.controller.ControllerManager;
import javax.microedition.khronos.egl.EGLConfig;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
-/** Base activity for VR 360 video playback. */
+/**
+ * Base activity for VR 360 video playback. Before starting the video playback a player needs to be
+ * set using {@link #setPlayer(Player)}.
+ */
public abstract class GvrPlayerActivity extends GvrActivity {
private static final int EXIT_FROM_VR_REQUEST_CODE = 42;
@@ -58,12 +61,12 @@ public abstract class GvrPlayerActivity extends GvrActivity {
private final Handler mainHandler;
@Nullable private Player player;
- @MonotonicNonNull private GlViewGroup glView;
- @MonotonicNonNull private ControllerManager controllerManager;
- @MonotonicNonNull private SurfaceTexture surfaceTexture;
- @MonotonicNonNull private Surface surface;
- @MonotonicNonNull private SceneRenderer scene;
- @MonotonicNonNull private PlayerControlView playerControl;
+ private @MonotonicNonNull GlViewGroup glView;
+ private @MonotonicNonNull ControllerManager controllerManager;
+ private @MonotonicNonNull SurfaceTexture surfaceTexture;
+ private @MonotonicNonNull Surface surface;
+ private @MonotonicNonNull SceneRenderer scene;
+ private @MonotonicNonNull PlayerControlView playerControl;
public GvrPlayerActivity() {
mainHandler = new Handler(Looper.getMainLooper());
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index a91bbbd981..340e9832be 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -32,10 +32,12 @@ android {
}
dependencies {
- api 'com.google.ads.interactivemedia.v3:interactivemedia:3.11.2'
+ api 'com.google.ads.interactivemedia.v3:interactivemedia:3.11.3'
implementation project(modulePrefix + 'library-core')
+ implementation 'androidx.annotation:annotation:1.1.0'
implementation 'com.google.android.gms:play-services-ads-identifier:16.0.0'
- testImplementation project(modulePrefix + 'testutils-robolectric')
+ testImplementation project(modulePrefix + 'testutils')
+ testImplementation 'org.robolectric:robolectric:' + robolectricVersion
}
ext {
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index bdeebec44c..e37f192c97 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -313,14 +313,14 @@ public final class ImaAdsLoader
*/
private static final int IMA_AD_STATE_PAUSED = 2;
- private final @Nullable Uri adTagUri;
- private final @Nullable String adsResponse;
+ @Nullable private final Uri adTagUri;
+ @Nullable private final String adsResponse;
private final int vastLoadTimeoutMs;
private final int mediaLoadTimeoutMs;
private final boolean focusSkipButtonWhenAvailable;
private final int mediaBitrate;
- private final @Nullable Set adUiElements;
- private final @Nullable AdEventListener adEventListener;
+ @Nullable private final Set adUiElements;
+ @Nullable private final AdEventListener adEventListener;
private final ImaFactory imaFactory;
private final Timeline.Period period;
private final List adCallbacks;
@@ -426,7 +426,7 @@ public final class ImaAdsLoader
* @deprecated Use {@link ImaAdsLoader.Builder}.
*/
@Deprecated
- public ImaAdsLoader(Context context, Uri adTagUri, ImaSdkSettings imaSdkSettings) {
+ public ImaAdsLoader(Context context, Uri adTagUri, @Nullable ImaSdkSettings imaSdkSettings) {
this(
context,
adTagUri,
@@ -946,8 +946,7 @@ public final class ImaAdsLoader
// Player.EventListener implementation.
@Override
- public void onTimelineChanged(
- Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
+ public void onTimelineChanged(Timeline timeline, @Player.TimelineChangeReason int reason) {
if (timeline.isEmpty()) {
// The player is being reset or contains no media.
return;
@@ -1054,13 +1053,8 @@ public final class ImaAdsLoader
long contentPositionMs = player.getCurrentPosition();
int adGroupIndexForPosition =
adPlaybackState.getAdGroupIndexForPositionUs(C.msToUs(contentPositionMs));
- if (adGroupIndexForPosition == 0) {
- podIndexOffset = 0;
- } else if (adGroupIndexForPosition == C.INDEX_UNSET) {
- // There is no preroll and midroll pod indices start at 1.
- podIndexOffset = -1;
- } else /* adGroupIndexForPosition > 0 */ {
- // Skip ad groups before the one at or immediately before the playback position.
+ if (adGroupIndexForPosition > 0 && adGroupIndexForPosition != C.INDEX_UNSET) {
+ // Skip any ad groups before the one at or immediately before the playback position.
for (int i = 0; i < adGroupIndexForPosition; i++) {
adPlaybackState = adPlaybackState.withSkippedAdGroup(i);
}
@@ -1070,9 +1064,18 @@ public final class ImaAdsLoader
long adGroupBeforeTimeUs = adGroupTimesUs[adGroupIndexForPosition - 1];
double midpointTimeUs = (adGroupForPositionTimeUs + adGroupBeforeTimeUs) / 2d;
adsRenderingSettings.setPlayAdsAfterTime(midpointTimeUs / C.MICROS_PER_SECOND);
+ }
- // We're removing one or more ads, which means that the earliest ad (if any) will be a
- // midroll/postroll. Midroll pod indices start at 1.
+ // IMA indexes any remaining midroll ad pods from 1. A preroll (if present) has index 0.
+ // Store an index offset as we want to index all ads (including skipped ones) from 0.
+ if (adGroupIndexForPosition == 0 && adGroupTimesUs[0] == 0) {
+ // We are playing a preroll.
+ podIndexOffset = 0;
+ } else if (adGroupIndexForPosition == C.INDEX_UNSET) {
+ // There's no ad to play which means there's no preroll.
+ podIndexOffset = -1;
+ } else {
+ // We are playing a midroll and any ads before it were skipped.
podIndexOffset = adGroupIndexForPosition - 1;
}
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/package-info.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/package-info.java
new file mode 100644
index 0000000000..9a382eb18f
--- /dev/null
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.ima;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/ima/src/test/AndroidManifest.xml b/extensions/ima/src/test/AndroidManifest.xml
index 9a4e33189e..564c5d94dd 100644
--- a/extensions/ima/src/test/AndroidManifest.xml
+++ b/extensions/ima/src/test/AndroidManifest.xml
@@ -13,4 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
+
+
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
index a9d6a37fac..a9572b7a8d 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
@@ -51,9 +51,7 @@ import java.util.ArrayList;
public void updateTimeline(Timeline timeline) {
for (Player.EventListener listener : listeners) {
listener.onTimelineChanged(
- timeline,
- null,
- prepared ? TIMELINE_CHANGE_REASON_DYNAMIC : TIMELINE_CHANGE_REASON_PREPARED);
+ timeline, prepared ? TIMELINE_CHANGE_REASON_DYNAMIC : TIMELINE_CHANGE_REASON_PREPARED);
}
prepared = true;
}
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
index 1e1935c63a..ab880703ee 100644
--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
@@ -252,7 +252,8 @@ public class ImaAdsLoaderTest {
}
@Override
- public @Nullable Ad getAd() {
+ @Nullable
+ public Ad getAd() {
return ad;
}
diff --git a/extensions/jobdispatcher/README.md b/extensions/jobdispatcher/README.md
index f70125ba38..a6f0c3966a 100644
--- a/extensions/jobdispatcher/README.md
+++ b/extensions/jobdispatcher/README.md
@@ -1,7 +1,11 @@
# ExoPlayer Firebase JobDispatcher extension #
+**DEPRECATED - Please use [WorkManager extension][] or [PlatformScheduler][] instead.**
+
This extension provides a Scheduler implementation which uses [Firebase JobDispatcher][].
+[WorkManager extension]: https://github.com/google/ExoPlayer/blob/release-v2/extensions/workmanager/README.md
+[PlatformScheduler]: https://github.com/google/ExoPlayer/blob/release-v2/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
[Firebase JobDispatcher]: https://github.com/firebase/firebase-jobdispatcher-android
## Getting the extension ##
@@ -20,4 +24,3 @@ locally. Instructions for doing this can be found in ExoPlayer's
[top level README][].
[top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
-
diff --git a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
index d79dead0d7..c8975275f1 100644
--- a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
+++ b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
@@ -54,7 +54,10 @@ import com.google.android.exoplayer2.util.Util;
*
* @see GoogleApiAvailability
+ * @deprecated Use com.google.android.exoplayer2.ext.workmanager.WorkManagerScheduler or {@link
+ * com.google.android.exoplayer2.scheduler.PlatformScheduler}.
*/
+@Deprecated
public final class JobDispatcherScheduler implements Scheduler {
private static final boolean DEBUG = false;
diff --git a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/package-info.java b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/package-info.java
new file mode 100644
index 0000000000..a66904b505
--- /dev/null
+++ b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.jobdispatcher;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
index c6f5a216ce..ecaa78e25b 100644
--- a/extensions/leanback/build.gradle
+++ b/extensions/leanback/build.gradle
@@ -32,7 +32,7 @@ android {
dependencies {
implementation project(modulePrefix + 'library-core')
- implementation 'androidx.annotation:annotation:1.0.2'
+ implementation 'androidx.annotation:annotation:1.1.0'
implementation 'androidx.leanback:leanback:1.0.0'
}
diff --git a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
index 5705b73ab2..370e5515e8 100644
--- a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
+++ b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
@@ -51,10 +51,10 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
private final ComponentListener componentListener;
private final int updatePeriodMs;
- private @Nullable PlaybackPreparer playbackPreparer;
+ @Nullable private PlaybackPreparer playbackPreparer;
private ControlDispatcher controlDispatcher;
- private @Nullable ErrorMessageProvider errorMessageProvider;
- private @Nullable SurfaceHolderGlueHost surfaceHolderGlueHost;
+ @Nullable private ErrorMessageProvider errorMessageProvider;
+ @Nullable private SurfaceHolderGlueHost surfaceHolderGlueHost;
private boolean hasSurface;
private boolean lastNotifiedPreparedState;
@@ -288,8 +288,7 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
}
@Override
- public void onTimelineChanged(
- Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
+ public void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reason) {
Callback callback = getCallback();
callback.onDurationChanged(LeanbackPlayerAdapter.this);
callback.onCurrentPositionChanged(LeanbackPlayerAdapter.this);
diff --git a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/package-info.java b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/package-info.java
new file mode 100644
index 0000000000..79c544fc0f
--- /dev/null
+++ b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.leanback;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle
index 6c6ddf4ce4..7ee973723c 100644
--- a/extensions/mediasession/build.gradle
+++ b/extensions/mediasession/build.gradle
@@ -33,6 +33,7 @@ android {
dependencies {
implementation project(modulePrefix + 'library-core')
api 'androidx.media:media:1.0.1'
+ compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
}
ext {
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index afe53099ee..cb1788f2fc 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -52,6 +52,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
/**
* Connects a {@link MediaSessionCompat} to a {@link Player}.
@@ -172,7 +173,7 @@ public final class MediaSessionConnector {
ResultReceiver cb);
}
- /** Interface to which playback preparation actions are delegated. */
+ /** Interface to which playback preparation and play actions are delegated. */
public interface PlaybackPreparer extends CommandReceiver {
long ACTIONS =
@@ -197,14 +198,36 @@ public final class MediaSessionConnector {
* @return The bitmask of the supported media actions.
*/
long getSupportedPrepareActions();
- /** See {@link MediaSessionCompat.Callback#onPrepare()}. */
- void onPrepare();
- /** See {@link MediaSessionCompat.Callback#onPrepareFromMediaId(String, Bundle)}. */
- void onPrepareFromMediaId(String mediaId, Bundle extras);
- /** See {@link MediaSessionCompat.Callback#onPrepareFromSearch(String, Bundle)}. */
- void onPrepareFromSearch(String query, Bundle extras);
- /** See {@link MediaSessionCompat.Callback#onPrepareFromUri(Uri, Bundle)}. */
- void onPrepareFromUri(Uri uri, Bundle extras);
+ /**
+ * See {@link MediaSessionCompat.Callback#onPrepare()}.
+ *
+ * @param playWhenReady Whether playback should be started after preparation.
+ */
+ void onPrepare(boolean playWhenReady);
+ /**
+ * See {@link MediaSessionCompat.Callback#onPrepareFromMediaId(String, Bundle)}.
+ *
+ * @param mediaId The media id of the media item to be prepared.
+ * @param playWhenReady Whether playback should be started after preparation.
+ * @param extras A {@link Bundle} of extras passed by the media controller.
+ */
+ void onPrepareFromMediaId(String mediaId, boolean playWhenReady, Bundle extras);
+ /**
+ * See {@link MediaSessionCompat.Callback#onPrepareFromSearch(String, Bundle)}.
+ *
+ * @param query The search query.
+ * @param playWhenReady Whether playback should be started after preparation.
+ * @param extras A {@link Bundle} of extras passed by the media controller.
+ */
+ void onPrepareFromSearch(String query, boolean playWhenReady, Bundle extras);
+ /**
+ * See {@link MediaSessionCompat.Callback#onPrepareFromUri(Uri, Bundle)}.
+ *
+ * @param uri The {@link Uri} of the media item to be prepared.
+ * @param playWhenReady Whether playback should be started after preparation.
+ * @param extras A {@link Bundle} of extras passed by the media controller.
+ */
+ void onPrepareFromUri(Uri uri, boolean playWhenReady, Bundle extras);
}
/**
@@ -337,7 +360,7 @@ public final class MediaSessionConnector {
* @param extras Optional extras sent by a media controller.
*/
void onCustomAction(
- Player player, ControlDispatcher controlDispatcher, String action, Bundle extras);
+ Player player, ControlDispatcher controlDispatcher, String action, @Nullable Bundle extras);
/**
* Returns a {@link PlaybackStateCompat.CustomAction} which will be published to the media
@@ -355,6 +378,13 @@ public final class MediaSessionConnector {
/**
* Gets the {@link MediaMetadataCompat} to be published to the session.
*
+ * An app may need to load metadata resources like artwork bitmaps asynchronously. In such a
+ * case the app should return a {@link MediaMetadataCompat} object that does not contain these
+ * resources as a placeholder. The app should start an asynchronous operation to download the
+ * bitmap and put it into a cache. Finally, the app should call {@link
+ * #invalidateMediaSessionMetadata()}. This causes this callback to be called again and the app
+ * can now return a {@link MediaMetadataCompat} object with all the resources included.
+ *
* @param player The player connected to the media session.
* @return The {@link MediaMetadataCompat} to be published to the session.
*/
@@ -528,7 +558,7 @@ public final class MediaSessionConnector {
*
* @param queueNavigator The queue navigator.
*/
- public void setQueueNavigator(QueueNavigator queueNavigator) {
+ public void setQueueNavigator(@Nullable QueueNavigator queueNavigator) {
if (this.queueNavigator != queueNavigator) {
unregisterCommandReceiver(this.queueNavigator);
this.queueNavigator = queueNavigator;
@@ -541,7 +571,7 @@ public final class MediaSessionConnector {
*
* @param queueEditor The queue editor.
*/
- public void setQueueEditor(QueueEditor queueEditor) {
+ public void setQueueEditor(@Nullable QueueEditor queueEditor) {
if (this.queueEditor != queueEditor) {
unregisterCommandReceiver(this.queueEditor);
this.queueEditor = queueEditor;
@@ -643,7 +673,7 @@ public final class MediaSessionConnector {
mediaMetadataProvider != null && player != null
? mediaMetadataProvider.getMetadata(player)
: METADATA_EMPTY;
- mediaSession.setMetadata(metadata != null ? metadata : METADATA_EMPTY);
+ mediaSession.setMetadata(metadata);
}
/**
@@ -654,6 +684,7 @@ public final class MediaSessionConnector {
*/
public final void invalidateMediaSessionPlaybackState() {
PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder();
+ @Nullable Player player = this.player;
if (player == null) {
builder.setActions(buildPrepareActions()).setState(PlaybackStateCompat.STATE_NONE, 0, 0, 0);
mediaSession.setPlaybackState(builder.build());
@@ -662,6 +693,7 @@ public final class MediaSessionConnector {
Map currentActions = new HashMap<>();
for (CustomActionProvider customActionProvider : customActionProviders) {
+ @Nullable
PlaybackStateCompat.CustomAction customAction = customActionProvider.getCustomAction(player);
if (customAction != null) {
currentActions.put(customAction.getAction(), customActionProvider);
@@ -672,6 +704,7 @@ public final class MediaSessionConnector {
int playbackState = player.getPlaybackState();
Bundle extras = new Bundle();
+ @Nullable
ExoPlaybackException playbackError =
playbackState == Player.STATE_IDLE ? player.getPlaybackError() : null;
boolean reportError = playbackError != null || customError != null;
@@ -727,8 +760,8 @@ public final class MediaSessionConnector {
*
* @param commandReceiver The command receiver to register.
*/
- public void registerCustomCommandReceiver(CommandReceiver commandReceiver) {
- if (!customCommandReceivers.contains(commandReceiver)) {
+ public void registerCustomCommandReceiver(@Nullable CommandReceiver commandReceiver) {
+ if (commandReceiver != null && !customCommandReceivers.contains(commandReceiver)) {
customCommandReceivers.add(commandReceiver);
}
}
@@ -738,18 +771,22 @@ public final class MediaSessionConnector {
*
* @param commandReceiver The command receiver to unregister.
*/
- public void unregisterCustomCommandReceiver(CommandReceiver commandReceiver) {
- customCommandReceivers.remove(commandReceiver);
+ public void unregisterCustomCommandReceiver(@Nullable CommandReceiver commandReceiver) {
+ if (commandReceiver != null) {
+ customCommandReceivers.remove(commandReceiver);
+ }
}
- private void registerCommandReceiver(CommandReceiver commandReceiver) {
- if (!commandReceivers.contains(commandReceiver)) {
+ private void registerCommandReceiver(@Nullable CommandReceiver commandReceiver) {
+ if (commandReceiver != null && !commandReceivers.contains(commandReceiver)) {
commandReceivers.add(commandReceiver);
}
}
- private void unregisterCommandReceiver(CommandReceiver commandReceiver) {
- commandReceivers.remove(commandReceiver);
+ private void unregisterCommandReceiver(@Nullable CommandReceiver commandReceiver) {
+ if (commandReceiver != null) {
+ commandReceivers.remove(commandReceiver);
+ }
}
private long buildPrepareActions() {
@@ -807,39 +844,47 @@ public final class MediaSessionConnector {
}
}
+ @EnsuresNonNullIf(result = true, expression = "player")
private boolean canDispatchPlaybackAction(long action) {
return player != null && (enabledPlaybackActions & action) != 0;
}
+ @EnsuresNonNullIf(result = true, expression = "playbackPreparer")
private boolean canDispatchToPlaybackPreparer(long action) {
return playbackPreparer != null
&& (playbackPreparer.getSupportedPrepareActions() & action) != 0;
}
+ @EnsuresNonNullIf(
+ result = true,
+ expression = {"player", "queueNavigator"})
private boolean canDispatchToQueueNavigator(long action) {
return player != null
&& queueNavigator != null
&& (queueNavigator.getSupportedQueueNavigatorActions(player) & action) != 0;
}
+ @EnsuresNonNullIf(
+ result = true,
+ expression = {"player", "ratingCallback"})
private boolean canDispatchSetRating() {
return player != null && ratingCallback != null;
}
+ @EnsuresNonNullIf(
+ result = true,
+ expression = {"player", "queueEditor"})
private boolean canDispatchQueueEdit() {
return player != null && queueEditor != null;
}
+ @EnsuresNonNullIf(
+ result = true,
+ expression = {"player", "mediaButtonEventHandler"})
private boolean canDispatchMediaButtonEvent() {
return player != null && mediaButtonEventHandler != null;
}
- private void setPlayWhenReady(boolean playWhenReady) {
- if (player != null) {
- controlDispatcher.dispatchSetPlayWhenReady(player, playWhenReady);
- }
- }
-
private void rewind(Player player) {
if (player.isCurrentWindowSeekable() && rewindMs > 0) {
seekTo(player, player.getCurrentPosition() - rewindMs);
@@ -906,10 +951,10 @@ public final class MediaSessionConnector {
MediaSessionCompat.QueueItem queueItem = queue.get(i);
if (queueItem.getQueueId() == activeQueueItemId) {
MediaDescriptionCompat description = queueItem.getDescription();
- Bundle extras = description.getExtras();
+ @Nullable Bundle extras = description.getExtras();
if (extras != null) {
for (String key : extras.keySet()) {
- Object value = extras.get(key);
+ @Nullable Object value = extras.get(key);
if (value instanceof String) {
builder.putString(metadataExtrasPrefix + key, (String) value);
} else if (value instanceof CharSequence) {
@@ -925,38 +970,40 @@ public final class MediaSessionConnector {
}
}
}
- if (description.getTitle() != null) {
- String title = String.valueOf(description.getTitle());
- builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, title);
- builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE, title);
+ @Nullable CharSequence title = description.getTitle();
+ if (title != null) {
+ String titleString = String.valueOf(title);
+ builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, titleString);
+ builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE, titleString);
}
- if (description.getSubtitle() != null) {
+ @Nullable CharSequence subtitle = description.getSubtitle();
+ if (subtitle != null) {
builder.putString(
- MediaMetadataCompat.METADATA_KEY_DISPLAY_SUBTITLE,
- String.valueOf(description.getSubtitle()));
+ MediaMetadataCompat.METADATA_KEY_DISPLAY_SUBTITLE, String.valueOf(subtitle));
}
- if (description.getDescription() != null) {
+ @Nullable CharSequence displayDescription = description.getDescription();
+ if (displayDescription != null) {
builder.putString(
MediaMetadataCompat.METADATA_KEY_DISPLAY_DESCRIPTION,
- String.valueOf(description.getDescription()));
+ String.valueOf(displayDescription));
}
- if (description.getIconBitmap() != null) {
- builder.putBitmap(
- MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, description.getIconBitmap());
+ @Nullable Bitmap iconBitmap = description.getIconBitmap();
+ if (iconBitmap != null) {
+ builder.putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, iconBitmap);
}
- if (description.getIconUri() != null) {
+ @Nullable Uri iconUri = description.getIconUri();
+ if (iconUri != null) {
builder.putString(
- MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI,
- String.valueOf(description.getIconUri()));
+ MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, String.valueOf(iconUri));
}
- if (description.getMediaId() != null) {
- builder.putString(
- MediaMetadataCompat.METADATA_KEY_MEDIA_ID, description.getMediaId());
+ @Nullable String mediaId = description.getMediaId();
+ if (mediaId != null) {
+ builder.putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, mediaId);
}
- if (description.getMediaUri() != null) {
+ @Nullable Uri mediaUri = description.getMediaUri();
+ if (mediaUri != null) {
builder.putString(
- MediaMetadataCompat.METADATA_KEY_MEDIA_URI,
- String.valueOf(description.getMediaUri()));
+ MediaMetadataCompat.METADATA_KEY_MEDIA_URI, String.valueOf(mediaUri));
}
break;
}
@@ -975,8 +1022,8 @@ public final class MediaSessionConnector {
// Player.EventListener implementation.
@Override
- public void onTimelineChanged(
- Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
+ public void onTimelineChanged(Timeline timeline, @Player.TimelineChangeReason int reason) {
+ Player player = Assertions.checkNotNull(MediaSessionConnector.this.player);
int windowCount = player.getCurrentTimeline().getWindowCount();
int windowIndex = player.getCurrentWindowIndex();
if (queueNavigator != null) {
@@ -1019,6 +1066,7 @@ public final class MediaSessionConnector {
@Override
public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
+ Player player = Assertions.checkNotNull(MediaSessionConnector.this.player);
if (currentWindowIndex != player.getCurrentWindowIndex()) {
if (queueNavigator != null) {
queueNavigator.onCurrentWindowIndexChanged(player);
@@ -1045,19 +1093,20 @@ public final class MediaSessionConnector {
if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_PLAY)) {
if (player.getPlaybackState() == Player.STATE_IDLE) {
if (playbackPreparer != null) {
- playbackPreparer.onPrepare();
+ playbackPreparer.onPrepare(/* playWhenReady= */ true);
}
} else if (player.getPlaybackState() == Player.STATE_ENDED) {
controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
}
- setPlayWhenReady(/* playWhenReady= */ true);
+ controlDispatcher.dispatchSetPlayWhenReady(
+ Assertions.checkNotNull(player), /* playWhenReady= */ true);
}
}
@Override
public void onPause() {
if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_PAUSE)) {
- setPlayWhenReady(/* playWhenReady= */ false);
+ controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ false);
}
}
@@ -1180,56 +1229,49 @@ public final class MediaSessionConnector {
@Override
public void onPrepare() {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE)) {
- setPlayWhenReady(/* playWhenReady= */ false);
- playbackPreparer.onPrepare();
+ playbackPreparer.onPrepare(/* playWhenReady= */ false);
}
}
@Override
public void onPrepareFromMediaId(String mediaId, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_MEDIA_ID)) {
- setPlayWhenReady(/* playWhenReady= */ false);
- playbackPreparer.onPrepareFromMediaId(mediaId, extras);
+ playbackPreparer.onPrepareFromMediaId(mediaId, /* playWhenReady= */ false, extras);
}
}
@Override
public void onPrepareFromSearch(String query, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_SEARCH)) {
- setPlayWhenReady(/* playWhenReady= */ false);
- playbackPreparer.onPrepareFromSearch(query, extras);
+ playbackPreparer.onPrepareFromSearch(query, /* playWhenReady= */ false, extras);
}
}
@Override
public void onPrepareFromUri(Uri uri, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_URI)) {
- setPlayWhenReady(/* playWhenReady= */ false);
- playbackPreparer.onPrepareFromUri(uri, extras);
+ playbackPreparer.onPrepareFromUri(uri, /* playWhenReady= */ false, extras);
}
}
@Override
public void onPlayFromMediaId(String mediaId, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID)) {
- setPlayWhenReady(/* playWhenReady= */ true);
- playbackPreparer.onPrepareFromMediaId(mediaId, extras);
+ playbackPreparer.onPrepareFromMediaId(mediaId, /* playWhenReady= */ true, extras);
}
}
@Override
public void onPlayFromSearch(String query, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_SEARCH)) {
- setPlayWhenReady(/* playWhenReady= */ true);
- playbackPreparer.onPrepareFromSearch(query, extras);
+ playbackPreparer.onPrepareFromSearch(query, /* playWhenReady= */ true, extras);
}
}
@Override
public void onPlayFromUri(Uri uri, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_URI)) {
- setPlayWhenReady(/* playWhenReady= */ true);
- playbackPreparer.onPrepareFromUri(uri, extras);
+ playbackPreparer.onPrepareFromUri(uri, /* playWhenReady= */ true, extras);
}
}
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
index 617b8781f4..5c969dd44d 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.ext.mediasession;
import android.content.Context;
import android.os.Bundle;
+import androidx.annotation.Nullable;
import android.support.v4.media.session.PlaybackStateCompat;
import com.google.android.exoplayer2.ControlDispatcher;
import com.google.android.exoplayer2.Player;
@@ -65,7 +66,7 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
@Override
public void onCustomAction(
- Player player, ControlDispatcher controlDispatcher, String action, Bundle extras) {
+ Player player, ControlDispatcher controlDispatcher, String action, @Nullable Bundle extras) {
int mode = player.getRepeatMode();
int proposedMode = RepeatModeUtil.getNextRepeatMode(mode, repeatToggleModes);
if (mode != proposedMode) {
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
index d076404bb4..d72f6ffddc 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
@@ -166,7 +166,7 @@ public final class TimelineQueueEditor
@Override
public void onAddQueueItem(Player player, MediaDescriptionCompat description, int index) {
- MediaSource mediaSource = sourceFactory.createMediaSource(description);
+ @Nullable MediaSource mediaSource = sourceFactory.createMediaSource(description);
if (mediaSource != null) {
queueDataAdapter.add(index, description);
queueMediaSource.addMediaSource(index, mediaSource);
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/package-info.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/package-info.java
new file mode 100644
index 0000000000..65c0ce080e
--- /dev/null
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.mediasession;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index db2e073c8a..68bd422185 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -33,7 +33,7 @@ android {
dependencies {
implementation project(modulePrefix + 'library-core')
- implementation 'androidx.annotation:annotation:1.0.2'
+ implementation 'androidx.annotation:annotation:1.1.0'
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
api 'com.squareup.okhttp3:okhttp:3.12.1'
}
diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
index 8eb8bba920..ec05c52f44 100644
--- a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
+++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
@@ -57,14 +57,14 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
private final Call.Factory callFactory;
private final RequestProperties requestProperties;
- private final @Nullable String userAgent;
- private final @Nullable Predicate contentTypePredicate;
- private final @Nullable CacheControl cacheControl;
- private final @Nullable RequestProperties defaultRequestProperties;
+ @Nullable private final String userAgent;
+ @Nullable private final CacheControl cacheControl;
+ @Nullable private final RequestProperties defaultRequestProperties;
- private @Nullable DataSpec dataSpec;
- private @Nullable Response response;
- private @Nullable InputStream responseByteStream;
+ @Nullable private Predicate contentTypePredicate;
+ @Nullable private DataSpec dataSpec;
+ @Nullable private Response response;
+ @Nullable private InputStream responseByteStream;
private boolean opened;
private long bytesToSkip;
@@ -79,7 +79,28 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
* @param userAgent An optional User-Agent string.
*/
public OkHttpDataSource(Call.Factory callFactory, @Nullable String userAgent) {
- this(callFactory, userAgent, /* contentTypePredicate= */ null);
+ this(callFactory, userAgent, /* cacheControl= */ null, /* defaultRequestProperties= */ null);
+ }
+
+ /**
+ * @param callFactory A {@link Call.Factory} (typically an {@link okhttp3.OkHttpClient}) for use
+ * by the source.
+ * @param userAgent An optional User-Agent string.
+ * @param cacheControl An optional {@link CacheControl} for setting the Cache-Control header.
+ * @param defaultRequestProperties Optional default {@link RequestProperties} to be sent to the
+ * server as HTTP headers on every request.
+ */
+ public OkHttpDataSource(
+ Call.Factory callFactory,
+ @Nullable String userAgent,
+ @Nullable CacheControl cacheControl,
+ @Nullable RequestProperties defaultRequestProperties) {
+ super(/* isNetwork= */ true);
+ this.callFactory = Assertions.checkNotNull(callFactory);
+ this.userAgent = userAgent;
+ this.cacheControl = cacheControl;
+ this.defaultRequestProperties = defaultRequestProperties;
+ this.requestProperties = new RequestProperties();
}
/**
@@ -89,7 +110,10 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
* @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
* predicate then a {@link InvalidContentTypeException} is thrown from {@link
* #open(DataSpec)}.
+ * @deprecated Use {@link #OkHttpDataSource(Call.Factory, String)} and {@link
+ * #setContentTypePredicate(Predicate)}.
*/
+ @Deprecated
public OkHttpDataSource(
Call.Factory callFactory,
@Nullable String userAgent,
@@ -110,9 +134,12 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
* predicate then a {@link InvalidContentTypeException} is thrown from {@link
* #open(DataSpec)}.
* @param cacheControl An optional {@link CacheControl} for setting the Cache-Control header.
- * @param defaultRequestProperties The optional default {@link RequestProperties} to be sent to
- * the server as HTTP headers on every request.
+ * @param defaultRequestProperties Optional default {@link RequestProperties} to be sent to the
+ * server as HTTP headers on every request.
+ * @deprecated Use {@link #OkHttpDataSource(Call.Factory, String, CacheControl,
+ * RequestProperties)} and {@link #setContentTypePredicate(Predicate)}.
*/
+ @Deprecated
public OkHttpDataSource(
Call.Factory callFactory,
@Nullable String userAgent,
@@ -128,8 +155,20 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
this.requestProperties = new RequestProperties();
}
+ /**
+ * Sets a content type {@link Predicate}. If a content type is rejected by the predicate then a
+ * {@link HttpDataSource.InvalidContentTypeException} is thrown from {@link #open(DataSpec)}.
+ *
+ * @param contentTypePredicate The content type {@link Predicate}, or {@code null} to clear a
+ * predicate that was previously set.
+ */
+ public void setContentTypePredicate(@Nullable Predicate contentTypePredicate) {
+ this.contentTypePredicate = contentTypePredicate;
+ }
+
@Override
- public @Nullable Uri getUri() {
+ @Nullable
+ public Uri getUri() {
return response == null ? null : Uri.parse(response.request().url().toString());
}
diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java
index d0ef35cb07..f3d74f9233 100644
--- a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java
+++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java
@@ -29,9 +29,9 @@ import okhttp3.Call;
public final class OkHttpDataSourceFactory extends BaseFactory {
private final Call.Factory callFactory;
- private final @Nullable String userAgent;
- private final @Nullable TransferListener listener;
- private final @Nullable CacheControl cacheControl;
+ @Nullable private final String userAgent;
+ @Nullable private final TransferListener listener;
+ @Nullable private final CacheControl cacheControl;
/**
* @param callFactory A {@link Call.Factory} (typically an {@link okhttp3.OkHttpClient}) for use
@@ -89,7 +89,6 @@ public final class OkHttpDataSourceFactory extends BaseFactory {
new OkHttpDataSource(
callFactory,
userAgent,
- /* contentTypePredicate= */ null,
cacheControl,
defaultRequestProperties);
if (listener != null) {
diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/package-info.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/package-info.java
new file mode 100644
index 0000000000..54eb4d5967
--- /dev/null
+++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.okhttp;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
index 56acbdb7d3..7b621a8df9 100644
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@@ -39,7 +39,9 @@ android {
dependencies {
implementation project(modulePrefix + 'library-core')
- testImplementation project(modulePrefix + 'testutils-robolectric')
+ implementation 'androidx.annotation:annotation:1.1.0'
+ testImplementation project(modulePrefix + 'testutils')
+ testImplementation 'org.robolectric:robolectric:' + robolectricVersion
androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
}
diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
index 7c6835db0b..382ee38e06 100644
--- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
+++ b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
@@ -82,7 +82,7 @@ public class OpusPlaybackTest {
public void run() {
Looper.prepare();
LibopusAudioRenderer audioRenderer = new LibopusAudioRenderer();
- DefaultTrackSelector trackSelector = new DefaultTrackSelector();
+ DefaultTrackSelector trackSelector = new DefaultTrackSelector(context);
player = ExoPlayerFactory.newInstance(context, new Renderer[] {audioRenderer}, trackSelector);
player.addListener(this);
MediaSource mediaSource =
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
index 59337c0847..2e9638c447 100644
--- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
+++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
@@ -16,6 +16,7 @@
package com.google.android.exoplayer2.ext.opus;
import android.os.Handler;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.audio.AudioProcessor;
@@ -25,20 +26,20 @@ import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.ExoMediaCrypto;
import com.google.android.exoplayer2.util.MimeTypes;
-/**
- * Decodes and renders audio using the native Opus decoder.
- */
-public final class LibopusAudioRenderer extends SimpleDecoderAudioRenderer {
+/** Decodes and renders audio using the native Opus decoder. */
+public class LibopusAudioRenderer extends SimpleDecoderAudioRenderer {
/** The number of input and output buffers. */
private static final int NUM_BUFFERS = 16;
/** The default input buffer size. */
private static final int DEFAULT_INPUT_BUFFER_SIZE = 960 * 6;
- private OpusDecoder decoder;
+ @Nullable private OpusDecoder decoder;
+ private int channelCount;
+ private int sampleRate;
public LibopusAudioRenderer() {
- this(null, null);
+ this(/* eventHandler= */ null, /* eventListener= */ null);
}
/**
@@ -48,8 +49,8 @@ public final class LibopusAudioRenderer extends SimpleDecoderAudioRenderer {
* @param audioProcessors Optional {@link AudioProcessor}s that will process audio before output.
*/
public LibopusAudioRenderer(
- Handler eventHandler,
- AudioRendererEventListener eventListener,
+ @Nullable Handler eventHandler,
+ @Nullable AudioRendererEventListener eventListener,
AudioProcessor... audioProcessors) {
super(eventHandler, eventListener, audioProcessors);
}
@@ -67,22 +68,30 @@ public final class LibopusAudioRenderer extends SimpleDecoderAudioRenderer {
* has obtained the keys necessary to decrypt encrypted regions of the media.
* @param audioProcessors Optional {@link AudioProcessor}s that will process audio before output.
*/
- public LibopusAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
- DrmSessionManager drmSessionManager, boolean playClearSamplesWithoutKeys,
+ public LibopusAudioRenderer(
+ @Nullable Handler eventHandler,
+ @Nullable AudioRendererEventListener eventListener,
+ @Nullable DrmSessionManager drmSessionManager,
+ boolean playClearSamplesWithoutKeys,
AudioProcessor... audioProcessors) {
super(eventHandler, eventListener, null, drmSessionManager, playClearSamplesWithoutKeys,
audioProcessors);
}
@Override
- protected int supportsFormatInternal(DrmSessionManager drmSessionManager,
- Format format) {
+ protected int supportsFormatInternal(
+ @Nullable DrmSessionManager drmSessionManager, Format format) {
+ boolean drmIsSupported =
+ format.drmInitData == null
+ || OpusLibrary.matchesExpectedExoMediaCryptoType(format.exoMediaCryptoType)
+ || (format.exoMediaCryptoType == null
+ && supportsFormatDrm(drmSessionManager, format.drmInitData));
if (!OpusLibrary.isAvailable()
|| !MimeTypes.AUDIO_OPUS.equalsIgnoreCase(format.sampleMimeType)) {
return FORMAT_UNSUPPORTED_TYPE;
} else if (!supportsOutput(format.channelCount, C.ENCODING_PCM_16BIT)) {
return FORMAT_UNSUPPORTED_SUBTYPE;
- } else if (!supportsFormatDrm(drmSessionManager, format.drmInitData)) {
+ } else if (!drmIsSupported) {
return FORMAT_UNSUPPORTED_DRM;
} else {
return FORMAT_HANDLED;
@@ -90,7 +99,7 @@ public final class LibopusAudioRenderer extends SimpleDecoderAudioRenderer {
}
@Override
- protected OpusDecoder createDecoder(Format format, ExoMediaCrypto mediaCrypto)
+ protected OpusDecoder createDecoder(Format format, @Nullable ExoMediaCrypto mediaCrypto)
throws OpusDecoderException {
int initialInputBufferSize =
format.maxInputSize != Format.NO_VALUE ? format.maxInputSize : DEFAULT_INPUT_BUFFER_SIZE;
@@ -101,14 +110,25 @@ public final class LibopusAudioRenderer extends SimpleDecoderAudioRenderer {
initialInputBufferSize,
format.initializationData,
mediaCrypto);
+ channelCount = decoder.getChannelCount();
+ sampleRate = decoder.getSampleRate();
return decoder;
}
@Override
protected Format getOutputFormat() {
- return Format.createAudioSampleFormat(null, MimeTypes.AUDIO_RAW, null, Format.NO_VALUE,
- Format.NO_VALUE, decoder.getChannelCount(), decoder.getSampleRate(), C.ENCODING_PCM_16BIT,
- null, null, 0, null);
+ return Format.createAudioSampleFormat(
+ /* id= */ null,
+ MimeTypes.AUDIO_RAW,
+ /* codecs= */ null,
+ Format.NO_VALUE,
+ Format.NO_VALUE,
+ channelCount,
+ sampleRate,
+ C.ENCODING_PCM_16BIT,
+ /* initializationData= */ null,
+ /* drmInitData= */ null,
+ /* selectionFlags= */ 0,
+ /* language= */ null);
}
-
}
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
index f8ec477b88..d93036113c 100644
--- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
+++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
@@ -15,6 +15,7 @@
*/
package com.google.android.exoplayer2.ext.opus;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.decoder.CryptoInfo;
import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
@@ -43,7 +44,7 @@ import java.util.List;
private static final int DECODE_ERROR = -1;
private static final int DRM_ERROR = -2;
- private final ExoMediaCrypto exoMediaCrypto;
+ @Nullable private final ExoMediaCrypto exoMediaCrypto;
private final int channelCount;
private final int headerSkipSamples;
@@ -65,8 +66,13 @@ import java.util.List;
* content. Maybe null and can be ignored if decoder does not handle encrypted content.
* @throws OpusDecoderException Thrown if an exception occurs when initializing the decoder.
*/
- public OpusDecoder(int numInputBuffers, int numOutputBuffers, int initialInputBufferSize,
- List initializationData, ExoMediaCrypto exoMediaCrypto) throws OpusDecoderException {
+ public OpusDecoder(
+ int numInputBuffers,
+ int numOutputBuffers,
+ int initialInputBufferSize,
+ List initializationData,
+ @Nullable ExoMediaCrypto exoMediaCrypto)
+ throws OpusDecoderException {
super(new DecoderInputBuffer[numInputBuffers], new SimpleOutputBuffer[numOutputBuffers]);
if (!OpusLibrary.isAvailable()) {
throw new OpusDecoderException("Failed to load decoder native libraries.");
@@ -150,6 +156,7 @@ import java.util.List;
}
@Override
+ @Nullable
protected OpusDecoderException decode(
DecoderInputBuffer inputBuffer, SimpleOutputBuffer outputBuffer, boolean reset) {
if (reset) {
@@ -230,10 +237,22 @@ import java.util.List;
int gain, byte[] streamMap);
private native int opusDecode(long decoder, long timeUs, ByteBuffer inputBuffer, int inputSize,
SimpleOutputBuffer outputBuffer);
- private native int opusSecureDecode(long decoder, long timeUs, ByteBuffer inputBuffer,
- int inputSize, SimpleOutputBuffer outputBuffer, int sampleRate,
- ExoMediaCrypto mediaCrypto, int inputMode, byte[] key, byte[] iv,
- int numSubSamples, int[] numBytesOfClearData, int[] numBytesOfEncryptedData);
+
+ private native int opusSecureDecode(
+ long decoder,
+ long timeUs,
+ ByteBuffer inputBuffer,
+ int inputSize,
+ SimpleOutputBuffer outputBuffer,
+ int sampleRate,
+ @Nullable ExoMediaCrypto mediaCrypto,
+ int inputMode,
+ byte[] key,
+ byte[] iv,
+ int numSubSamples,
+ int[] numBytesOfClearData,
+ int[] numBytesOfEncryptedData);
+
private native void opusClose(long decoder);
private native void opusReset(long decoder);
private native int opusGetErrorCode(long decoder);
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
index 285be96388..d09d69bf03 100644
--- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
+++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
@@ -15,8 +15,11 @@
*/
package com.google.android.exoplayer2.ext.opus;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
+import com.google.android.exoplayer2.drm.ExoMediaCrypto;
import com.google.android.exoplayer2.util.LibraryLoader;
+import com.google.android.exoplayer2.util.Util;
/**
* Configures and queries the underlying native library.
@@ -28,6 +31,7 @@ public final class OpusLibrary {
}
private static final LibraryLoader LOADER = new LibraryLoader("opusV2JNI");
+ @Nullable private static Class exoMediaCryptoType;
private OpusLibrary() {}
@@ -36,10 +40,14 @@ public final class OpusLibrary {
* it must do so before calling any other method defined by this class, and before instantiating a
* {@link LibopusAudioRenderer} instance.
*
+ * @param exoMediaCryptoType The {@link ExoMediaCrypto} type expected for decoding protected
+ * content.
* @param libraries The names of the Opus native libraries.
*/
- public static void setLibraries(String... libraries) {
+ public static void setLibraries(
+ Class exoMediaCryptoType, String... libraries) {
LOADER.setLibraries(libraries);
+ OpusLibrary.exoMediaCryptoType = exoMediaCryptoType;
}
/**
@@ -49,13 +57,21 @@ public final class OpusLibrary {
return LOADER.isAvailable();
}
- /**
- * Returns the version of the underlying library if available, or null otherwise.
- */
+ /** Returns the version of the underlying library if available, or null otherwise. */
+ @Nullable
public static String getVersion() {
return isAvailable() ? opusGetVersion() : null;
}
+ /**
+ * Returns whether the given {@link ExoMediaCrypto} type matches the one required for decoding
+ * protected content.
+ */
+ public static boolean matchesExpectedExoMediaCryptoType(
+ @Nullable Class exoMediaCryptoType) {
+ return Util.areEqual(OpusLibrary.exoMediaCryptoType, exoMediaCryptoType);
+ }
+
public static native String opusGetVersion();
public static native boolean opusIsSecureDecodeSupported();
}
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/package-info.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/package-info.java
new file mode 100644
index 0000000000..0848937fdc
--- /dev/null
+++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.opus;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/opus/src/test/AndroidManifest.xml b/extensions/opus/src/test/AndroidManifest.xml
index ac6a3bf68f..d17f889d17 100644
--- a/extensions/opus/src/test/AndroidManifest.xml
+++ b/extensions/opus/src/test/AndroidManifest.xml
@@ -14,4 +14,6 @@
limitations under the License.
-->
-
+
+
+
diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle
index ca734c3657..74ef70fbf0 100644
--- a/extensions/rtmp/build.gradle
+++ b/extensions/rtmp/build.gradle
@@ -33,8 +33,9 @@ android {
dependencies {
implementation project(modulePrefix + 'library-core')
implementation 'net.butterflytv.utils:rtmp-client:3.0.1'
- implementation 'androidx.annotation:annotation:1.0.2'
- testImplementation project(modulePrefix + 'testutils-robolectric')
+ implementation 'androidx.annotation:annotation:1.1.0'
+ testImplementation project(modulePrefix + 'testutils')
+ testImplementation 'org.robolectric:robolectric:' + robolectricVersion
}
ext {
diff --git a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java
index 272a8d1eb4..587e310d64 100644
--- a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java
+++ b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java
@@ -15,6 +15,8 @@
*/
package com.google.android.exoplayer2.ext.rtmp;
+import static com.google.android.exoplayer2.util.Util.castNonNull;
+
import android.net.Uri;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
@@ -22,7 +24,6 @@ import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
import com.google.android.exoplayer2.upstream.BaseDataSource;
import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DataSpec;
-import com.google.android.exoplayer2.upstream.TransferListener;
import java.io.IOException;
import net.butterflytv.rtmp_client.RtmpClient;
import net.butterflytv.rtmp_client.RtmpClient.RtmpIOException;
@@ -34,25 +35,13 @@ public final class RtmpDataSource extends BaseDataSource {
ExoPlayerLibraryInfo.registerModule("goog.exo.rtmp");
}
- private RtmpClient rtmpClient;
- private Uri uri;
+ @Nullable private RtmpClient rtmpClient;
+ @Nullable private Uri uri;
public RtmpDataSource() {
super(/* isNetwork= */ true);
}
- /**
- * @param listener An optional listener.
- * @deprecated Use {@link #RtmpDataSource()} and {@link #addTransferListener(TransferListener)}.
- */
- @Deprecated
- public RtmpDataSource(@Nullable TransferListener listener) {
- this();
- if (listener != null) {
- addTransferListener(listener);
- }
- }
-
@Override
public long open(DataSpec dataSpec) throws RtmpIOException {
transferInitializing(dataSpec);
@@ -66,7 +55,7 @@ public final class RtmpDataSource extends BaseDataSource {
@Override
public int read(byte[] buffer, int offset, int readLength) throws IOException {
- int bytesRead = rtmpClient.read(buffer, offset, readLength);
+ int bytesRead = castNonNull(rtmpClient).read(buffer, offset, readLength);
if (bytesRead == -1) {
return C.RESULT_END_OF_INPUT;
}
@@ -87,6 +76,7 @@ public final class RtmpDataSource extends BaseDataSource {
}
@Override
+ @Nullable
public Uri getUri() {
return uri;
}
diff --git a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
index 36abf825d6..505724e846 100644
--- a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
+++ b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
@@ -25,7 +25,7 @@ import com.google.android.exoplayer2.upstream.TransferListener;
*/
public final class RtmpDataSourceFactory implements DataSource.Factory {
- private final @Nullable TransferListener listener;
+ @Nullable private final TransferListener listener;
public RtmpDataSourceFactory() {
this(null);
diff --git a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/package-info.java b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/package-info.java
new file mode 100644
index 0000000000..cb16630bd3
--- /dev/null
+++ b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.rtmp;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/rtmp/src/test/AndroidManifest.xml b/extensions/rtmp/src/test/AndroidManifest.xml
index 7eab4e2d59..b2e19827d9 100644
--- a/extensions/rtmp/src/test/AndroidManifest.xml
+++ b/extensions/rtmp/src/test/AndroidManifest.xml
@@ -14,4 +14,6 @@
limitations under the License.
-->
-
+
+
+
diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 0de29eea32..be75eae359 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -29,6 +29,7 @@ VP9_EXT_PATH="${EXOPLAYER_ROOT}/extensions/vp9/src/main"
```
* Download the [Android NDK][] and set its location in an environment variable.
+ The build configuration has been tested with Android NDK r19c.
```
NDK_PATH=""
@@ -54,7 +55,7 @@ git checkout tags/v1.8.0 -b v1.8.0
```
cd ${VP9_EXT_PATH}/jni && \
-./generate_libvpx_android_configs.sh "${NDK_PATH}"
+./generate_libvpx_android_configs.sh
```
* Build the JNI native libraries from the command line:
@@ -66,7 +67,6 @@ ${NDK_PATH}/ndk-build APP_ABI=all -j4
[top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
[Android NDK]: https://developer.android.com/tools/sdk/ndk/index.html
-[#3520]: https://github.com/google/ExoPlayer/issues/3520
## Notes ##
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index fe1f220af6..3b8271869b 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -39,8 +39,9 @@ android {
dependencies {
implementation project(modulePrefix + 'library-core')
- implementation 'androidx.annotation:annotation:1.0.2'
- testImplementation project(modulePrefix + 'testutils-robolectric')
+ implementation 'androidx.annotation:annotation:1.1.0'
+ testImplementation project(modulePrefix + 'testutils')
+ testImplementation 'org.robolectric:robolectric:' + robolectricVersion
androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
androidTestImplementation 'com.google.truth:truth:' + truthVersion
diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
index 5ebeca68d0..9be1d9c0e5 100644
--- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
+++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
@@ -115,7 +115,7 @@ public class VpxPlaybackTest {
public void run() {
Looper.prepare();
LibvpxVideoRenderer videoRenderer = new LibvpxVideoRenderer(0);
- DefaultTrackSelector trackSelector = new DefaultTrackSelector();
+ DefaultTrackSelector trackSelector = new DefaultTrackSelector(context);
player = ExoPlayerFactory.newInstance(context, new Renderer[] {videoRenderer}, trackSelector);
player.addListener(this);
MediaSource mediaSource =
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
index d5da9a011d..b000ea1b6b 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
@@ -42,6 +42,7 @@ import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.TimedValueQueue;
import com.google.android.exoplayer2.util.TraceUtil;
import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.video.VideoDecoderInputBuffer;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoRendererEventListener;
import com.google.android.exoplayer2.video.VideoRendererEventListener.EventDispatcher;
@@ -123,7 +124,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
private Format pendingFormat;
private Format outputFormat;
private VpxDecoder decoder;
- private VpxInputBuffer inputBuffer;
+ private VideoDecoderInputBuffer inputBuffer;
private VpxOutputBuffer outputBuffer;
@Nullable private DrmSession decoderDrmSession;
@Nullable private DrmSession sourceDrmSession;
@@ -136,7 +137,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
private long joiningDeadlineMs;
private Surface surface;
private VpxOutputBufferRenderer outputBufferRenderer;
- private int outputMode;
+ @C.VideoOutputMode private int outputMode;
private boolean waitingForKeys;
private boolean inputStreamEnded;
@@ -173,8 +174,8 @@ public class LibvpxVideoRenderer extends BaseRenderer {
*/
public LibvpxVideoRenderer(
long allowedJoiningTimeMs,
- Handler eventHandler,
- VideoRendererEventListener eventListener,
+ @Nullable Handler eventHandler,
+ @Nullable VideoRendererEventListener eventListener,
int maxDroppedFramesToNotify) {
this(
allowedJoiningTimeMs,
@@ -205,10 +206,10 @@ public class LibvpxVideoRenderer extends BaseRenderer {
*/
public LibvpxVideoRenderer(
long allowedJoiningTimeMs,
- Handler eventHandler,
- VideoRendererEventListener eventListener,
+ @Nullable Handler eventHandler,
+ @Nullable VideoRendererEventListener eventListener,
int maxDroppedFramesToNotify,
- DrmSessionManager drmSessionManager,
+ @Nullable DrmSessionManager drmSessionManager,
boolean playClearSamplesWithoutKeys,
boolean disableLoopFilter) {
this(
@@ -248,10 +249,10 @@ public class LibvpxVideoRenderer extends BaseRenderer {
*/
public LibvpxVideoRenderer(
long allowedJoiningTimeMs,
- Handler eventHandler,
- VideoRendererEventListener eventListener,
+ @Nullable Handler eventHandler,
+ @Nullable VideoRendererEventListener eventListener,
int maxDroppedFramesToNotify,
- DrmSessionManager drmSessionManager,
+ @Nullable DrmSessionManager drmSessionManager,
boolean playClearSamplesWithoutKeys,
boolean disableLoopFilter,
boolean enableRowMultiThreadMode,
@@ -274,7 +275,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
formatQueue = new TimedValueQueue<>();
flagsOnlyBuffer = DecoderInputBuffer.newFlagsOnlyInstance();
eventDispatcher = new EventDispatcher(eventHandler, eventListener);
- outputMode = VpxDecoder.OUTPUT_MODE_NONE;
+ outputMode = C.VIDEO_OUTPUT_MODE_NONE;
decoderReinitializationState = REINITIALIZATION_STATE_NONE;
}
@@ -284,7 +285,13 @@ public class LibvpxVideoRenderer extends BaseRenderer {
public int supportsFormat(Format format) {
if (!VpxLibrary.isAvailable() || !MimeTypes.VIDEO_VP9.equalsIgnoreCase(format.sampleMimeType)) {
return FORMAT_UNSUPPORTED_TYPE;
- } else if (!supportsFormatDrm(drmSessionManager, format.drmInitData)) {
+ }
+ boolean drmIsSupported =
+ format.drmInitData == null
+ || VpxLibrary.matchesExpectedExoMediaCryptoType(format.exoMediaCryptoType)
+ || (format.exoMediaCryptoType == null
+ && supportsFormatDrm(drmSessionManager, format.drmInitData));
+ if (!drmIsSupported) {
return FORMAT_UNSUPPORTED_DRM;
}
return FORMAT_HANDLED | ADAPTIVE_SEAMLESS;
@@ -301,7 +308,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
flagsOnlyBuffer.clear();
int result = readSource(formatHolder, flagsOnlyBuffer, true);
if (result == C.RESULT_FORMAT_READ) {
- onInputFormatChanged(formatHolder.format);
+ onInputFormatChanged(formatHolder);
} else if (result == C.RESULT_BUFFER_READ) {
// End of stream read having not read a format.
Assertions.checkState(flagsOnlyBuffer.isEndOfStream());
@@ -342,8 +349,9 @@ public class LibvpxVideoRenderer extends BaseRenderer {
if (waitingForKeys) {
return false;
}
- if (format != null && (isSourceReady() || outputBuffer != null)
- && (renderedFirstFrame || outputMode == VpxDecoder.OUTPUT_MODE_NONE)) {
+ if (format != null
+ && (isSourceReady() || outputBuffer != null)
+ && (renderedFirstFrame || outputMode == C.VIDEO_OUTPUT_MODE_NONE)) {
// Ready. If we were joining then we've now joined, so clear the joining deadline.
joiningDeadlineMs = C.TIME_UNSET;
return true;
@@ -473,51 +481,46 @@ public class LibvpxVideoRenderer extends BaseRenderer {
}
private void setSourceDrmSession(@Nullable DrmSession session) {
- DrmSession previous = sourceDrmSession;
+ DrmSession.replaceSessionReferences(sourceDrmSession, session);
sourceDrmSession = session;
- releaseDrmSessionIfUnused(previous);
}
private void setDecoderDrmSession(@Nullable DrmSession session) {
- DrmSession previous = decoderDrmSession;
+ DrmSession.replaceSessionReferences(decoderDrmSession, session);
decoderDrmSession = session;
- releaseDrmSessionIfUnused(previous);
- }
-
- private void releaseDrmSessionIfUnused(@Nullable DrmSession session) {
- if (session != null && session != decoderDrmSession && session != sourceDrmSession) {
- drmSessionManager.releaseSession(session);
- }
}
/**
* Called when a new format is read from the upstream source.
*
- * @param newFormat The new format.
+ * @param formatHolder A {@link FormatHolder} that holds the new {@link Format}.
* @throws ExoPlaybackException If an error occurs (re-)initializing the decoder.
*/
@CallSuper
- protected void onInputFormatChanged(Format newFormat) throws ExoPlaybackException {
+ @SuppressWarnings("unchecked")
+ protected void onInputFormatChanged(FormatHolder formatHolder) throws ExoPlaybackException {
Format oldFormat = format;
- format = newFormat;
- pendingFormat = newFormat;
+ format = formatHolder.format;
+ pendingFormat = format;
boolean drmInitDataChanged = !Util.areEqual(format.drmInitData, oldFormat == null ? null
: oldFormat.drmInitData);
if (drmInitDataChanged) {
if (format.drmInitData != null) {
- if (drmSessionManager == null) {
- throw ExoPlaybackException.createForRenderer(
- new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
+ if (formatHolder.includesDrmSession) {
+ setSourceDrmSession((DrmSession) formatHolder.drmSession);
+ } else {
+ if (drmSessionManager == null) {
+ throw ExoPlaybackException.createForRenderer(
+ new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
+ }
+ DrmSession session =
+ drmSessionManager.acquireSession(Looper.myLooper(), format.drmInitData);
+ if (sourceDrmSession != null) {
+ sourceDrmSession.releaseReference();
+ }
+ sourceDrmSession = session;
}
- DrmSession session =
- drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData);
- if (session == decoderDrmSession || session == sourceDrmSession) {
- // We already had this session. The manager must be reference counting, so release it once
- // to get the count attributed to this renderer back down to 1.
- drmSessionManager.releaseSession(session);
- }
- setSourceDrmSession(session);
} else {
setSourceDrmSession(null);
}
@@ -544,7 +547,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
*
* @param buffer The buffer that will be queued.
*/
- protected void onQueueInputBuffer(VpxInputBuffer buffer) {
+ protected void onQueueInputBuffer(VideoDecoderInputBuffer buffer) {
// Do nothing.
}
@@ -626,8 +629,8 @@ public class LibvpxVideoRenderer extends BaseRenderer {
*/
protected void renderOutputBuffer(VpxOutputBuffer outputBuffer) throws VpxDecoderException {
int bufferMode = outputBuffer.mode;
- boolean renderSurface = bufferMode == VpxDecoder.OUTPUT_MODE_SURFACE_YUV && surface != null;
- boolean renderYuv = bufferMode == VpxDecoder.OUTPUT_MODE_YUV && outputBufferRenderer != null;
+ boolean renderSurface = bufferMode == C.VIDEO_OUTPUT_MODE_SURFACE_YUV && surface != null;
+ boolean renderYuv = bufferMode == C.VIDEO_OUTPUT_MODE_YUV && outputBufferRenderer != null;
lastRenderTimeUs = SystemClock.elapsedRealtime() * 1000;
if (!renderYuv && !renderSurface) {
dropOutputBuffer(outputBuffer);
@@ -711,12 +714,12 @@ public class LibvpxVideoRenderer extends BaseRenderer {
this.surface = surface;
this.outputBufferRenderer = outputBufferRenderer;
if (surface != null) {
- outputMode = VpxDecoder.OUTPUT_MODE_SURFACE_YUV;
+ outputMode = C.VIDEO_OUTPUT_MODE_SURFACE_YUV;
} else {
outputMode =
- outputBufferRenderer != null ? VpxDecoder.OUTPUT_MODE_YUV : VpxDecoder.OUTPUT_MODE_NONE;
+ outputBufferRenderer != null ? C.VIDEO_OUTPUT_MODE_YUV : C.VIDEO_OUTPUT_MODE_NONE;
}
- if (outputMode != VpxDecoder.OUTPUT_MODE_NONE) {
+ if (outputMode != C.VIDEO_OUTPUT_MODE_NONE) {
if (decoder != null) {
decoder.setOutputMode(outputMode);
}
@@ -733,7 +736,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
clearReportedVideoSize();
clearRenderedFirstFrame();
}
- } else if (outputMode != VpxDecoder.OUTPUT_MODE_NONE) {
+ } else if (outputMode != C.VIDEO_OUTPUT_MODE_NONE) {
// The output is unchanged and non-null. If we know the video size and/or have already
// rendered to the output, report these again immediately.
maybeRenotifyVideoSizeChanged();
@@ -825,7 +828,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
return false;
}
if (result == C.RESULT_FORMAT_READ) {
- onInputFormatChanged(formatHolder.format);
+ onInputFormatChanged(formatHolder);
return true;
}
if (inputBuffer.isEndOfStream()) {
@@ -844,7 +847,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
pendingFormat = null;
}
inputBuffer.flip();
- inputBuffer.colorInfo = formatHolder.format.colorInfo;
+ inputBuffer.colorInfo = format.colorInfo;
onQueueInputBuffer(inputBuffer);
decoder.queueInputBuffer(inputBuffer);
buffersInCodecCount++;
@@ -913,7 +916,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
}
long earlyUs = outputBuffer.timeUs - positionUs;
- if (outputMode == VpxDecoder.OUTPUT_MODE_NONE) {
+ if (outputMode == C.VIDEO_OUTPUT_MODE_NONE) {
// Skip frames in sync with playback, so we'll be at the right frame if the mode changes.
if (isBufferLate(earlyUs)) {
skipOutputBuffer(outputBuffer);
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
index 57e5481b55..0efd4bd0ea 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
@@ -15,32 +15,28 @@
*/
package com.google.android.exoplayer2.ext.vp9;
+import androidx.annotation.Nullable;
import android.view.Surface;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.decoder.CryptoInfo;
import com.google.android.exoplayer2.decoder.SimpleDecoder;
import com.google.android.exoplayer2.drm.DecryptionException;
import com.google.android.exoplayer2.drm.ExoMediaCrypto;
+import com.google.android.exoplayer2.video.VideoDecoderInputBuffer;
import java.nio.ByteBuffer;
-/**
- * Vpx decoder.
- */
-/* package */ final class VpxDecoder extends
- SimpleDecoder {
-
- public static final int OUTPUT_MODE_NONE = -1;
- public static final int OUTPUT_MODE_YUV = 0;
- public static final int OUTPUT_MODE_SURFACE_YUV = 1;
+/** Vpx decoder. */
+/* package */ final class VpxDecoder
+ extends SimpleDecoder {
private static final int NO_ERROR = 0;
private static final int DECODE_ERROR = 1;
private static final int DRM_ERROR = 2;
- private final ExoMediaCrypto exoMediaCrypto;
+ @Nullable private final ExoMediaCrypto exoMediaCrypto;
private final long vpxDecContext;
- private volatile int outputMode;
+ @C.VideoOutputMode private volatile int outputMode;
/**
* Creates a VP9 decoder.
@@ -59,12 +55,12 @@ import java.nio.ByteBuffer;
int numInputBuffers,
int numOutputBuffers,
int initialInputBufferSize,
- ExoMediaCrypto exoMediaCrypto,
+ @Nullable ExoMediaCrypto exoMediaCrypto,
boolean disableLoopFilter,
boolean enableRowMultiThreadMode,
int threads)
throws VpxDecoderException {
- super(new VpxInputBuffer[numInputBuffers], new VpxOutputBuffer[numOutputBuffers]);
+ super(new VideoDecoderInputBuffer[numInputBuffers], new VpxOutputBuffer[numOutputBuffers]);
if (!VpxLibrary.isAvailable()) {
throw new VpxDecoderException("Failed to load decoder native libraries.");
}
@@ -87,16 +83,15 @@ import java.nio.ByteBuffer;
/**
* Sets the output mode for frames rendered by the decoder.
*
- * @param outputMode The output mode. One of {@link #OUTPUT_MODE_NONE} and {@link
- * #OUTPUT_MODE_YUV}.
+ * @param outputMode The output mode.
*/
- public void setOutputMode(int outputMode) {
+ public void setOutputMode(@C.VideoOutputMode int outputMode) {
this.outputMode = outputMode;
}
@Override
- protected VpxInputBuffer createInputBuffer() {
- return new VpxInputBuffer();
+ protected VideoDecoderInputBuffer createInputBuffer() {
+ return new VideoDecoderInputBuffer();
}
@Override
@@ -108,7 +103,7 @@ import java.nio.ByteBuffer;
protected void releaseOutputBuffer(VpxOutputBuffer buffer) {
// Decode only frames do not acquire a reference on the internal decoder buffer and thus do not
// require a call to vpxReleaseFrame.
- if (outputMode == OUTPUT_MODE_SURFACE_YUV && !buffer.isDecodeOnly()) {
+ if (outputMode == C.VIDEO_OUTPUT_MODE_SURFACE_YUV && !buffer.isDecodeOnly()) {
vpxReleaseFrame(vpxDecContext, buffer);
}
super.releaseOutputBuffer(buffer);
@@ -120,8 +115,9 @@ import java.nio.ByteBuffer;
}
@Override
- protected VpxDecoderException decode(VpxInputBuffer inputBuffer, VpxOutputBuffer outputBuffer,
- boolean reset) {
+ @Nullable
+ protected VpxDecoderException decode(
+ VideoDecoderInputBuffer inputBuffer, VpxOutputBuffer outputBuffer, boolean reset) {
ByteBuffer inputData = inputBuffer.data;
int inputSize = inputData.limit();
CryptoInfo cryptoInfo = inputBuffer.cryptoInfo;
@@ -174,9 +170,19 @@ import java.nio.ByteBuffer;
private native long vpxClose(long context);
private native long vpxDecode(long context, ByteBuffer encoded, int length);
- private native long vpxSecureDecode(long context, ByteBuffer encoded, int length,
- ExoMediaCrypto mediaCrypto, int inputMode, byte[] key, byte[] iv,
- int numSubSamples, int[] numBytesOfClearData, int[] numBytesOfEncryptedData);
+
+ private native long vpxSecureDecode(
+ long context,
+ ByteBuffer encoded,
+ int length,
+ @Nullable ExoMediaCrypto mediaCrypto,
+ int inputMode,
+ byte[] key,
+ byte[] iv,
+ int numSubSamples,
+ int[] numBytesOfClearData,
+ int[] numBytesOfEncryptedData);
+
private native int vpxGetFrame(long context, VpxOutputBuffer outputBuffer);
/**
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java
index 8de14629d3..b2da9a7ff8 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java
@@ -15,8 +15,10 @@
*/
package com.google.android.exoplayer2.ext.vp9;
+import com.google.android.exoplayer2.video.VideoDecoderException;
+
/** Thrown when a libvpx decoder error occurs. */
-public final class VpxDecoderException extends Exception {
+public final class VpxDecoderException extends VideoDecoderException {
/* package */ VpxDecoderException(String message) {
super(message);
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
index 5a65fc56ff..e620332fc8 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
@@ -15,8 +15,11 @@
*/
package com.google.android.exoplayer2.ext.vp9;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
+import com.google.android.exoplayer2.drm.ExoMediaCrypto;
import com.google.android.exoplayer2.util.LibraryLoader;
+import com.google.android.exoplayer2.util.Util;
/**
* Configures and queries the underlying native library.
@@ -28,6 +31,7 @@ public final class VpxLibrary {
}
private static final LibraryLoader LOADER = new LibraryLoader("vpx", "vpxV2JNI");
+ @Nullable private static Class exoMediaCryptoType;
private VpxLibrary() {}
@@ -36,10 +40,14 @@ public final class VpxLibrary {
* it must do so before calling any other method defined by this class, and before instantiating a
* {@link LibvpxVideoRenderer} instance.
*
+ * @param exoMediaCryptoType The {@link ExoMediaCrypto} type required for decoding protected
+ * content.
* @param libraries The names of the Vpx native libraries.
*/
- public static void setLibraries(String... libraries) {
+ public static void setLibraries(
+ Class exoMediaCryptoType, String... libraries) {
LOADER.setLibraries(libraries);
+ VpxLibrary.exoMediaCryptoType = exoMediaCryptoType;
}
/**
@@ -49,9 +57,8 @@ public final class VpxLibrary {
return LOADER.isAvailable();
}
- /**
- * Returns the version of the underlying library if available, or null otherwise.
- */
+ /** Returns the version of the underlying library if available, or null otherwise. */
+ @Nullable
public static String getVersion() {
return isAvailable() ? vpxGetVersion() : null;
}
@@ -60,6 +67,7 @@ public final class VpxLibrary {
* Returns the configuration string with which the underlying library was built if available, or
* null otherwise.
*/
+ @Nullable
public static String getBuildConfig() {
return isAvailable() ? vpxGetBuildConfig() : null;
}
@@ -74,6 +82,15 @@ public final class VpxLibrary {
return indexHbd >= 0;
}
+ /**
+ * Returns whether the given {@link ExoMediaCrypto} type matches the one required for decoding
+ * protected content.
+ */
+ public static boolean matchesExpectedExoMediaCryptoType(
+ @Nullable Class exoMediaCryptoType) {
+ return Util.areEqual(VpxLibrary.exoMediaCryptoType, exoMediaCryptoType);
+ }
+
private static native String vpxGetVersion();
private static native String vpxGetBuildConfig();
public static native boolean vpxIsSecureDecodeSupported();
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
index 22330e0a05..7177cde12e 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
@@ -15,37 +15,12 @@
*/
package com.google.android.exoplayer2.ext.vp9;
-import com.google.android.exoplayer2.decoder.OutputBuffer;
-import com.google.android.exoplayer2.video.ColorInfo;
-import java.nio.ByteBuffer;
+import com.google.android.exoplayer2.video.VideoDecoderOutputBuffer;
-/** Output buffer containing video frame data, populated by {@link VpxDecoder}. */
-public final class VpxOutputBuffer extends OutputBuffer {
-
- public static final int COLORSPACE_UNKNOWN = 0;
- public static final int COLORSPACE_BT601 = 1;
- public static final int COLORSPACE_BT709 = 2;
- public static final int COLORSPACE_BT2020 = 3;
+/** Video output buffer, populated by {@link VpxDecoder}. */
+public final class VpxOutputBuffer extends VideoDecoderOutputBuffer {
private final VpxDecoder owner;
- /** Decoder private data. */
- public int decoderPrivate;
-
- public int mode;
- /**
- * RGB buffer for RGB mode.
- */
- public ByteBuffer data;
- public int width;
- public int height;
- public ColorInfo colorInfo;
-
- /**
- * YUV planes for YUV mode.
- */
- public ByteBuffer[] yuvPlanes;
- public int[] yuvStrides;
- public int colorspace;
public VpxOutputBuffer(VpxDecoder owner) {
this.owner = owner;
@@ -56,75 +31,4 @@ public final class VpxOutputBuffer extends OutputBuffer {
owner.releaseOutputBuffer(this);
}
- /**
- * Initializes the buffer.
- *
- * @param timeUs The presentation timestamp for the buffer, in microseconds.
- * @param mode The output mode. One of {@link VpxDecoder#OUTPUT_MODE_NONE} and {@link
- * VpxDecoder#OUTPUT_MODE_YUV}.
- */
- public void init(long timeUs, int mode) {
- this.timeUs = timeUs;
- this.mode = mode;
- }
-
- /**
- * Resizes the buffer based on the given stride. Called via JNI after decoding completes.
- *
- * @return Whether the buffer was resized successfully.
- */
- public boolean initForYuvFrame(int width, int height, int yStride, int uvStride, int colorspace) {
- this.width = width;
- this.height = height;
- this.colorspace = colorspace;
- int uvHeight = (int) (((long) height + 1) / 2);
- if (!isSafeToMultiply(yStride, height) || !isSafeToMultiply(uvStride, uvHeight)) {
- return false;
- }
- int yLength = yStride * height;
- int uvLength = uvStride * uvHeight;
- int minimumYuvSize = yLength + (uvLength * 2);
- if (!isSafeToMultiply(uvLength, 2) || minimumYuvSize < yLength) {
- return false;
- }
- initData(minimumYuvSize);
-
- if (yuvPlanes == null) {
- yuvPlanes = new ByteBuffer[3];
- }
- // Rewrapping has to be done on every frame since the stride might have changed.
- yuvPlanes[0] = data.slice();
- yuvPlanes[0].limit(yLength);
- data.position(yLength);
- yuvPlanes[1] = data.slice();
- yuvPlanes[1].limit(uvLength);
- data.position(yLength + uvLength);
- yuvPlanes[2] = data.slice();
- yuvPlanes[2].limit(uvLength);
- if (yuvStrides == null) {
- yuvStrides = new int[3];
- }
- yuvStrides[0] = yStride;
- yuvStrides[1] = uvStride;
- yuvStrides[2] = uvStride;
- return true;
- }
-
- private void initData(int size) {
- if (data == null || data.capacity() < size) {
- data = ByteBuffer.allocateDirect(size);
- } else {
- data.position(0);
- data.limit(size);
- }
- }
-
- /**
- * Ensures that the result of multiplying individual numbers can fit into the size limit of an
- * integer.
- */
- private boolean isSafeToMultiply(int a, int b) {
- return a >= 0 && b >= 0 && !(b > 0 && a >= Integer.MAX_VALUE / b);
- }
-
}
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java
index 8c765952e7..4e983cccc7 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.ext.vp9;
import android.content.Context;
import android.opengl.GLSurfaceView;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
/**
@@ -27,10 +28,10 @@ public class VpxVideoSurfaceView extends GLSurfaceView implements VpxOutputBuffe
private final VpxRenderer renderer;
public VpxVideoSurfaceView(Context context) {
- this(context, null);
+ this(context, /* attrs= */ null);
}
- public VpxVideoSurfaceView(Context context, AttributeSet attrs) {
+ public VpxVideoSurfaceView(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
renderer = new VpxRenderer();
setPreserveEGLContextOnPause(true);
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/package-info.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/package-info.java
new file mode 100644
index 0000000000..b8725607a5
--- /dev/null
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.vp9;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/extensions/vp9/src/main/jni/Application.mk b/extensions/vp9/src/main/jni/Application.mk
index 59bf5f8f87..ed28f07acb 100644
--- a/extensions/vp9/src/main/jni/Application.mk
+++ b/extensions/vp9/src/main/jni/Application.mk
@@ -15,6 +15,6 @@
#
APP_OPTIM := release
-APP_STL := gnustl_static
+APP_STL := c++_static
APP_CPPFLAGS := -frtti
-APP_PLATFORM := android-9
+APP_PLATFORM := android-16
diff --git a/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh b/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh
index eab6862555..18f1dd5c69 100755
--- a/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh
+++ b/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh
@@ -20,46 +20,33 @@
set -e
-if [ $# -ne 1 ]; then
- echo "Usage: ${0} "
+if [ $# -ne 0 ]; then
+ echo "Usage: ${0}"
exit
fi
-ndk="${1}"
-shift 1
-
# configuration parameters common to all architectures
common_params="--disable-examples --disable-docs --enable-realtime-only"
common_params+=" --disable-vp8 --disable-vp9-encoder --disable-webm-io"
common_params+=" --disable-libyuv --disable-runtime-cpu-detect"
+common_params+=" --enable-external-build"
# configuration parameters for various architectures
arch[0]="armeabi-v7a"
-config[0]="--target=armv7-android-gcc --sdk-path=$ndk --enable-neon"
-config[0]+=" --enable-neon-asm"
+config[0]="--target=armv7-android-gcc --enable-neon --enable-neon-asm"
-arch[1]="armeabi"
-config[1]="--target=armv7-android-gcc --sdk-path=$ndk --disable-neon"
-config[1]+=" --disable-neon-asm"
+arch[1]="x86"
+config[1]="--force-target=x86-android-gcc --disable-sse2"
+config[1]+=" --disable-sse3 --disable-ssse3 --disable-sse4_1 --disable-avx"
+config[1]+=" --disable-avx2 --enable-pic"
-arch[2]="mips"
-config[2]="--force-target=mips32-android-gcc --sdk-path=$ndk"
+arch[2]="arm64-v8a"
+config[2]="--force-target=armv8-android-gcc --enable-neon"
-arch[3]="x86"
-config[3]="--force-target=x86-android-gcc --sdk-path=$ndk --disable-sse2"
+arch[3]="x86_64"
+config[3]="--force-target=x86_64-android-gcc --disable-sse2"
config[3]+=" --disable-sse3 --disable-ssse3 --disable-sse4_1 --disable-avx"
-config[3]+=" --disable-avx2 --enable-pic"
-
-arch[4]="arm64-v8a"
-config[4]="--force-target=armv8-android-gcc --sdk-path=$ndk --enable-neon"
-
-arch[5]="x86_64"
-config[5]="--force-target=x86_64-android-gcc --sdk-path=$ndk --disable-sse2"
-config[5]+=" --disable-sse3 --disable-ssse3 --disable-sse4_1 --disable-avx"
-config[5]+=" --disable-avx2 --enable-pic --disable-neon --disable-neon-asm"
-
-arch[6]="mips64"
-config[6]="--force-target=mips64-android-gcc --sdk-path=$ndk"
+config[3]+=" --disable-avx2 --enable-pic --disable-neon --disable-neon-asm"
limit=$((${#arch[@]} - 1))
@@ -102,10 +89,7 @@ for i in $(seq 0 ${limit}); do
# configure and make
echo "build_android_configs: "
echo "configure ${config[${i}]} ${common_params}"
- ../../libvpx/configure ${config[${i}]} ${common_params} --extra-cflags=" \
- -isystem $ndk/sysroot/usr/include/arm-linux-androideabi \
- -isystem $ndk/sysroot/usr/include \
- "
+ ../../libvpx/configure ${config[${i}]} ${common_params}
rm -f libvpx_srcs.txt
for f in ${allowed_files}; do
# the build system supports multiple different configurations. avoid
diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index 82c023afbc..9fc8b09a18 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -60,6 +60,7 @@
// JNI references for VpxOutputBuffer class.
static jmethodID initForYuvFrame;
+static jmethodID initForPrivateFrame;
static jfieldID dataField;
static jfieldID outputModeField;
static jfieldID decoderPrivateField;
@@ -481,6 +482,8 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
"com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer");
initForYuvFrame = env->GetMethodID(outputBufferClass, "initForYuvFrame",
"(IIIII)Z");
+ initForPrivateFrame =
+ env->GetMethodID(outputBufferClass, "initForPrivateFrame", "(II)V");
dataField = env->GetFieldID(outputBufferClass, "data",
"Ljava/nio/ByteBuffer;");
outputModeField = env->GetFieldID(outputBufferClass, "mode", "I");
@@ -602,6 +605,10 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) {
}
jfb->d_w = img->d_w;
jfb->d_h = img->d_h;
+ env->CallVoidMethod(jOutputBuffer, initForPrivateFrame, img->d_w, img->d_h);
+ if (env->ExceptionCheck()) {
+ return -1;
+ }
env->SetIntField(jOutputBuffer, decoderPrivateField,
id + kDecoderPrivateBase);
}
diff --git a/extensions/vp9/src/test/AndroidManifest.xml b/extensions/vp9/src/test/AndroidManifest.xml
index a0123f17db..851213e653 100644
--- a/extensions/vp9/src/test/AndroidManifest.xml
+++ b/extensions/vp9/src/test/AndroidManifest.xml
@@ -14,4 +14,6 @@
limitations under the License.
-->
-
+
+
+
diff --git a/extensions/workmanager/README.md b/extensions/workmanager/README.md
new file mode 100644
index 0000000000..bd2dbc71ad
--- /dev/null
+++ b/extensions/workmanager/README.md
@@ -0,0 +1,22 @@
+# ExoPlayer WorkManager extension
+
+This extension provides a Scheduler implementation which uses [WorkManager][].
+
+[WorkManager]: https://developer.android.com/topic/libraries/architecture/workmanager.html
+
+## Getting the extension
+
+The easiest way to use the extension is to add it as a gradle dependency:
+
+```gradle
+implementation 'com.google.android.exoplayer:extension-workmanager:2.X.X'
+```
+
+where `2.X.X` is the version, which must match the version of the ExoPlayer
+library being used.
+
+Alternatively, you can clone the ExoPlayer repository and depend on the module
+locally. Instructions for doing this can be found in ExoPlayer's
+[top level README][].
+
+[top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
diff --git a/extensions/workmanager/build.gradle b/extensions/workmanager/build.gradle
new file mode 100644
index 0000000000..ea7564316f
--- /dev/null
+++ b/extensions/workmanager/build.gradle
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+apply from: '../../constants.gradle'
+apply plugin: 'com.android.library'
+
+android {
+ compileSdkVersion project.ext.compileSdkVersion
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+ defaultConfig {
+ minSdkVersion project.ext.minSdkVersion
+ targetSdkVersion project.ext.targetSdkVersion
+ }
+
+ testOptions.unitTests.includeAndroidResources = true
+}
+
+dependencies {
+ implementation project(modulePrefix + 'library-core')
+ implementation 'androidx.work:work-runtime:2.1.0'
+}
+
+ext {
+ javadocTitle = 'WorkManager extension'
+}
+apply from: '../../javadoc_library.gradle'
+
+ext {
+ releaseArtifact = 'extension-workmanager'
+ releaseDescription = 'WorkManager extension for ExoPlayer.'
+}
+apply from: '../../publish.gradle'
diff --git a/extensions/workmanager/src/main/AndroidManifest.xml b/extensions/workmanager/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..1daf50bd00
--- /dev/null
+++ b/extensions/workmanager/src/main/AndroidManifest.xml
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java b/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java
new file mode 100644
index 0000000000..01801c9897
--- /dev/null
+++ b/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.ext.workmanager;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.Intent;
+import androidx.work.Constraints;
+import androidx.work.Data;
+import androidx.work.ExistingWorkPolicy;
+import androidx.work.NetworkType;
+import androidx.work.OneTimeWorkRequest;
+import androidx.work.WorkManager;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
+import com.google.android.exoplayer2.scheduler.Requirements;
+import com.google.android.exoplayer2.scheduler.Scheduler;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.Util;
+
+/** A {@link Scheduler} that uses {@link WorkManager}. */
+public final class WorkManagerScheduler implements Scheduler {
+
+ private static final boolean DEBUG = false;
+ private static final String TAG = "WorkManagerScheduler";
+ private static final String KEY_SERVICE_ACTION = "service_action";
+ private static final String KEY_SERVICE_PACKAGE = "service_package";
+ private static final String KEY_REQUIREMENTS = "requirements";
+
+ private final String workName;
+
+ /**
+ * @param workName A name for work scheduled by this instance. If the same name was used by a
+ * previous instance, anything scheduled by the previous instance will be canceled by this
+ * instance if {@link #schedule(Requirements, String, String)} or {@link #cancel()} are
+ * called.
+ */
+ public WorkManagerScheduler(String workName) {
+ this.workName = workName;
+ }
+
+ @Override
+ public boolean schedule(Requirements requirements, String servicePackage, String serviceAction) {
+ Constraints constraints = buildConstraints(requirements);
+ Data inputData = buildInputData(requirements, servicePackage, serviceAction);
+ OneTimeWorkRequest workRequest = buildWorkRequest(constraints, inputData);
+ logd("Scheduling work: " + workName);
+ WorkManager.getInstance().enqueueUniqueWork(workName, ExistingWorkPolicy.REPLACE, workRequest);
+ return true;
+ }
+
+ @Override
+ public boolean cancel() {
+ logd("Canceling work: " + workName);
+ WorkManager.getInstance().cancelUniqueWork(workName);
+ return true;
+ }
+
+ private static Constraints buildConstraints(Requirements requirements) {
+ Constraints.Builder builder = new Constraints.Builder();
+
+ if (requirements.isUnmeteredNetworkRequired()) {
+ builder.setRequiredNetworkType(NetworkType.UNMETERED);
+ } else if (requirements.isNetworkRequired()) {
+ builder.setRequiredNetworkType(NetworkType.CONNECTED);
+ } else {
+ builder.setRequiredNetworkType(NetworkType.NOT_REQUIRED);
+ }
+
+ if (requirements.isChargingRequired()) {
+ builder.setRequiresCharging(true);
+ }
+
+ if (requirements.isIdleRequired() && Util.SDK_INT >= 23) {
+ setRequiresDeviceIdle(builder);
+ }
+
+ return builder.build();
+ }
+
+ @TargetApi(23)
+ private static void setRequiresDeviceIdle(Constraints.Builder builder) {
+ builder.setRequiresDeviceIdle(true);
+ }
+
+ private static Data buildInputData(
+ Requirements requirements, String servicePackage, String serviceAction) {
+ Data.Builder builder = new Data.Builder();
+
+ builder.putInt(KEY_REQUIREMENTS, requirements.getRequirements());
+ builder.putString(KEY_SERVICE_PACKAGE, servicePackage);
+ builder.putString(KEY_SERVICE_ACTION, serviceAction);
+
+ return builder.build();
+ }
+
+ private static OneTimeWorkRequest buildWorkRequest(Constraints constraints, Data inputData) {
+ OneTimeWorkRequest.Builder builder = new OneTimeWorkRequest.Builder(SchedulerWorker.class);
+
+ builder.setConstraints(constraints);
+ builder.setInputData(inputData);
+
+ return builder.build();
+ }
+
+ private static void logd(String message) {
+ if (DEBUG) {
+ Log.d(TAG, message);
+ }
+ }
+
+ /** A {@link Worker} that starts the target service if the requirements are met. */
+ // This class needs to be public so that WorkManager can instantiate it.
+ public static final class SchedulerWorker extends Worker {
+
+ private final WorkerParameters workerParams;
+ private final Context context;
+
+ public SchedulerWorker(Context context, WorkerParameters workerParams) {
+ super(context, workerParams);
+ this.workerParams = workerParams;
+ this.context = context;
+ }
+
+ @Override
+ public Result doWork() {
+ logd("SchedulerWorker is started");
+ Data inputData = workerParams.getInputData();
+ Assertions.checkNotNull(inputData, "Work started without input data.");
+ Requirements requirements = new Requirements(inputData.getInt(KEY_REQUIREMENTS, 0));
+ if (requirements.checkRequirements(context)) {
+ logd("Requirements are met");
+ String serviceAction = inputData.getString(KEY_SERVICE_ACTION);
+ String servicePackage = inputData.getString(KEY_SERVICE_PACKAGE);
+ Assertions.checkNotNull(serviceAction, "Service action missing.");
+ Assertions.checkNotNull(servicePackage, "Service package missing.");
+ Intent intent = new Intent(serviceAction).setPackage(servicePackage);
+ logd("Starting service action: " + serviceAction + " package: " + servicePackage);
+ Util.startForegroundService(context, intent);
+ return Result.success();
+ } else {
+ logd("Requirements are not met");
+ return Result.retry();
+ }
+ }
+ }
+}
diff --git a/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/package-info.java b/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/package-info.java
new file mode 100644
index 0000000000..7e0e244231
--- /dev/null
+++ b/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package com.google.android.exoplayer2.ext.workmanager;
+
+import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/library/core/build.gradle b/library/core/build.gradle
index f532ae0e6a..fda2f079de 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -42,7 +42,6 @@ android {
}
test {
java.srcDirs += '../../testutils/src/main/java/'
- java.srcDirs += '../../testutils_robolectric/src/main/java/'
}
}
@@ -58,9 +57,12 @@ android {
}
dependencies {
- implementation 'androidx.annotation:annotation:1.0.2'
+ implementation 'androidx.annotation:annotation:1.1.0'
+ compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
+ // Uncomment to enable Kotlin non-null strict mode. See [internal: b/138703808].
+ // compileOnly "org.jetbrains.kotlin:kotlin-annotations-jvm:1.1.60"
androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
androidTestImplementation 'com.google.truth:truth:' + truthVersion
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
index 774f1b452c..bb14ac147b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
@@ -94,11 +94,19 @@ public abstract class BasePlayer implements Player {
@Override
@Nullable
public final Object getCurrentTag() {
- int windowIndex = getCurrentWindowIndex();
Timeline timeline = getCurrentTimeline();
- return windowIndex >= timeline.getWindowCount()
+ return timeline.isEmpty()
? null
- : timeline.getWindow(windowIndex, window, /* setTag= */ true).tag;
+ : timeline.getWindow(getCurrentWindowIndex(), window, /* setTag= */ true).tag;
+ }
+
+ @Override
+ @Nullable
+ public final Object getCurrentManifest() {
+ Timeline timeline = getCurrentTimeline();
+ return timeline.isEmpty()
+ ? null
+ : timeline.getWindow(getCurrentWindowIndex(), window, /* setTag= */ false).manifest;
}
@Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index afe6a9879b..daa6124df6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -71,9 +71,10 @@ public final class C {
/** Represents an unset or unknown percentage. */
public static final int PERCENTAGE_UNSET = -1;
- /**
- * The number of microseconds in one second.
- */
+ /** The number of milliseconds in one second. */
+ public static final long MILLIS_PER_SECOND = 1000L;
+
+ /** The number of microseconds in one second. */
public static final long MICROS_PER_SECOND = 1000000L;
/**
@@ -146,8 +147,8 @@ public final class C {
* {@link #ENCODING_INVALID}, {@link #ENCODING_PCM_8BIT}, {@link #ENCODING_PCM_16BIT}, {@link
* #ENCODING_PCM_24BIT}, {@link #ENCODING_PCM_32BIT}, {@link #ENCODING_PCM_FLOAT}, {@link
* #ENCODING_PCM_MU_LAW}, {@link #ENCODING_PCM_A_LAW}, {@link #ENCODING_AC3}, {@link
- * #ENCODING_E_AC3}, {@link #ENCODING_AC4}, {@link #ENCODING_DTS}, {@link #ENCODING_DTS_HD} or
- * {@link #ENCODING_DOLBY_TRUEHD}.
+ * #ENCODING_E_AC3}, {@link #ENCODING_E_AC3_JOC}, {@link #ENCODING_AC4}, {@link #ENCODING_DTS},
+ * {@link #ENCODING_DTS_HD} or {@link #ENCODING_DOLBY_TRUEHD}.
*/
@Documented
@Retention(RetentionPolicy.SOURCE)
@@ -163,6 +164,7 @@ public final class C {
ENCODING_PCM_A_LAW,
ENCODING_AC3,
ENCODING_E_AC3,
+ ENCODING_E_AC3_JOC,
ENCODING_AC4,
ENCODING_DTS,
ENCODING_DTS_HD,
@@ -210,6 +212,8 @@ public final class C {
public static final int ENCODING_AC3 = AudioFormat.ENCODING_AC3;
/** @see AudioFormat#ENCODING_E_AC3 */
public static final int ENCODING_E_AC3 = AudioFormat.ENCODING_E_AC3;
+ /** @see AudioFormat#ENCODING_E_AC3_JOC */
+ public static final int ENCODING_E_AC3_JOC = AudioFormat.ENCODING_E_AC3_JOC;
/** @see AudioFormat#ENCODING_AC4 */
public static final int ENCODING_AC4 = AudioFormat.ENCODING_AC4;
/** @see AudioFormat#ENCODING_DTS */
@@ -496,6 +500,21 @@ public final class C {
/** Indicates that a buffer should be decoded but not rendered. */
public static final int BUFFER_FLAG_DECODE_ONLY = 1 << 31; // 0x80000000
+ /**
+ * Video decoder output modes. Possible modes are {@link #VIDEO_OUTPUT_MODE_NONE}, {@link
+ * #VIDEO_OUTPUT_MODE_YUV} and {@link #VIDEO_OUTPUT_MODE_SURFACE_YUV}.
+ */
+ @Documented
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(value = {VIDEO_OUTPUT_MODE_NONE, VIDEO_OUTPUT_MODE_YUV, VIDEO_OUTPUT_MODE_SURFACE_YUV})
+ public @interface VideoOutputMode {}
+ /** Video decoder output mode is not set. */
+ public static final int VIDEO_OUTPUT_MODE_NONE = -1;
+ /** Video decoder output mode that outputs raw 4:2:0 YUV planes. */
+ public static final int VIDEO_OUTPUT_MODE_YUV = 0;
+ /** Video decoder output mode that renders 4:2:0 YUV planes directly to a surface. */
+ public static final int VIDEO_OUTPUT_MODE_SURFACE_YUV = 1;
+
/**
* Video scaling modes for {@link MediaCodec}-based {@link Renderer}s. One of {@link
* #VIDEO_SCALING_MODE_SCALE_TO_FIT} or {@link #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING}.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
index 89e7d857c8..1971a4cefc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
@@ -32,19 +32,21 @@ import com.google.android.exoplayer2.util.StandaloneMediaClock;
public interface PlaybackParameterListener {
/**
- * Called when the active playback parameters changed.
+ * Called when the active playback parameters changed. Will not be called for {@link
+ * #setPlaybackParameters(PlaybackParameters)}.
*
* @param newPlaybackParameters The newly active {@link PlaybackParameters}.
*/
void onPlaybackParametersChanged(PlaybackParameters newPlaybackParameters);
-
}
- private final StandaloneMediaClock standaloneMediaClock;
+ private final StandaloneMediaClock standaloneClock;
private final PlaybackParameterListener listener;
- private @Nullable Renderer rendererClockSource;
- private @Nullable MediaClock rendererClock;
+ @Nullable private Renderer rendererClockSource;
+ @Nullable private MediaClock rendererClock;
+ private boolean isUsingStandaloneClock;
+ private boolean standaloneClockIsStarted;
/**
* Creates a new instance with listener for playback parameter changes and a {@link Clock} to use
@@ -56,21 +58,24 @@ import com.google.android.exoplayer2.util.StandaloneMediaClock;
*/
public DefaultMediaClock(PlaybackParameterListener listener, Clock clock) {
this.listener = listener;
- this.standaloneMediaClock = new StandaloneMediaClock(clock);
+ this.standaloneClock = new StandaloneMediaClock(clock);
+ isUsingStandaloneClock = true;
}
/**
* Starts the standalone fallback clock.
*/
public void start() {
- standaloneMediaClock.start();
+ standaloneClockIsStarted = true;
+ standaloneClock.start();
}
/**
* Stops the standalone fallback clock.
*/
public void stop() {
- standaloneMediaClock.stop();
+ standaloneClockIsStarted = false;
+ standaloneClock.stop();
}
/**
@@ -79,7 +84,7 @@ import com.google.android.exoplayer2.util.StandaloneMediaClock;
* @param positionUs The position to set in microseconds.
*/
public void resetPosition(long positionUs) {
- standaloneMediaClock.resetPosition(positionUs);
+ standaloneClock.resetPosition(positionUs);
}
/**
@@ -99,8 +104,7 @@ import com.google.android.exoplayer2.util.StandaloneMediaClock;
}
this.rendererClock = rendererMediaClock;
this.rendererClockSource = renderer;
- rendererClock.setPlaybackParameters(standaloneMediaClock.getPlaybackParameters());
- ensureSynced();
+ rendererClock.setPlaybackParameters(standaloneClock.getPlaybackParameters());
}
}
@@ -114,65 +118,80 @@ import com.google.android.exoplayer2.util.StandaloneMediaClock;
if (renderer == rendererClockSource) {
this.rendererClock = null;
this.rendererClockSource = null;
+ isUsingStandaloneClock = true;
}
}
/**
* Syncs internal clock if needed and returns current clock position in microseconds.
+ *
+ * @param isReadingAhead Whether the renderers are reading ahead.
*/
- public long syncAndGetPositionUs() {
- if (isUsingRendererClock()) {
- ensureSynced();
- return rendererClock.getPositionUs();
- } else {
- return standaloneMediaClock.getPositionUs();
- }
+ public long syncAndGetPositionUs(boolean isReadingAhead) {
+ syncClocks(isReadingAhead);
+ return getPositionUs();
}
// MediaClock implementation.
@Override
public long getPositionUs() {
- if (isUsingRendererClock()) {
- return rendererClock.getPositionUs();
- } else {
- return standaloneMediaClock.getPositionUs();
- }
+ return isUsingStandaloneClock ? standaloneClock.getPositionUs() : rendererClock.getPositionUs();
}
@Override
- public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
+ public void setPlaybackParameters(PlaybackParameters playbackParameters) {
if (rendererClock != null) {
- playbackParameters = rendererClock.setPlaybackParameters(playbackParameters);
+ rendererClock.setPlaybackParameters(playbackParameters);
+ playbackParameters = rendererClock.getPlaybackParameters();
}
- standaloneMediaClock.setPlaybackParameters(playbackParameters);
- listener.onPlaybackParametersChanged(playbackParameters);
- return playbackParameters;
+ standaloneClock.setPlaybackParameters(playbackParameters);
}
@Override
public PlaybackParameters getPlaybackParameters() {
- return rendererClock != null ? rendererClock.getPlaybackParameters()
- : standaloneMediaClock.getPlaybackParameters();
+ return rendererClock != null
+ ? rendererClock.getPlaybackParameters()
+ : standaloneClock.getPlaybackParameters();
}
- private void ensureSynced() {
+ private void syncClocks(boolean isReadingAhead) {
+ if (shouldUseStandaloneClock(isReadingAhead)) {
+ isUsingStandaloneClock = true;
+ if (standaloneClockIsStarted) {
+ standaloneClock.start();
+ }
+ return;
+ }
long rendererClockPositionUs = rendererClock.getPositionUs();
- standaloneMediaClock.resetPosition(rendererClockPositionUs);
+ if (isUsingStandaloneClock) {
+ // Ensure enabling the renderer clock doesn't jump backwards in time.
+ if (rendererClockPositionUs < standaloneClock.getPositionUs()) {
+ standaloneClock.stop();
+ return;
+ }
+ isUsingStandaloneClock = false;
+ if (standaloneClockIsStarted) {
+ standaloneClock.start();
+ }
+ }
+ // Continuously sync stand-alone clock to renderer clock so that it can take over if needed.
+ standaloneClock.resetPosition(rendererClockPositionUs);
PlaybackParameters playbackParameters = rendererClock.getPlaybackParameters();
- if (!playbackParameters.equals(standaloneMediaClock.getPlaybackParameters())) {
- standaloneMediaClock.setPlaybackParameters(playbackParameters);
+ if (!playbackParameters.equals(standaloneClock.getPlaybackParameters())) {
+ standaloneClock.setPlaybackParameters(playbackParameters);
listener.onPlaybackParametersChanged(playbackParameters);
}
}
- private boolean isUsingRendererClock() {
- // Use the renderer clock if the providing renderer has not ended or needs the next sample
- // stream to reenter the ready state. The latter case uses the standalone clock to avoid getting
- // stuck if tracks in the current period have uneven durations.
- // See: https://github.com/google/ExoPlayer/issues/1874.
- return rendererClockSource != null && !rendererClockSource.isEnded()
- && (rendererClockSource.isReady() || !rendererClockSource.hasReadStreamToEnd());
+ private boolean shouldUseStandaloneClock(boolean isReadingAhead) {
+ // Use the standalone clock if the clock providing renderer is not set or has ended. Also use
+ // the standalone clock if the renderer is not ready and we have finished reading the stream or
+ // are reading ahead to avoid getting stuck if tracks in the current period have uneven
+ // durations. See: https://github.com/google/ExoPlayer/issues/1874.
+ return rendererClockSource == null
+ || rendererClockSource.isEnded()
+ || (!rendererClockSource.isReady()
+ && (isReadingAhead || rendererClockSource.hasReadStreamToEnd()));
}
-
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
index 2a977f5bba..490d961396 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
@@ -24,6 +24,7 @@ import androidx.annotation.Nullable;
import com.google.android.exoplayer2.audio.AudioCapabilities;
import com.google.android.exoplayer2.audio.AudioProcessor;
import com.google.android.exoplayer2.audio.AudioRendererEventListener;
+import com.google.android.exoplayer2.audio.DefaultAudioSink;
import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer;
import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
@@ -90,6 +91,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
@ExtensionRendererMode private int extensionRendererMode;
private long allowedVideoJoiningTimeMs;
private boolean playClearSamplesWithoutKeys;
+ private boolean enableDecoderFallback;
private MediaCodecSelector mediaCodecSelector;
/** @param context A {@link Context}. */
@@ -202,6 +204,19 @@ public class DefaultRenderersFactory implements RenderersFactory {
return this;
}
+ /**
+ * Sets whether to enable fallback to lower-priority decoders if decoder initialization fails.
+ * This may result in using a decoder that is less efficient or slower than the primary decoder.
+ *
+ * @param enableDecoderFallback Whether to enable fallback to lower-priority decoders if decoder
+ * initialization fails.
+ * @return This factory, for convenience.
+ */
+ public DefaultRenderersFactory setEnableDecoderFallback(boolean enableDecoderFallback) {
+ this.enableDecoderFallback = enableDecoderFallback;
+ return this;
+ }
+
/**
* Sets a {@link MediaCodecSelector} for use by {@link MediaCodec} based renderers.
*
@@ -248,6 +263,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
mediaCodecSelector,
drmSessionManager,
playClearSamplesWithoutKeys,
+ enableDecoderFallback,
eventHandler,
videoRendererEventListener,
allowedVideoJoiningTimeMs,
@@ -258,6 +274,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
mediaCodecSelector,
drmSessionManager,
playClearSamplesWithoutKeys,
+ enableDecoderFallback,
buildAudioProcessors(),
eventHandler,
audioRendererEventListener,
@@ -282,6 +299,9 @@ public class DefaultRenderersFactory implements RenderersFactory {
* @param playClearSamplesWithoutKeys Whether renderers are permitted to play clear regions of
* encrypted media prior to having obtained the keys necessary to decrypt encrypted regions of
* the media.
+ * @param enableDecoderFallback Whether to enable fallback to lower-priority decoders if decoder
+ * initialization fails. This may result in using a decoder that is slower/less efficient than
+ * the primary decoder.
* @param eventHandler A handler associated with the main thread's looper.
* @param eventListener An event listener.
* @param allowedVideoJoiningTimeMs The maximum duration for which video renderers can attempt to
@@ -294,6 +314,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
MediaCodecSelector mediaCodecSelector,
@Nullable DrmSessionManager drmSessionManager,
boolean playClearSamplesWithoutKeys,
+ boolean enableDecoderFallback,
Handler eventHandler,
VideoRendererEventListener eventListener,
long allowedVideoJoiningTimeMs,
@@ -305,6 +326,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
allowedVideoJoiningTimeMs,
drmSessionManager,
playClearSamplesWithoutKeys,
+ enableDecoderFallback,
eventHandler,
eventListener,
MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY));
@@ -356,6 +378,9 @@ public class DefaultRenderersFactory implements RenderersFactory {
* @param playClearSamplesWithoutKeys Whether renderers are permitted to play clear regions of
* encrypted media prior to having obtained the keys necessary to decrypt encrypted regions of
* the media.
+ * @param enableDecoderFallback Whether to enable fallback to lower-priority decoders if decoder
+ * initialization fails. This may result in using a decoder that is slower/less efficient than
+ * the primary decoder.
* @param audioProcessors An array of {@link AudioProcessor}s that will process PCM audio buffers
* before output. May be empty.
* @param eventHandler A handler to use when invoking event listeners and outputs.
@@ -368,6 +393,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
MediaCodecSelector mediaCodecSelector,
@Nullable DrmSessionManager drmSessionManager,
boolean playClearSamplesWithoutKeys,
+ boolean enableDecoderFallback,
AudioProcessor[] audioProcessors,
Handler eventHandler,
AudioRendererEventListener eventListener,
@@ -378,10 +404,10 @@ public class DefaultRenderersFactory implements RenderersFactory {
mediaCodecSelector,
drmSessionManager,
playClearSamplesWithoutKeys,
+ enableDecoderFallback,
eventHandler,
eventListener,
- AudioCapabilities.getCapabilities(context),
- audioProcessors));
+ new DefaultAudioSink(AudioCapabilities.getCapabilities(context), audioProcessors)));
if (extensionRendererMode == EXTENSION_RENDERER_MODE_OFF) {
return;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
index b5f8f954bb..49aacd9638 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
@@ -15,6 +15,7 @@
*/
package com.google.android.exoplayer2;
+import android.os.SystemClock;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.source.MediaSource;
@@ -73,6 +74,9 @@ public final class ExoPlaybackException extends Exception {
*/
public final int rendererIndex;
+ /** The value of {@link SystemClock#elapsedRealtime()} when this exception was created. */
+ public final long timestampMs;
+
@Nullable private final Throwable cause;
/**
@@ -131,6 +135,7 @@ public final class ExoPlaybackException extends Exception {
this.type = type;
this.cause = cause;
this.rendererIndex = rendererIndex;
+ timestampMs = SystemClock.elapsedRealtime();
}
private ExoPlaybackException(@Type int type, String message) {
@@ -138,6 +143,7 @@ public final class ExoPlaybackException extends Exception {
this.type = type;
rendererIndex = C.INDEX_UNSET;
cause = null;
+ timestampMs = SystemClock.elapsedRealtime();
}
/**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index d0f9e2ae04..ee29af9c99 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -117,30 +117,6 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
*/
public interface ExoPlayer extends Player {
- /** @deprecated Use {@link PlayerMessage.Target} instead. */
- @Deprecated
- interface ExoPlayerComponent extends PlayerMessage.Target {}
-
- /** @deprecated Use {@link PlayerMessage} instead. */
- @Deprecated
- final class ExoPlayerMessage {
-
- /** The target to receive the message. */
- public final PlayerMessage.Target target;
- /** The type of the message. */
- public final int messageType;
- /** The message. */
- public final Object message;
-
- /** @deprecated Use {@link ExoPlayer#createMessage(PlayerMessage.Target)} instead. */
- @Deprecated
- public ExoPlayerMessage(PlayerMessage.Target target, int messageType, Object message) {
- this.target = target;
- this.messageType = messageType;
- this.message = message;
- }
- }
-
/** Returns the {@link Looper} associated with the playback thread. */
Looper getPlaybackLooper();
@@ -181,19 +157,6 @@ public interface ExoPlayer extends Player {
*/
PlayerMessage createMessage(PlayerMessage.Target target);
- /** @deprecated Use {@link #createMessage(PlayerMessage.Target)} instead. */
- @Deprecated
- @SuppressWarnings("deprecation")
- void sendMessages(ExoPlayerMessage... messages);
-
- /**
- * @deprecated Use {@link #createMessage(PlayerMessage.Target)} with {@link
- * PlayerMessage#blockUntilDelivered()}.
- */
- @Deprecated
- @SuppressWarnings("deprecation")
- void blockingSendMessages(ExoPlayerMessage... messages);
-
/**
* Sets the parameters that control how seek operations are performed.
*
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
index 59647feaa9..9168f1bd76 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
@@ -102,7 +102,7 @@ public final class ExoPlayerFactory {
* @param context A {@link Context}.
*/
public static SimpleExoPlayer newSimpleInstance(Context context) {
- return newSimpleInstance(context, new DefaultTrackSelector());
+ return newSimpleInstance(context, new DefaultTrackSelector(context));
}
/**
@@ -244,7 +244,7 @@ public final class ExoPlayerFactory {
loadControl,
drmSessionManager,
bandwidthMeter,
- new AnalyticsCollector.Factory(),
+ new AnalyticsCollector(Clock.DEFAULT),
Util.getLooper());
}
@@ -257,8 +257,8 @@ public final class ExoPlayerFactory {
* @param loadControl The {@link LoadControl} that will be used by the instance.
* @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the instance
* will not be used for DRM protected playbacks.
- * @param analyticsCollectorFactory A factory for creating the {@link AnalyticsCollector} that
- * will collect and forward all player events.
+ * @param analyticsCollector The {@link AnalyticsCollector} that will collect and forward all
+ * player events.
*/
public static SimpleExoPlayer newSimpleInstance(
Context context,
@@ -266,14 +266,14 @@ public final class ExoPlayerFactory {
TrackSelector trackSelector,
LoadControl loadControl,
@Nullable DrmSessionManager drmSessionManager,
- AnalyticsCollector.Factory analyticsCollectorFactory) {
+ AnalyticsCollector analyticsCollector) {
return newSimpleInstance(
context,
renderersFactory,
trackSelector,
loadControl,
drmSessionManager,
- analyticsCollectorFactory,
+ analyticsCollector,
Util.getLooper());
}
@@ -302,7 +302,7 @@ public final class ExoPlayerFactory {
trackSelector,
loadControl,
drmSessionManager,
- new AnalyticsCollector.Factory(),
+ new AnalyticsCollector(Clock.DEFAULT),
looper);
}
@@ -315,8 +315,8 @@ public final class ExoPlayerFactory {
* @param loadControl The {@link LoadControl} that will be used by the instance.
* @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the instance
* will not be used for DRM protected playbacks.
- * @param analyticsCollectorFactory A factory for creating the {@link AnalyticsCollector} that
- * will collect and forward all player events.
+ * @param analyticsCollector The {@link AnalyticsCollector} that will collect and forward all
+ * player events.
* @param looper The {@link Looper} which must be used for all calls to the player and which is
* used to call listeners on.
*/
@@ -326,7 +326,7 @@ public final class ExoPlayerFactory {
TrackSelector trackSelector,
LoadControl loadControl,
@Nullable DrmSessionManager drmSessionManager,
- AnalyticsCollector.Factory analyticsCollectorFactory,
+ AnalyticsCollector analyticsCollector,
Looper looper) {
return newSimpleInstance(
context,
@@ -335,7 +335,7 @@ public final class ExoPlayerFactory {
loadControl,
drmSessionManager,
getDefaultBandwidthMeter(context),
- analyticsCollectorFactory,
+ analyticsCollector,
looper);
}
@@ -348,8 +348,8 @@ public final class ExoPlayerFactory {
* @param loadControl The {@link LoadControl} that will be used by the instance.
* @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the instance
* will not be used for DRM protected playbacks.
- * @param analyticsCollectorFactory A factory for creating the {@link AnalyticsCollector} that
- * will collect and forward all player events.
+ * @param analyticsCollector The {@link AnalyticsCollector} that will collect and forward all
+ * player events.
* @param looper The {@link Looper} which must be used for all calls to the player and which is
* used to call listeners on.
*/
@@ -360,7 +360,7 @@ public final class ExoPlayerFactory {
LoadControl loadControl,
@Nullable DrmSessionManager drmSessionManager,
BandwidthMeter bandwidthMeter,
- AnalyticsCollector.Factory analyticsCollectorFactory,
+ AnalyticsCollector analyticsCollector,
Looper looper) {
return new SimpleExoPlayer(
context,
@@ -369,7 +369,7 @@ public final class ExoPlayerFactory {
loadControl,
drmSessionManager,
bandwidthMeter,
- analyticsCollectorFactory,
+ analyticsCollector,
looper);
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index bea7af189a..e99429d3b2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -35,8 +35,6 @@ import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util;
import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
/** An {@link ExoPlayer} implementation. Instances can be obtained from {@link ExoPlayerFactory}. */
@@ -71,9 +69,10 @@ import java.util.concurrent.CopyOnWriteArrayList;
private boolean hasPendingPrepare;
private boolean hasPendingSeek;
private boolean foregroundMode;
+ private int pendingSetPlaybackParametersAcks;
private PlaybackParameters playbackParameters;
private SeekParameters seekParameters;
- private @Nullable ExoPlaybackException playbackError;
+ @Nullable private ExoPlaybackException playbackError;
// Playback information when there is no pending seek/set source operation.
private PlaybackInfo playbackInfo;
@@ -199,7 +198,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
}
@Override
- public @Nullable ExoPlaybackException getPlaybackError() {
+ @Nullable
+ public ExoPlaybackException getPlaybackError() {
return playbackError;
}
@@ -337,7 +337,14 @@ import java.util.concurrent.CopyOnWriteArrayList;
if (playbackParameters == null) {
playbackParameters = PlaybackParameters.DEFAULT;
}
+ if (this.playbackParameters.equals(playbackParameters)) {
+ return;
+ }
+ pendingSetPlaybackParametersAcks++;
+ this.playbackParameters = playbackParameters;
internalPlayer.setPlaybackParameters(playbackParameters);
+ PlaybackParameters playbackParametersToNotify = playbackParameters;
+ notifyListeners(listener -> listener.onPlaybackParametersChanged(playbackParametersToNotify));
}
@Override
@@ -409,15 +416,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
/* playbackState= */ Player.STATE_IDLE);
}
- @Override
- @Deprecated
- @SuppressWarnings("deprecation")
- public void sendMessages(ExoPlayerMessage... messages) {
- for (ExoPlayerMessage message : messages) {
- createMessage(message.target).setType(message.messageType).setPayload(message.message).send();
- }
- }
-
@Override
public PlayerMessage createMessage(Target target) {
return new PlayerMessage(
@@ -428,36 +426,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
internalPlayerHandler);
}
- @Override
- @Deprecated
- @SuppressWarnings("deprecation")
- public void blockingSendMessages(ExoPlayerMessage... messages) {
- List playerMessages = new ArrayList<>();
- for (ExoPlayerMessage message : messages) {
- playerMessages.add(
- createMessage(message.target)
- .setType(message.messageType)
- .setPayload(message.message)
- .send());
- }
- boolean wasInterrupted = false;
- for (PlayerMessage message : playerMessages) {
- boolean blockMessage = true;
- while (blockMessage) {
- try {
- message.blockUntilDelivered();
- blockMessage = false;
- } catch (InterruptedException e) {
- wasInterrupted = true;
- }
- }
- }
- if (wasInterrupted) {
- // Restore the interrupted status.
- Thread.currentThread().interrupt();
- }
- }
-
@Override
public int getCurrentPeriodIndex() {
if (shouldMaskPosition()) {
@@ -511,7 +479,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
@Override
public long getTotalBufferedDuration() {
- return Math.max(0, C.usToMs(playbackInfo.totalBufferedDurationUs));
+ return C.usToMs(playbackInfo.totalBufferedDurationUs);
}
@Override
@@ -533,7 +501,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
public long getContentPosition() {
if (isPlayingAd()) {
playbackInfo.timeline.getPeriodByUid(playbackInfo.periodId.periodUid, period);
- return period.getPositionInWindowMs() + C.usToMs(playbackInfo.contentPositionUs);
+ return playbackInfo.contentPositionUs == C.TIME_UNSET
+ ? playbackInfo.timeline.getWindow(getCurrentWindowIndex(), window).getDefaultPositionMs()
+ : period.getPositionInWindowMs() + C.usToMs(playbackInfo.contentPositionUs);
} else {
return getCurrentPosition();
}
@@ -587,11 +557,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
return playbackInfo.timeline;
}
- @Override
- public Object getCurrentManifest() {
- return playbackInfo.manifest;
- }
-
// Not private so it can be called from an inner class without going through a thunk method.
/* package */ void handleEvent(Message msg) {
switch (msg.what) {
@@ -603,11 +568,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
/* positionDiscontinuityReason= */ msg.arg2);
break;
case ExoPlayerImplInternal.MSG_PLAYBACK_PARAMETERS_CHANGED:
- PlaybackParameters playbackParameters = (PlaybackParameters) msg.obj;
- if (!this.playbackParameters.equals(playbackParameters)) {
- this.playbackParameters = playbackParameters;
- notifyListeners(listener -> listener.onPlaybackParametersChanged(playbackParameters));
- }
+ handlePlaybackParameters((PlaybackParameters) msg.obj, /* operationAck= */ msg.arg1 != 0);
break;
case ExoPlayerImplInternal.MSG_ERROR:
ExoPlaybackException playbackError = (ExoPlaybackException) msg.obj;
@@ -619,6 +580,19 @@ import java.util.concurrent.CopyOnWriteArrayList;
}
}
+ private void handlePlaybackParameters(
+ PlaybackParameters playbackParameters, boolean operationAck) {
+ if (operationAck) {
+ pendingSetPlaybackParametersAcks--;
+ }
+ if (pendingSetPlaybackParametersAcks == 0) {
+ if (!this.playbackParameters.equals(playbackParameters)) {
+ this.playbackParameters = playbackParameters;
+ notifyListeners(listener -> listener.onPlaybackParametersChanged(playbackParameters));
+ }
+ }
+ }
+
private void handlePlaybackInfo(
PlaybackInfo playbackInfo,
int operationAcks,
@@ -673,13 +647,12 @@ import java.util.concurrent.CopyOnWriteArrayList;
resetPosition = resetPosition || resetState;
MediaPeriodId mediaPeriodId =
resetPosition
- ? playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window)
+ ? playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window, period)
: playbackInfo.periodId;
long startPositionUs = resetPosition ? 0 : playbackInfo.positionUs;
long contentPositionUs = resetPosition ? C.TIME_UNSET : playbackInfo.contentPositionUs;
return new PlaybackInfo(
resetState ? Timeline.EMPTY : playbackInfo.timeline,
- resetState ? null : playbackInfo.manifest,
mediaPeriodId,
startPositionUs,
contentPositionUs,
@@ -753,7 +726,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
private final @Player.TimelineChangeReason int timelineChangeReason;
private final boolean seekProcessed;
private final boolean playbackStateChanged;
- private final boolean timelineOrManifestChanged;
+ private final boolean timelineChanged;
private final boolean isLoadingChanged;
private final boolean trackSelectorResultChanged;
private final boolean playWhenReady;
@@ -777,9 +750,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
this.seekProcessed = seekProcessed;
this.playWhenReady = playWhenReady;
playbackStateChanged = previousPlaybackInfo.playbackState != playbackInfo.playbackState;
- timelineOrManifestChanged =
- previousPlaybackInfo.timeline != playbackInfo.timeline
- || previousPlaybackInfo.manifest != playbackInfo.manifest;
+ timelineChanged = previousPlaybackInfo.timeline != playbackInfo.timeline;
isLoadingChanged = previousPlaybackInfo.isLoading != playbackInfo.isLoading;
trackSelectorResultChanged =
previousPlaybackInfo.trackSelectorResult != playbackInfo.trackSelectorResult;
@@ -787,12 +758,10 @@ import java.util.concurrent.CopyOnWriteArrayList;
@Override
public void run() {
- if (timelineOrManifestChanged || timelineChangeReason == TIMELINE_CHANGE_REASON_PREPARED) {
+ if (timelineChanged || timelineChangeReason == TIMELINE_CHANGE_REASON_PREPARED) {
invokeAll(
listenerSnapshot,
- listener ->
- listener.onTimelineChanged(
- playbackInfo.timeline, playbackInfo.manifest, timelineChangeReason));
+ listener -> listener.onTimelineChanged(playbackInfo.timeline, timelineChangeReason));
}
if (positionDiscontinuity) {
invokeAll(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 34d8d0aa08..6ab0838e26 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.Player.DiscontinuityReason;
import com.google.android.exoplayer2.source.MediaPeriod;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.source.MediaSource.MediaSourceCaller;
import com.google.android.exoplayer2.source.SampleStream;
import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.trackselection.TrackSelection;
@@ -51,7 +52,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
implements Handler.Callback,
MediaPeriod.Callback,
TrackSelector.InvalidationListener,
- MediaSource.SourceInfoRefreshListener,
+ MediaSourceCaller,
PlaybackParameterListener,
PlayerMessage.Sender {
@@ -264,12 +265,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
return internalPlaybackThread.getLooper();
}
- // MediaSource.SourceInfoRefreshListener implementation.
+ // MediaSource.MediaSourceCaller implementation.
@Override
- public void onSourceInfoRefreshed(MediaSource source, Timeline timeline, Object manifest) {
- handler.obtainMessage(MSG_REFRESH_SOURCE_INFO,
- new MediaSourceRefreshInfo(source, timeline, manifest)).sendToTarget();
+ public void onSourceInfoRefreshed(MediaSource source, Timeline timeline) {
+ handler
+ .obtainMessage(MSG_REFRESH_SOURCE_INFO, new MediaSourceRefreshInfo(source, timeline))
+ .sendToTarget();
}
// MediaPeriod.Callback implementation.
@@ -295,9 +297,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
@Override
public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
- handler
- .obtainMessage(MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL, playbackParameters)
- .sendToTarget();
+ sendPlaybackParametersChangedInternal(playbackParameters, /* acknowledgeCommand= */ false);
}
// Handler.Callback implementation.
@@ -356,7 +356,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
reselectTracksInternal();
break;
case MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL:
- handlePlaybackParameters((PlaybackParameters) msg.obj);
+ handlePlaybackParameters(
+ (PlaybackParameters) msg.obj, /* acknowledgeCommand= */ msg.arg1 != 0);
break;
case MSG_SEND_MESSAGE:
sendMessageInternal((PlayerMessage) msg.obj);
@@ -440,7 +441,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
loadControl.onPrepared();
this.mediaSource = mediaSource;
setState(Player.STATE_BUFFERING);
- mediaSource.prepareSource(/* listener= */ this, bandwidthMeter.getTransferListener());
+ mediaSource.prepareSource(/* caller= */ this, bandwidthMeter.getTransferListener());
handler.sendEmptyMessage(MSG_DO_SOME_WORK);
}
@@ -534,7 +535,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
playbackInfoUpdate.setPositionDiscontinuity(Player.DISCONTINUITY_REASON_INTERNAL);
}
} else {
- rendererPositionUs = mediaClock.syncAndGetPositionUs();
+ rendererPositionUs =
+ mediaClock.syncAndGetPositionUs(
+ /* isReadingAhead= */ playingPeriodHolder != queue.getReadingPeriod());
periodPositionUs = playingPeriodHolder.toPeriodTime(rendererPositionUs);
maybeTriggerPendingMessages(playbackInfo.positionUs, periodPositionUs);
playbackInfo.positionUs = periodPositionUs;
@@ -643,7 +646,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
if (resolvedSeekPosition == null) {
// The seek position was valid for the timeline that it was performed into, but the
// timeline has changed or is not ready and a suitable seek position could not be resolved.
- periodId = playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window);
+ periodId = playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window, period);
periodPositionUs = C.TIME_UNSET;
contentPositionUs = C.TIME_UNSET;
seekPositionAdjusted = true;
@@ -728,13 +731,20 @@ import java.util.concurrent.atomic.AtomicBoolean;
newPlayingPeriodHolder = queue.advancePlayingPeriod();
}
- // Disable all the renderers if the period being played is changing, or if forced.
- if (oldPlayingPeriodHolder != newPlayingPeriodHolder || forceDisableRenderers) {
+ // Disable all renderers if the period being played is changing, if the seek results in negative
+ // renderer timestamps, or if forced.
+ if (forceDisableRenderers
+ || oldPlayingPeriodHolder != newPlayingPeriodHolder
+ || (newPlayingPeriodHolder != null
+ && newPlayingPeriodHolder.toRendererTime(periodPositionUs) < 0)) {
for (Renderer renderer : enabledRenderers) {
disableRenderer(renderer);
}
enabledRenderers = new Renderer[0];
oldPlayingPeriodHolder = null;
+ if (newPlayingPeriodHolder != null) {
+ newPlayingPeriodHolder.setRendererOffset(/* rendererPositionOffsetUs= */ 0);
+ }
}
// Update the holders.
@@ -774,6 +784,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
private void setPlaybackParametersInternal(PlaybackParameters playbackParameters) {
mediaClock.setPlaybackParameters(playbackParameters);
+ sendPlaybackParametersChangedInternal(
+ mediaClock.getPlaybackParameters(), /* acknowledgeCommand= */ true);
}
private void setSeekParametersInternal(SeekParameters seekParameters) {
@@ -872,7 +884,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
}
}
- queue.clear(/* keepFrontPeriodUid= */ !resetPosition);
+ queue.clear(/* keepFrontPeriodUid= */ !resetState);
setIsLoading(false);
if (resetState) {
queue.setTimeline(Timeline.EMPTY);
@@ -884,7 +896,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
}
MediaPeriodId mediaPeriodId =
resetPosition
- ? playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window)
+ ? playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window, period)
: playbackInfo.periodId;
// Set the start position to TIME_UNSET so that a subsequent seek to 0 isn't ignored.
long startPositionUs = resetPosition ? C.TIME_UNSET : playbackInfo.positionUs;
@@ -892,7 +904,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
playbackInfo =
new PlaybackInfo(
resetState ? Timeline.EMPTY : playbackInfo.timeline,
- resetState ? null : playbackInfo.manifest,
mediaPeriodId,
startPositionUs,
contentPositionUs,
@@ -906,7 +917,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
startPositionUs);
if (releaseMediaSource) {
if (mediaSource != null) {
- mediaSource.releaseSource(/* listener= */ this);
+ mediaSource.releaseSource(/* caller= */ this);
mediaSource = null;
}
}
@@ -1097,7 +1108,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
return;
}
newTrackSelectorResult = periodHolder.selectTracks(playbackSpeed, playbackInfo.timeline);
- if (newTrackSelectorResult != null) {
+ if (!newTrackSelectorResult.isEquivalent(periodHolder.getTrackSelectorResult())) {
// Selected tracks have changed for this period.
break;
}
@@ -1186,13 +1197,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
private void notifyTrackSelectionDiscontinuity() {
MediaPeriodHolder periodHolder = queue.getFrontPeriod();
while (periodHolder != null) {
- TrackSelectorResult trackSelectorResult = periodHolder.getTrackSelectorResult();
- if (trackSelectorResult != null) {
- TrackSelection[] trackSelections = trackSelectorResult.selections.getAll();
- for (TrackSelection trackSelection : trackSelections) {
- if (trackSelection != null) {
- trackSelection.onDiscontinuity();
- }
+ TrackSelection[] trackSelections = periodHolder.getTrackSelectorResult().selections.getAll();
+ for (TrackSelection trackSelection : trackSelections) {
+ if (trackSelection != null) {
+ trackSelection.onDiscontinuity();
}
}
periodHolder = periodHolder.getNext();
@@ -1269,9 +1277,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
Timeline oldTimeline = playbackInfo.timeline;
Timeline timeline = sourceRefreshInfo.timeline;
- Object manifest = sourceRefreshInfo.manifest;
queue.setTimeline(timeline);
- playbackInfo = playbackInfo.copyWithTimeline(timeline, manifest);
+ playbackInfo = playbackInfo.copyWithTimeline(timeline);
resolvePendingMessagePositions();
MediaPeriodId newPeriodId = playbackInfo.periodId;
@@ -1296,8 +1303,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
Pair defaultPosition =
getPeriodPosition(
timeline, timeline.getFirstWindowIndex(shuffleModeEnabled), C.TIME_UNSET);
- newContentPositionUs = defaultPosition.second;
- newPeriodId = queue.resolveMediaPeriodIdForAds(defaultPosition.first, newContentPositionUs);
+ newPeriodId = queue.resolveMediaPeriodIdForAds(defaultPosition.first, defaultPosition.second);
+ if (!newPeriodId.isAd()) {
+ // Keep unset start position if we need to play an ad first.
+ newContentPositionUs = defaultPosition.second;
+ }
} else if (timeline.getIndexOfPeriod(newPeriodId.periodUid) == C.INDEX_UNSET) {
// The current period isn't in the new timeline. Attempt to resolve a subsequent period whose
// window we can restart from.
@@ -1479,82 +1489,67 @@ import java.util.concurrent.atomic.AtomicBoolean;
mediaSource.maybeThrowSourceInfoRefreshError();
return;
}
-
- // Update the loading period if required.
maybeUpdateLoadingPeriod();
+ maybeUpdateReadingPeriod();
+ maybeUpdatePlayingPeriod();
+ }
+
+ private void maybeUpdateLoadingPeriod() throws IOException {
+ queue.reevaluateBuffer(rendererPositionUs);
+ if (queue.shouldLoadNextMediaPeriod()) {
+ MediaPeriodInfo info = queue.getNextMediaPeriodInfo(rendererPositionUs, playbackInfo);
+ if (info == null) {
+ maybeThrowSourceInfoRefreshError();
+ } else {
+ MediaPeriod mediaPeriod =
+ queue.enqueueNextMediaPeriod(
+ rendererCapabilities,
+ trackSelector,
+ loadControl.getAllocator(),
+ mediaSource,
+ info,
+ emptyTrackSelectorResult);
+ mediaPeriod.prepare(this, info.startPositionUs);
+ setIsLoading(true);
+ handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
+ }
+ }
MediaPeriodHolder loadingPeriodHolder = queue.getLoadingPeriod();
if (loadingPeriodHolder == null || loadingPeriodHolder.isFullyBuffered()) {
setIsLoading(false);
} else if (!playbackInfo.isLoading) {
maybeContinueLoading();
}
+ }
- if (!queue.hasPlayingPeriod()) {
- // We're waiting for the first period to be prepared.
+ private void maybeUpdateReadingPeriod() throws ExoPlaybackException, IOException {
+ MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
+ if (readingPeriodHolder == null) {
return;
}
- // Advance the playing period if necessary.
- MediaPeriodHolder playingPeriodHolder = queue.getPlayingPeriod();
- MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
- boolean advancedPlayingPeriod = false;
- while (playWhenReady
- && playingPeriodHolder != readingPeriodHolder
- && rendererPositionUs >= playingPeriodHolder.getNext().getStartPositionRendererTime()) {
- // All enabled renderers' streams have been read to the end, and the playback position reached
- // the end of the playing period, so advance playback to the next period.
- if (advancedPlayingPeriod) {
- // If we advance more than one period at a time, notify listeners after each update.
- maybeNotifyPlaybackInfoChanged();
- }
- int discontinuityReason =
- playingPeriodHolder.info.isLastInTimelinePeriod
- ? Player.DISCONTINUITY_REASON_PERIOD_TRANSITION
- : Player.DISCONTINUITY_REASON_AD_INSERTION;
- MediaPeriodHolder oldPlayingPeriodHolder = playingPeriodHolder;
- playingPeriodHolder = queue.advancePlayingPeriod();
- updatePlayingPeriodRenderers(oldPlayingPeriodHolder);
- playbackInfo =
- playbackInfo.copyWithNewPosition(
- playingPeriodHolder.info.id,
- playingPeriodHolder.info.startPositionUs,
- playingPeriodHolder.info.contentPositionUs,
- getTotalBufferedDurationUs());
- playbackInfoUpdate.setPositionDiscontinuity(discontinuityReason);
- updatePlaybackPositions();
- advancedPlayingPeriod = true;
- }
-
- if (readingPeriodHolder.info.isFinal) {
- for (int i = 0; i < renderers.length; i++) {
- Renderer renderer = renderers[i];
- SampleStream sampleStream = readingPeriodHolder.sampleStreams[i];
- // Defer setting the stream as final until the renderer has actually consumed the whole
- // stream in case of playlist changes that cause the stream to be no longer final.
- if (sampleStream != null && renderer.getStream() == sampleStream
- && renderer.hasReadStreamToEnd()) {
- renderer.setCurrentStreamFinal();
+ if (readingPeriodHolder.getNext() == null) {
+ // We don't have a successor to advance the reading period to.
+ if (readingPeriodHolder.info.isFinal) {
+ for (int i = 0; i < renderers.length; i++) {
+ Renderer renderer = renderers[i];
+ SampleStream sampleStream = readingPeriodHolder.sampleStreams[i];
+ // Defer setting the stream as final until the renderer has actually consumed the whole
+ // stream in case of playlist changes that cause the stream to be no longer final.
+ if (sampleStream != null
+ && renderer.getStream() == sampleStream
+ && renderer.hasReadStreamToEnd()) {
+ renderer.setCurrentStreamFinal();
+ }
}
}
return;
}
- // Advance the reading period if necessary.
- if (readingPeriodHolder.getNext() == null) {
- // We don't have a successor to advance the reading period to.
+ if (!hasReadingPeriodFinishedReading()) {
return;
}
- for (int i = 0; i < renderers.length; i++) {
- Renderer renderer = renderers[i];
- SampleStream sampleStream = readingPeriodHolder.sampleStreams[i];
- if (renderer.getStream() != sampleStream
- || (sampleStream != null && !renderer.hasReadStreamToEnd())) {
- // The current reading period is still being read by at least one renderer.
- return;
- }
- }
-
if (!readingPeriodHolder.getNext().prepared) {
// The successor is not prepared yet.
maybeThrowPeriodPrepareError();
@@ -1565,18 +1560,18 @@ import java.util.concurrent.atomic.AtomicBoolean;
readingPeriodHolder = queue.advanceReadingPeriod();
TrackSelectorResult newTrackSelectorResult = readingPeriodHolder.getTrackSelectorResult();
- boolean initialDiscontinuity =
- readingPeriodHolder.mediaPeriod.readDiscontinuity() != C.TIME_UNSET;
+ if (readingPeriodHolder.mediaPeriod.readDiscontinuity() != C.TIME_UNSET) {
+ // The new period starts with a discontinuity, so the renderers will play out all data, then
+ // be disabled and re-enabled when they start playing the next period.
+ setAllRendererStreamsFinal();
+ return;
+ }
for (int i = 0; i < renderers.length; i++) {
Renderer renderer = renderers[i];
boolean rendererWasEnabled = oldTrackSelectorResult.isRendererEnabled(i);
- if (!rendererWasEnabled) {
- // The renderer was disabled and will be enabled when we play the next period.
- } else if (initialDiscontinuity) {
- // The new period starts with a discontinuity, so the renderer will play out all data then
- // be disabled and re-enabled when it starts playing the next period.
- renderer.setCurrentStreamFinal();
- } else if (!renderer.isCurrentStreamFinal()) {
+ if (rendererWasEnabled && !renderer.isCurrentStreamFinal()) {
+ // The renderer is enabled and its stream is not final, so we still have a chance to replace
+ // the sample streams.
TrackSelection newSelection = newTrackSelectorResult.selections.get(i);
boolean newRendererEnabled = newTrackSelectorResult.isRendererEnabled(i);
boolean isNoSampleRenderer = rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE;
@@ -1604,23 +1599,67 @@ import java.util.concurrent.atomic.AtomicBoolean;
}
}
- private void maybeUpdateLoadingPeriod() throws IOException {
- queue.reevaluateBuffer(rendererPositionUs);
- if (queue.shouldLoadNextMediaPeriod()) {
- MediaPeriodInfo info = queue.getNextMediaPeriodInfo(rendererPositionUs, playbackInfo);
- if (info == null) {
- maybeThrowSourceInfoRefreshError();
- } else {
- MediaPeriod mediaPeriod =
- queue.enqueueNextMediaPeriod(
- rendererCapabilities,
- trackSelector,
- loadControl.getAllocator(),
- mediaSource,
- info);
- mediaPeriod.prepare(this, info.startPositionUs);
- setIsLoading(true);
- handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
+ private void maybeUpdatePlayingPeriod() throws ExoPlaybackException {
+ boolean advancedPlayingPeriod = false;
+ while (shouldAdvancePlayingPeriod()) {
+ if (advancedPlayingPeriod) {
+ // If we advance more than one period at a time, notify listeners after each update.
+ maybeNotifyPlaybackInfoChanged();
+ }
+ MediaPeriodHolder oldPlayingPeriodHolder = queue.getPlayingPeriod();
+ MediaPeriodHolder newPlayingPeriodHolder = queue.advancePlayingPeriod();
+ updatePlayingPeriodRenderers(oldPlayingPeriodHolder);
+ playbackInfo =
+ playbackInfo.copyWithNewPosition(
+ newPlayingPeriodHolder.info.id,
+ newPlayingPeriodHolder.info.startPositionUs,
+ newPlayingPeriodHolder.info.contentPositionUs,
+ getTotalBufferedDurationUs());
+ int discontinuityReason =
+ oldPlayingPeriodHolder.info.isLastInTimelinePeriod
+ ? Player.DISCONTINUITY_REASON_PERIOD_TRANSITION
+ : Player.DISCONTINUITY_REASON_AD_INSERTION;
+ playbackInfoUpdate.setPositionDiscontinuity(discontinuityReason);
+ updatePlaybackPositions();
+ advancedPlayingPeriod = true;
+ }
+ }
+
+ private boolean shouldAdvancePlayingPeriod() {
+ if (!playWhenReady) {
+ return false;
+ }
+ MediaPeriodHolder playingPeriodHolder = queue.getPlayingPeriod();
+ if (playingPeriodHolder == null) {
+ return false;
+ }
+ MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
+ if (playingPeriodHolder == readingPeriodHolder) {
+ return false;
+ }
+ MediaPeriodHolder nextPlayingPeriodHolder =
+ Assertions.checkNotNull(playingPeriodHolder.getNext());
+ return rendererPositionUs >= nextPlayingPeriodHolder.getStartPositionRendererTime();
+ }
+
+ private boolean hasReadingPeriodFinishedReading() {
+ MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
+ for (int i = 0; i < renderers.length; i++) {
+ Renderer renderer = renderers[i];
+ SampleStream sampleStream = readingPeriodHolder.sampleStreams[i];
+ if (renderer.getStream() != sampleStream
+ || (sampleStream != null && !renderer.hasReadStreamToEnd())) {
+ // The current reading period is still being read by at least one renderer.
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private void setAllRendererStreamsFinal() {
+ for (Renderer renderer : renderers) {
+ if (renderer.getStream() != null) {
+ renderer.setCurrentStreamFinal();
}
}
}
@@ -1653,9 +1692,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
maybeContinueLoading();
}
- private void handlePlaybackParameters(PlaybackParameters playbackParameters)
+ private void handlePlaybackParameters(
+ PlaybackParameters playbackParameters, boolean acknowledgeCommand)
throws ExoPlaybackException {
- eventHandler.obtainMessage(MSG_PLAYBACK_PARAMETERS_CHANGED, playbackParameters).sendToTarget();
+ eventHandler
+ .obtainMessage(
+ MSG_PLAYBACK_PARAMETERS_CHANGED, acknowledgeCommand ? 1 : 0, 0, playbackParameters)
+ .sendToTarget();
updateTrackSelectionPlaybackSpeed(playbackParameters.speed);
for (Renderer renderer : renderers) {
if (renderer != null) {
@@ -1797,9 +1840,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
private long getTotalBufferedDurationUs(long bufferedPositionInLoadingPeriodUs) {
MediaPeriodHolder loadingPeriodHolder = queue.getLoadingPeriod();
- return loadingPeriodHolder == null
- ? 0
- : bufferedPositionInLoadingPeriodUs - loadingPeriodHolder.toPeriodTime(rendererPositionUs);
+ if (loadingPeriodHolder == null) {
+ return 0;
+ }
+ long totalBufferedDurationUs =
+ bufferedPositionInLoadingPeriodUs - loadingPeriodHolder.toPeriodTime(rendererPositionUs);
+ return Math.max(0, totalBufferedDurationUs);
}
private void updateLoadControlTrackSelection(
@@ -1807,6 +1853,17 @@ import java.util.concurrent.atomic.AtomicBoolean;
loadControl.onTracksSelected(renderers, trackGroups, trackSelectorResult.selections);
}
+ private void sendPlaybackParametersChangedInternal(
+ PlaybackParameters playbackParameters, boolean acknowledgeCommand) {
+ handler
+ .obtainMessage(
+ MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL,
+ acknowledgeCommand ? 1 : 0,
+ 0,
+ playbackParameters)
+ .sendToTarget();
+ }
+
private static Format[] getFormats(TrackSelection newSelection) {
// Build an array of formats contained by the selection.
int length = newSelection != null ? newSelection.length() : 0;
@@ -1836,7 +1893,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public int resolvedPeriodIndex;
public long resolvedPeriodTimeUs;
- public @Nullable Object resolvedPeriodUid;
+ @Nullable public Object resolvedPeriodUid;
public PendingMessageInfo(PlayerMessage message) {
this.message = message;
@@ -1871,12 +1928,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
public final MediaSource source;
public final Timeline timeline;
- public final Object manifest;
- public MediaSourceRefreshInfo(MediaSource source, Timeline timeline, Object manifest) {
+ public MediaSourceRefreshInfo(MediaSource source, Timeline timeline) {
this.source = source;
this.timeline = timeline;
- this.manifest = manifest;
}
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index a90435227b..f420f20767 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
/** The version of the library expressed as a string, for example "1.2.3". */
// Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
- public static final String VERSION = "2.10.1";
+ public static final String VERSION = "2.10.4";
/** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
// Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
- public static final String VERSION_SLASHY = "ExoPlayerLib/2.10.1";
+ public static final String VERSION_SLASHY = "ExoPlayerLib/2.10.4";
/**
* The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
* integer version 123045006 (123-045-006).
*/
// Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
- public static final int VERSION_INT = 2010001;
+ public static final int VERSION_INT = 2010004;
/**
* Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index dcb7a83dca..b2bd20f0fe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -19,6 +19,8 @@ import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.exoplayer2.drm.DrmSession;
+import com.google.android.exoplayer2.drm.ExoMediaCrypto;
import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util;
@@ -45,9 +47,9 @@ public final class Format implements Parcelable {
public static final long OFFSET_SAMPLE_RELATIVE = Long.MAX_VALUE;
/** An identifier for the format, or null if unknown or not applicable. */
- public final @Nullable String id;
+ @Nullable public final String id;
/** The human readable label, or null if unknown or not applicable. */
- public final @Nullable String label;
+ @Nullable public final String label;
/** Track selection flags. */
@C.SelectionFlags public final int selectionFlags;
/** Track role flags. */
@@ -57,14 +59,14 @@ public final class Format implements Parcelable {
*/
public final int bitrate;
/** Codecs of the format as described in RFC 6381, or null if unknown or not applicable. */
- public final @Nullable String codecs;
+ @Nullable public final String codecs;
/** Metadata, or null if unknown or not applicable. */
- public final @Nullable Metadata metadata;
+ @Nullable public final Metadata metadata;
// Container specific.
/** The mime type of the container, or null if unknown or not applicable. */
- public final @Nullable String containerMimeType;
+ @Nullable public final String containerMimeType;
// Elementary stream specific.
@@ -72,7 +74,7 @@ public final class Format implements Parcelable {
* The mime type of the elementary stream (i.e. the individual samples), or null if unknown or not
* applicable.
*/
- public final @Nullable String sampleMimeType;
+ @Nullable public final String sampleMimeType;
/**
* The maximum size of a buffer of data (typically one sample), or {@link #NO_VALUE} if unknown or
* not applicable.
@@ -84,7 +86,7 @@ public final class Format implements Parcelable {
*/
public final List initializationData;
/** DRM initialization data if the stream is protected, or null otherwise. */
- public final @Nullable DrmInitData drmInitData;
+ @Nullable public final DrmInitData drmInitData;
/**
* For samples that contain subsamples, this is an offset that should be added to subsample
@@ -122,9 +124,9 @@ public final class Format implements Parcelable {
@C.StereoMode
public final int stereoMode;
/** The projection data for 360/VR video, or null if not applicable. */
- public final @Nullable byte[] projectionData;
+ @Nullable public final byte[] projectionData;
/** The color metadata associated with the video, helps with accurate color reproduction. */
- public final @Nullable ColorInfo colorInfo;
+ @Nullable public final ColorInfo colorInfo;
// Audio specific.
@@ -157,17 +159,30 @@ public final class Format implements Parcelable {
// Audio and text specific.
/** The language as an IETF BCP 47 conformant tag, or null if unknown or not applicable. */
- public final @Nullable String language;
+ @Nullable public final String language;
/**
* The Accessibility channel, or {@link #NO_VALUE} if not known or applicable.
*/
public final int accessibilityChannel;
+ // Provided by source.
+
+ /**
+ * The type of the {@link ExoMediaCrypto} provided by the media source, if the media source can
+ * acquire a {@link DrmSession} for {@link #drmInitData}. Null if the media source cannot acquire
+ * a session for {@link #drmInitData}, or if not applicable.
+ */
+ @Nullable public final Class exoMediaCryptoType;
+
// Lazily initialized hashcode.
private int hashCode;
// Video.
+ /**
+ * @deprecated Use {@link #createVideoContainerFormat(String, String, String, String, String, int,
+ * int, int, float, List, int, int)} instead.
+ */
@Deprecated
public static Format createVideoContainerFormat(
@Nullable String id,
@@ -236,7 +251,8 @@ public final class Format implements Parcelable {
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
/* language= */ null,
- /* accessibilityChannel= */ NO_VALUE);
+ /* accessibilityChannel= */ NO_VALUE,
+ /* exoMediaCryptoType= */ null);
}
public static Format createVideoSampleFormat(
@@ -340,11 +356,16 @@ public final class Format implements Parcelable {
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
/* language= */ null,
- /* accessibilityChannel= */ NO_VALUE);
+ /* accessibilityChannel= */ NO_VALUE,
+ /* exoMediaCryptoType= */ null);
}
// Audio.
+ /**
+ * @deprecated Use {@link #createAudioContainerFormat(String, String, String, String, String, int,
+ * int, int, List, int, int, String)} instead.
+ */
@Deprecated
public static Format createAudioContainerFormat(
@Nullable String id,
@@ -413,7 +434,8 @@ public final class Format implements Parcelable {
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
language,
- /* accessibilityChannel= */ NO_VALUE);
+ /* accessibilityChannel= */ NO_VALUE,
+ /* exoMediaCryptoType= */ null);
}
public static Format createAudioSampleFormat(
@@ -518,7 +540,8 @@ public final class Format implements Parcelable {
encoderDelay,
encoderPadding,
language,
- /* accessibilityChannel= */ NO_VALUE);
+ /* accessibilityChannel= */ NO_VALUE,
+ /* exoMediaCryptoType= */ null);
}
// Text.
@@ -585,7 +608,8 @@ public final class Format implements Parcelable {
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ /* exoMediaCryptoType= */ null);
}
public static Format createTextSampleFormat(
@@ -698,7 +722,8 @@ public final class Format implements Parcelable {
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ /* exoMediaCryptoType= */ null);
}
// Image.
@@ -740,11 +765,16 @@ public final class Format implements Parcelable {
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
language,
- /* accessibilityChannel= */ NO_VALUE);
+ /* accessibilityChannel= */ NO_VALUE,
+ /* exoMediaCryptoType= */ null);
}
// Generic.
+ /**
+ * @deprecated Use {@link #createContainerFormat(String, String, String, String, String, int, int,
+ * int, String)} instead.
+ */
@Deprecated
public static Format createContainerFormat(
@Nullable String id,
@@ -804,7 +834,8 @@ public final class Format implements Parcelable {
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
language,
- /* accessibilityChannel= */ NO_VALUE);
+ /* accessibilityChannel= */ NO_VALUE,
+ /* exoMediaCryptoType= */ null);
}
public static Format createSampleFormat(
@@ -837,7 +868,8 @@ public final class Format implements Parcelable {
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
/* language= */ null,
- /* accessibilityChannel= */ NO_VALUE);
+ /* accessibilityChannel= */ NO_VALUE,
+ /* exoMediaCryptoType= */ null);
}
public static Format createSampleFormat(
@@ -874,7 +906,8 @@ public final class Format implements Parcelable {
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
/* language= */ null,
- /* accessibilityChannel= */ NO_VALUE);
+ /* accessibilityChannel= */ NO_VALUE,
+ /* exoMediaCryptoType= */ null);
}
/* package */ Format(
@@ -910,7 +943,9 @@ public final class Format implements Parcelable {
int encoderPadding,
// Audio and text specific.
@Nullable String language,
- int accessibilityChannel) {
+ int accessibilityChannel,
+ // Provided by source.
+ @Nullable Class exoMediaCryptoType) {
this.id = id;
this.label = label;
this.selectionFlags = selectionFlags;
@@ -946,6 +981,8 @@ public final class Format implements Parcelable {
// Audio and text specific.
this.language = Util.normalizeLanguageCode(language);
this.accessibilityChannel = accessibilityChannel;
+ // Provided by source.
+ this.exoMediaCryptoType = exoMediaCryptoType;
}
@SuppressWarnings("ResourceType")
@@ -988,6 +1025,8 @@ public final class Format implements Parcelable {
// Audio and text specific.
language = in.readString();
accessibilityChannel = in.readInt();
+ // Provided by source.
+ exoMediaCryptoType = null;
}
public Format copyWithMaxInputSize(int maxInputSize) {
@@ -1019,7 +1058,8 @@ public final class Format implements Parcelable {
encoderDelay,
encoderPadding,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ exoMediaCryptoType);
}
public Format copyWithSubsampleOffsetUs(long subsampleOffsetUs) {
@@ -1051,7 +1091,8 @@ public final class Format implements Parcelable {
encoderDelay,
encoderPadding,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ exoMediaCryptoType);
}
public Format copyWithContainerInfo(
@@ -1099,7 +1140,8 @@ public final class Format implements Parcelable {
encoderDelay,
encoderPadding,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ exoMediaCryptoType);
}
@SuppressWarnings("ReferenceEquality")
@@ -1178,7 +1220,8 @@ public final class Format implements Parcelable {
encoderDelay,
encoderPadding,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ exoMediaCryptoType);
}
public Format copyWithGaplessInfo(int encoderDelay, int encoderPadding) {
@@ -1210,7 +1253,8 @@ public final class Format implements Parcelable {
encoderDelay,
encoderPadding,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ exoMediaCryptoType);
}
public Format copyWithFrameRate(float frameRate) {
@@ -1242,42 +1286,24 @@ public final class Format implements Parcelable {
encoderDelay,
encoderPadding,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ exoMediaCryptoType);
}
public Format copyWithDrmInitData(@Nullable DrmInitData drmInitData) {
- return new Format(
- id,
- label,
- selectionFlags,
- roleFlags,
- bitrate,
- codecs,
- metadata,
- containerMimeType,
- sampleMimeType,
- maxInputSize,
- initializationData,
- drmInitData,
- subsampleOffsetUs,
- width,
- height,
- frameRate,
- rotationDegrees,
- pixelWidthHeightRatio,
- projectionData,
- stereoMode,
- colorInfo,
- channelCount,
- sampleRate,
- pcmEncoding,
- encoderDelay,
- encoderPadding,
- language,
- accessibilityChannel);
+ return copyWithAdjustments(drmInitData, metadata);
}
public Format copyWithMetadata(@Nullable Metadata metadata) {
+ return copyWithAdjustments(drmInitData, metadata);
+ }
+
+ @SuppressWarnings("ReferenceEquality")
+ public Format copyWithAdjustments(
+ @Nullable DrmInitData drmInitData, @Nullable Metadata metadata) {
+ if (drmInitData == this.drmInitData && metadata == this.metadata) {
+ return this;
+ }
return new Format(
id,
label,
@@ -1306,7 +1332,8 @@ public final class Format implements Parcelable {
encoderDelay,
encoderPadding,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ exoMediaCryptoType);
}
public Format copyWithRotationDegrees(int rotationDegrees) {
@@ -1338,7 +1365,8 @@ public final class Format implements Parcelable {
encoderDelay,
encoderPadding,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ exoMediaCryptoType);
}
public Format copyWithBitrate(int bitrate) {
@@ -1370,7 +1398,74 @@ public final class Format implements Parcelable {
encoderDelay,
encoderPadding,
language,
- accessibilityChannel);
+ accessibilityChannel,
+ exoMediaCryptoType);
+ }
+
+ public Format copyWithVideoSize(int width, int height) {
+ return new Format(
+ id,
+ label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
+ containerMimeType,
+ sampleMimeType,
+ maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
+ width,
+ height,
+ frameRate,
+ rotationDegrees,
+ pixelWidthHeightRatio,
+ projectionData,
+ stereoMode,
+ colorInfo,
+ channelCount,
+ sampleRate,
+ pcmEncoding,
+ encoderDelay,
+ encoderPadding,
+ language,
+ accessibilityChannel,
+ exoMediaCryptoType);
+ }
+
+ public Format copyWithExoMediaCryptoType(Class exoMediaCryptoType) {
+ return new Format(
+ id,
+ label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
+ containerMimeType,
+ sampleMimeType,
+ maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
+ width,
+ height,
+ frameRate,
+ rotationDegrees,
+ pixelWidthHeightRatio,
+ projectionData,
+ stereoMode,
+ colorInfo,
+ channelCount,
+ sampleRate,
+ pcmEncoding,
+ encoderDelay,
+ encoderPadding,
+ language,
+ accessibilityChannel,
+ exoMediaCryptoType);
}
/**
@@ -1449,6 +1544,8 @@ public final class Format implements Parcelable {
// Audio and text specific.
result = 31 * result + (language == null ? 0 : language.hashCode());
result = 31 * result + accessibilityChannel;
+ // Provided by source.
+ result = 31 * result + (exoMediaCryptoType == null ? 0 : exoMediaCryptoType.hashCode());
hashCode = result;
}
return hashCode;
@@ -1484,6 +1581,7 @@ public final class Format implements Parcelable {
&& accessibilityChannel == other.accessibilityChannel
&& Float.compare(frameRate, other.frameRate) == 0
&& Float.compare(pixelWidthHeightRatio, other.pixelWidthHeightRatio) == 0
+ && Util.areEqual(exoMediaCryptoType, other.exoMediaCryptoType)
&& Util.areEqual(id, other.id)
&& Util.areEqual(label, other.label)
&& Util.areEqual(codecs, other.codecs)
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
index 5da8d0f9f5..c1b2ace9b7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
@@ -16,23 +16,20 @@
package com.google.android.exoplayer2;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.drm.DecryptionResource;
+import com.google.android.exoplayer2.drm.DrmSession;
/**
* Holds a {@link Format}.
*/
public final class FormatHolder {
- /**
- * Whether the object expected to populate {@link #format} is also expected to populate {@link
- * #decryptionResource}.
- */
+ /** Whether the {@link #format} setter also sets the {@link #drmSession} field. */
// TODO: Remove once all Renderers and MediaSources have migrated to the new DRM model [Internal
// ref: b/129764794].
- public boolean decryptionResourceIsProvided;
+ public boolean includesDrmSession;
/** An accompanying context for decrypting samples in the format. */
- @Nullable public DecryptionResource decryptionResource;
+ @Nullable public DrmSession drmSession;
/** The held {@link Format}. */
@Nullable public Format format;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
index 5950bc627f..850d2b7d10 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
@@ -59,20 +59,21 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
private final MediaSource mediaSource;
@Nullable private MediaPeriodHolder next;
- @Nullable private TrackGroupArray trackGroups;
- @Nullable private TrackSelectorResult trackSelectorResult;
+ private TrackGroupArray trackGroups;
+ private TrackSelectorResult trackSelectorResult;
private long rendererPositionOffsetUs;
/**
* Creates a new holder with information required to play it as part of a timeline.
*
* @param rendererCapabilities The renderer capabilities.
- * @param rendererPositionOffsetUs The time offset of the start of the media period to provide to
- * renderers.
+ * @param rendererPositionOffsetUs The renderer time of the start of the period, in microseconds.
* @param trackSelector The track selector.
* @param allocator The allocator.
* @param mediaSource The media source that produced the media period.
* @param info Information used to identify this media period in its timeline period.
+ * @param emptyTrackSelectorResult A {@link TrackSelectorResult} with empty selections for each
+ * renderer.
*/
public MediaPeriodHolder(
RendererCapabilities[] rendererCapabilities,
@@ -80,13 +81,16 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
TrackSelector trackSelector,
Allocator allocator,
MediaSource mediaSource,
- MediaPeriodInfo info) {
+ MediaPeriodInfo info,
+ TrackSelectorResult emptyTrackSelectorResult) {
this.rendererCapabilities = rendererCapabilities;
- this.rendererPositionOffsetUs = rendererPositionOffsetUs - info.startPositionUs;
+ this.rendererPositionOffsetUs = rendererPositionOffsetUs;
this.trackSelector = trackSelector;
this.mediaSource = mediaSource;
this.uid = info.id.periodUid;
this.info = info;
+ this.trackGroups = TrackGroupArray.EMPTY;
+ this.trackSelectorResult = emptyTrackSelectorResult;
sampleStreams = new SampleStream[rendererCapabilities.length];
mayRetainStreamFlags = new boolean[rendererCapabilities.length];
mediaPeriod =
@@ -115,6 +119,15 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
return rendererPositionOffsetUs;
}
+ /**
+ * Sets the renderer time of the start of the period, in microseconds.
+ *
+ * @param rendererPositionOffsetUs The new renderer position offset, in microseconds.
+ */
+ public void setRendererOffset(long rendererPositionOffsetUs) {
+ this.rendererPositionOffsetUs = rendererPositionOffsetUs;
+ }
+
/** Returns start position of period in renderer time. */
public long getStartPositionRendererTime() {
return info.startPositionUs + rendererPositionOffsetUs;
@@ -159,8 +172,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
public void handlePrepared(float playbackSpeed, Timeline timeline) throws ExoPlaybackException {
prepared = true;
trackGroups = mediaPeriod.getTrackGroups();
- TrackSelectorResult selectorResult =
- Assertions.checkNotNull(selectTracks(playbackSpeed, timeline));
+ TrackSelectorResult selectorResult = selectTracks(playbackSpeed, timeline);
long newStartPositionUs =
applyTrackSelection(
selectorResult, info.startPositionUs, /* forceRecreateStreams= */ false);
@@ -194,22 +206,20 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
}
/**
- * Selects tracks for the period and returns the new result if the selection changed. Must only be
- * called if {@link #prepared} is {@code true}.
+ * Selects tracks for the period. Must only be called if {@link #prepared} is {@code true}.
+ *
+ * The new track selection needs to be applied with {@link
+ * #applyTrackSelection(TrackSelectorResult, long, boolean)} before taking effect.
*
* @param playbackSpeed The current playback speed.
* @param timeline The current {@link Timeline}.
- * @return The {@link TrackSelectorResult} if the result changed. Or null if nothing changed.
+ * @return The {@link TrackSelectorResult}.
* @throws ExoPlaybackException If an error occurs during track selection.
*/
- @Nullable
public TrackSelectorResult selectTracks(float playbackSpeed, Timeline timeline)
throws ExoPlaybackException {
TrackSelectorResult selectorResult =
trackSelector.selectTracks(rendererCapabilities, getTrackGroups(), info.id, timeline);
- if (selectorResult.isEquivalent(trackSelectorResult)) {
- return null;
- }
for (TrackSelection trackSelection : selectorResult.selections.getAll()) {
if (trackSelection != null) {
trackSelection.onPlaybackSpeed(playbackSpeed);
@@ -295,7 +305,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
/** Releases the media period. No other method should be called after the release. */
public void release() {
disableTrackSelectionsInResult();
- trackSelectorResult = null;
releaseMediaPeriod(info.endPositionUs, mediaSource, mediaPeriod);
}
@@ -323,25 +332,18 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
return next;
}
- /**
- * Returns the {@link TrackGroupArray} exposed by this media period. Must only be called if {@link
- * #prepared} is {@code true}.
- */
+ /** Returns the {@link TrackGroupArray} exposed by this media period. */
public TrackGroupArray getTrackGroups() {
- return Assertions.checkNotNull(trackGroups);
+ return trackGroups;
}
- /**
- * Returns the {@link TrackSelectorResult} which is currently applied. Must only be called if
- * {@link #prepared} is {@code true}.
- */
+ /** Returns the {@link TrackSelectorResult} which is currently applied. */
public TrackSelectorResult getTrackSelectorResult() {
- return Assertions.checkNotNull(trackSelectorResult);
+ return trackSelectorResult;
}
private void enableTrackSelectionsInResult() {
- TrackSelectorResult trackSelectorResult = this.trackSelectorResult;
- if (!isLoadingMediaPeriod() || trackSelectorResult == null) {
+ if (!isLoadingMediaPeriod()) {
return;
}
for (int i = 0; i < trackSelectorResult.length; i++) {
@@ -354,8 +356,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
}
private void disableTrackSelectionsInResult() {
- TrackSelectorResult trackSelectorResult = this.trackSelectorResult;
- if (!isLoadingMediaPeriod() || trackSelectorResult == null) {
+ if (!isLoadingMediaPeriod()) {
return;
}
for (int i = 0; i < trackSelectorResult.length; i++) {
@@ -386,7 +387,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
*/
private void associateNoSampleRenderersWithEmptySampleStream(
@NullableType SampleStream[] sampleStreams) {
- TrackSelectorResult trackSelectorResult = Assertions.checkNotNull(this.trackSelectorResult);
for (int i = 0; i < rendererCapabilities.length; i++) {
if (rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE
&& trackSelectorResult.isRendererEnabled(i)) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
index bc1ea7b1e1..2733df7ba6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
@@ -29,7 +29,8 @@ import com.google.android.exoplayer2.util.Util;
public final long startPositionUs;
/**
* If this is an ad, the position to play in the next content media period. {@link C#TIME_UNSET}
- * otherwise.
+ * if this is not an ad or the next content media period should be played from its default
+ * position.
*/
public final long contentPositionUs;
/**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
index 249548340e..0f279ba6d3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.source.MediaPeriod;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
import com.google.android.exoplayer2.trackselection.TrackSelector;
+import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
import com.google.android.exoplayer2.upstream.Allocator;
import com.google.android.exoplayer2.util.Assertions;
@@ -46,11 +47,11 @@ import com.google.android.exoplayer2.util.Assertions;
private Timeline timeline;
private @RepeatMode int repeatMode;
private boolean shuffleModeEnabled;
- private @Nullable MediaPeriodHolder playing;
- private @Nullable MediaPeriodHolder reading;
- private @Nullable MediaPeriodHolder loading;
+ @Nullable private MediaPeriodHolder playing;
+ @Nullable private MediaPeriodHolder reading;
+ @Nullable private MediaPeriodHolder loading;
private int length;
- private @Nullable Object oldFrontPeriodUid;
+ @Nullable private Object oldFrontPeriodUid;
private long oldFrontPeriodWindowSequenceNumber;
/** Creates a new media period queue. */
@@ -135,17 +136,22 @@ import com.google.android.exoplayer2.util.Assertions;
* @param allocator The allocator.
* @param mediaSource The media source that produced the media period.
* @param info Information used to identify this media period in its timeline period.
+ * @param emptyTrackSelectorResult A {@link TrackSelectorResult} with empty selections for each
+ * renderer.
*/
public MediaPeriod enqueueNextMediaPeriod(
RendererCapabilities[] rendererCapabilities,
TrackSelector trackSelector,
Allocator allocator,
MediaSource mediaSource,
- MediaPeriodInfo info) {
+ MediaPeriodInfo info,
+ TrackSelectorResult emptyTrackSelectorResult) {
long rendererPositionOffsetUs =
loading == null
- ? info.startPositionUs
- : (loading.getRendererOffset() + loading.info.durationUs);
+ ? (info.id.isAd() && info.contentPositionUs != C.TIME_UNSET
+ ? info.contentPositionUs
+ : 0)
+ : (loading.getRendererOffset() + loading.info.durationUs - info.startPositionUs);
MediaPeriodHolder newPeriodHolder =
new MediaPeriodHolder(
rendererCapabilities,
@@ -153,7 +159,8 @@ import com.google.android.exoplayer2.util.Assertions;
trackSelector,
allocator,
mediaSource,
- info);
+ info,
+ emptyTrackSelectorResult);
if (loading != null) {
Assertions.checkState(hasPlayingPeriod());
loading.setNext(newPeriodHolder);
@@ -168,6 +175,7 @@ import com.google.android.exoplayer2.util.Assertions;
* Returns the loading period holder which is at the end of the queue, or null if the queue is
* empty.
*/
+ @Nullable
public MediaPeriodHolder getLoadingPeriod() {
return loading;
}
@@ -176,6 +184,7 @@ import com.google.android.exoplayer2.util.Assertions;
* Returns the playing period holder which is at the front of the queue, or null if the queue is
* empty or hasn't started playing.
*/
+ @Nullable
public MediaPeriodHolder getPlayingPeriod() {
return playing;
}
@@ -184,6 +193,7 @@ import com.google.android.exoplayer2.util.Assertions;
* Returns the reading period holder, or null if the queue is empty or the player hasn't started
* reading.
*/
+ @Nullable
public MediaPeriodHolder getReadingPeriod() {
return reading;
}
@@ -192,6 +202,7 @@ import com.google.android.exoplayer2.util.Assertions;
* Returns the period holder in the front of the queue which is the playing period holder when
* playing, or null if the queue is empty.
*/
+ @Nullable
public MediaPeriodHolder getFrontPeriod() {
return hasPlayingPeriod() ? playing : loading;
}
@@ -219,6 +230,7 @@ import com.google.android.exoplayer2.util.Assertions;
*
* @return The updated playing period holder, or null if the queue is or becomes empty.
*/
+ @Nullable
public MediaPeriodHolder advancePlayingPeriod() {
if (playing != null) {
if (playing == reading) {
@@ -275,8 +287,8 @@ import com.google.android.exoplayer2.util.Assertions;
if (front != null) {
oldFrontPeriodUid = keepFrontPeriodUid ? front.uid : null;
oldFrontPeriodWindowSequenceNumber = front.info.id.windowSequenceNumber;
- front.release();
removeAfter(front);
+ front.release();
} else if (!keepFrontPeriodUid) {
oldFrontPeriodUid = null;
}
@@ -560,6 +572,7 @@ import com.google.android.exoplayer2.util.Assertions;
}
long startPositionUs;
+ long contentPositionUs;
int nextWindowIndex =
timeline.getPeriod(nextPeriodIndex, period, /* setIds= */ true).windowIndex;
Object nextPeriodUid = period.uid;
@@ -568,6 +581,7 @@ import com.google.android.exoplayer2.util.Assertions;
// We're starting to buffer a new window. When playback transitions to this window we'll
// want it to be from its default start position, so project the default start position
// forward by the duration of the buffer, and start buffering from this point.
+ contentPositionUs = C.TIME_UNSET;
Pair defaultPosition =
timeline.getPeriodPosition(
window,
@@ -587,12 +601,13 @@ import com.google.android.exoplayer2.util.Assertions;
windowSequenceNumber = nextWindowSequenceNumber++;
}
} else {
+ // We're starting to buffer a new period within the same window.
startPositionUs = 0;
+ contentPositionUs = 0;
}
MediaPeriodId periodId =
resolveMediaPeriodIdForAds(nextPeriodUid, startPositionUs, windowSequenceNumber);
- return getMediaPeriodInfo(
- periodId, /* contentPositionUs= */ startPositionUs, startPositionUs);
+ return getMediaPeriodInfo(periodId, contentPositionUs, startPositionUs);
}
MediaPeriodId currentPeriodId = mediaPeriodInfo.id;
@@ -616,13 +631,11 @@ import com.google.android.exoplayer2.util.Assertions;
mediaPeriodInfo.contentPositionUs,
currentPeriodId.windowSequenceNumber);
} else {
- // Play content from the ad group position. As a special case, if we're transitioning from a
- // preroll ad group to content and there are no other ad groups, project the start position
- // forward as if this were a transition to a new window. No attempt is made to handle
- // midrolls in live streams, as it's unclear what content position should play after an ad
- // (server-side dynamic ad insertion is more appropriate for this use case).
+ // Play content from the ad group position.
long startPositionUs = mediaPeriodInfo.contentPositionUs;
- if (period.getAdGroupCount() == 1 && period.getAdGroupTimeUs(0) == 0) {
+ if (startPositionUs == C.TIME_UNSET) {
+ // If we're transitioning from an ad group to content starting from its default position,
+ // project the start position forward as if this were a transition to a new window.
Pair defaultPosition =
timeline.getPeriodPosition(
window,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
index cf4643c5da..e9b99acd77 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
@@ -16,7 +16,6 @@
package com.google.android.exoplayer2;
import androidx.annotation.CheckResult;
-import androidx.annotation.Nullable;
import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
@@ -35,8 +34,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
/** The current {@link Timeline}. */
public final Timeline timeline;
- /** The current manifest. */
- public final @Nullable Object manifest;
/** The {@link MediaPeriodId} of the currently playing media period in the {@link #timeline}. */
public final MediaPeriodId periodId;
/**
@@ -48,7 +45,8 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
/**
* If {@link #periodId} refers to an ad, the position of the suspended content relative to the
* start of the associated period in the {@link #timeline}, in microseconds. {@link C#TIME_UNSET}
- * if {@link #periodId} does not refer to an ad.
+ * if {@link #periodId} does not refer to an ad or if the suspended content should be played from
+ * its default position.
*/
public final long contentPositionUs;
/** The current playback state. One of the {@link Player}.STATE_ constants. */
@@ -91,7 +89,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
long startPositionUs, TrackSelectorResult emptyTrackSelectorResult) {
return new PlaybackInfo(
Timeline.EMPTY,
- /* manifest= */ null,
DUMMY_MEDIA_PERIOD_ID,
startPositionUs,
/* contentPositionUs= */ C.TIME_UNSET,
@@ -109,7 +106,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
* Create playback info.
*
* @param timeline See {@link #timeline}.
- * @param manifest See {@link #manifest}.
* @param periodId See {@link #periodId}.
* @param startPositionUs See {@link #startPositionUs}.
* @param contentPositionUs See {@link #contentPositionUs}.
@@ -124,7 +120,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
*/
public PlaybackInfo(
Timeline timeline,
- @Nullable Object manifest,
MediaPeriodId periodId,
long startPositionUs,
long contentPositionUs,
@@ -137,7 +132,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
long totalBufferedDurationUs,
long positionUs) {
this.timeline = timeline;
- this.manifest = manifest;
this.periodId = periodId;
this.startPositionUs = startPositionUs;
this.contentPositionUs = contentPositionUs;
@@ -156,17 +150,26 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
*
* @param shuffleModeEnabled Whether shuffle mode is enabled.
* @param window A writable {@link Timeline.Window}.
+ * @param period A writable {@link Timeline.Period}.
* @return A dummy media period id for the first-to-be-played period of the current timeline.
*/
public MediaPeriodId getDummyFirstMediaPeriodId(
- boolean shuffleModeEnabled, Timeline.Window window) {
+ boolean shuffleModeEnabled, Timeline.Window window, Timeline.Period period) {
if (timeline.isEmpty()) {
return DUMMY_MEDIA_PERIOD_ID;
}
- int firstPeriodIndex =
- timeline.getWindow(timeline.getFirstWindowIndex(shuffleModeEnabled), window)
- .firstPeriodIndex;
- return new MediaPeriodId(timeline.getUidOfPeriod(firstPeriodIndex));
+ int firstWindowIndex = timeline.getFirstWindowIndex(shuffleModeEnabled);
+ int firstPeriodIndex = timeline.getWindow(firstWindowIndex, window).firstPeriodIndex;
+ int currentPeriodIndex = timeline.getIndexOfPeriod(periodId.periodUid);
+ long windowSequenceNumber = C.INDEX_UNSET;
+ if (currentPeriodIndex != C.INDEX_UNSET) {
+ int currentWindowIndex = timeline.getPeriod(currentPeriodIndex, period).windowIndex;
+ if (firstWindowIndex == currentWindowIndex) {
+ // Keep window sequence number if the new position is still in the same window.
+ windowSequenceNumber = periodId.windowSequenceNumber;
+ }
+ }
+ return new MediaPeriodId(timeline.getUidOfPeriod(firstPeriodIndex), windowSequenceNumber);
}
/**
@@ -187,7 +190,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
long totalBufferedDurationUs) {
return new PlaybackInfo(
timeline,
- manifest,
periodId,
positionUs,
periodId.isAd() ? contentPositionUs : C.TIME_UNSET,
@@ -202,17 +204,15 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
}
/**
- * Copies playback info with new timeline and manifest.
+ * Copies playback info with the new timeline.
*
* @param timeline New timeline. See {@link #timeline}.
- * @param manifest New manifest. See {@link #manifest}.
- * @return Copied playback info with new timeline and manifest.
+ * @return Copied playback info with the new timeline.
*/
@CheckResult
- public PlaybackInfo copyWithTimeline(Timeline timeline, Object manifest) {
+ public PlaybackInfo copyWithTimeline(Timeline timeline) {
return new PlaybackInfo(
timeline,
- manifest,
periodId,
startPositionUs,
contentPositionUs,
@@ -236,7 +236,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
public PlaybackInfo copyWithPlaybackState(int playbackState) {
return new PlaybackInfo(
timeline,
- manifest,
periodId,
startPositionUs,
contentPositionUs,
@@ -260,7 +259,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
public PlaybackInfo copyWithIsLoading(boolean isLoading) {
return new PlaybackInfo(
timeline,
- manifest,
periodId,
startPositionUs,
contentPositionUs,
@@ -286,7 +284,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
TrackGroupArray trackGroups, TrackSelectorResult trackSelectorResult) {
return new PlaybackInfo(
timeline,
- manifest,
periodId,
startPositionUs,
contentPositionUs,
@@ -310,7 +307,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
public PlaybackInfo copyWithLoadingMediaPeriodId(MediaPeriodId loadingMediaPeriodId) {
return new PlaybackInfo(
timeline,
- manifest,
periodId,
startPositionUs,
contentPositionUs,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
index 0e19212afa..eed59876f9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -324,6 +324,29 @@ public interface Player {
*/
interface EventListener {
+ /**
+ * Called when the timeline has been refreshed.
+ *
+ * Note that if the timeline has changed then a position discontinuity may also have
+ * occurred. For example, the current period index may have changed as a result of periods being
+ * added or removed from the timeline. This will not be reported via a separate call to
+ * {@link #onPositionDiscontinuity(int)}.
+ *
+ * @param timeline The latest timeline. Never null, but may be empty.
+ * @param reason The {@link TimelineChangeReason} responsible for this timeline change.
+ */
+ @SuppressWarnings("deprecation")
+ default void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reason) {
+ Object manifest = null;
+ if (timeline.getWindowCount() == 1) {
+ // Legacy behavior was to report the manifest for single window timelines only.
+ Timeline.Window window = new Timeline.Window();
+ manifest = timeline.getWindow(0, window).manifest;
+ }
+ // Call deprecated version.
+ onTimelineChanged(timeline, manifest, reason);
+ }
+
/**
* Called when the timeline and/or manifest has been refreshed.
*
@@ -335,7 +358,11 @@ public interface Player {
* @param timeline The latest timeline. Never null, but may be empty.
* @param manifest The latest manifest. May be null.
* @param reason The {@link TimelineChangeReason} responsible for this timeline change.
+ * @deprecated Use {@link #onTimelineChanged(Timeline, int)} instead. The manifest can be
+ * accessed by using {@link #getCurrentManifest()} or {@code timeline.getWindow(windowIndex,
+ * window).manifest} for a given window index.
*/
+ @Deprecated
default void onTimelineChanged(
Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {}
@@ -396,8 +423,7 @@ public interface Player {
* when the source introduces a discontinuity internally).
*
*
When a position discontinuity occurs as a result of a change to the timeline this method
- * is not called. {@link #onTimelineChanged(Timeline, Object, int)} is called in this
- * case.
+ * is not called. {@link #onTimelineChanged(Timeline, int)} is called in this case.
*
* @param reason The {@link DiscontinuityReason} responsible for the discontinuity.
*/
@@ -428,6 +454,19 @@ public interface Player {
@Deprecated
abstract class DefaultEventListener implements EventListener {
+ @Override
+ @SuppressWarnings("deprecation")
+ public void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reason) {
+ Object manifest = null;
+ if (timeline.getWindowCount() == 1) {
+ // Legacy behavior was to report the manifest for single window timelines only.
+ Timeline.Window window = new Timeline.Window();
+ manifest = timeline.getWindow(0, window).manifest;
+ }
+ // Call deprecated version.
+ onTimelineChanged(timeline, manifest, reason);
+ }
+
@Override
@SuppressWarnings("deprecation")
public void onTimelineChanged(
@@ -436,7 +475,7 @@ public interface Player {
onTimelineChanged(timeline, manifest);
}
- /** @deprecated Use {@link EventListener#onTimelineChanged(Timeline, Object, int)} instead. */
+ /** @deprecated Use {@link EventListener#onTimelineChanged(Timeline, int)} instead. */
@Deprecated
public void onTimelineChanged(Timeline timeline, @Nullable Object manifest) {
// Do nothing.
@@ -524,8 +563,8 @@ public interface Player {
int DISCONTINUITY_REASON_INTERNAL = 4;
/**
- * Reasons for timeline and/or manifest changes. One of {@link #TIMELINE_CHANGE_REASON_PREPARED},
- * {@link #TIMELINE_CHANGE_REASON_RESET} or {@link #TIMELINE_CHANGE_REASON_DYNAMIC}.
+ * Reasons for timeline changes. One of {@link #TIMELINE_CHANGE_REASON_PREPARED}, {@link
+ * #TIMELINE_CHANGE_REASON_RESET} or {@link #TIMELINE_CHANGE_REASON_DYNAMIC}.
*/
@Documented
@Retention(RetentionPolicy.SOURCE)
@@ -722,13 +761,10 @@ public interface Player {
/**
* Attempts to set the playback parameters. Passing {@code null} sets the parameters to the
* default, {@link PlaybackParameters#DEFAULT}, which means there is no speed or pitch adjustment.
- *
- * Playback parameters changes may cause the player to buffer.
- * {@link EventListener#onPlaybackParametersChanged(PlaybackParameters)} will be called whenever
- * the currently active playback parameters change. When that listener is called, the parameters
- * passed to it may not match {@code playbackParameters}. For example, the chosen speed or pitch
- * may be out of range, in which case they are constrained to a set of permitted values. If it is
- * not possible to change the playback parameters, the listener will not be invoked.
+ *
+ *
Playback parameters changes may cause the player to buffer. {@link
+ * EventListener#onPlaybackParametersChanged(PlaybackParameters)} will be called whenever the
+ * currently active playback parameters change.
*
* @param playbackParameters The playback parameters, or {@code null} to use the defaults.
*/
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java b/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java
index 7904942c1b..49309181a0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java
@@ -55,7 +55,7 @@ public final class PlayerMessage {
private final Timeline timeline;
private int type;
- private @Nullable Object payload;
+ @Nullable private Object payload;
private Handler handler;
private int windowIndex;
private long positionMs;
@@ -134,7 +134,8 @@ public final class PlayerMessage {
}
/** Returns the message payload forwarded to {@link Target#handleMessage(int, Object)}. */
- public @Nullable Object getPayload() {
+ @Nullable
+ public Object getPayload() {
return payload;
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 056038d97a..8913fbdaba 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -144,7 +144,7 @@ public class SimpleExoPlayer extends BasePlayer
loadControl,
drmSessionManager,
bandwidthMeter,
- new AnalyticsCollector.Factory(),
+ new AnalyticsCollector(Clock.DEFAULT),
looper);
}
@@ -156,8 +156,8 @@ public class SimpleExoPlayer extends BasePlayer
* @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the instance
* will not be used for DRM protected playbacks.
* @param bandwidthMeter The {@link BandwidthMeter} that will be used by the instance.
- * @param analyticsCollectorFactory A factory for creating the {@link AnalyticsCollector} that
- * will collect and forward all player events.
+ * @param analyticsCollector The {@link AnalyticsCollector} that will collect and forward all
+ * player events.
* @param looper The {@link Looper} which must be used for all calls to the player and which is
* used to call listeners on.
*/
@@ -168,7 +168,7 @@ public class SimpleExoPlayer extends BasePlayer
LoadControl loadControl,
@Nullable DrmSessionManager drmSessionManager,
BandwidthMeter bandwidthMeter,
- AnalyticsCollector.Factory analyticsCollectorFactory,
+ AnalyticsCollector analyticsCollector,
Looper looper) {
this(
context,
@@ -177,7 +177,7 @@ public class SimpleExoPlayer extends BasePlayer
loadControl,
drmSessionManager,
bandwidthMeter,
- analyticsCollectorFactory,
+ analyticsCollector,
Clock.DEFAULT,
looper);
}
@@ -190,8 +190,8 @@ public class SimpleExoPlayer extends BasePlayer
* @param drmSessionManager An optional {@link DrmSessionManager}. May be null if the instance
* will not be used for DRM protected playbacks.
* @param bandwidthMeter The {@link BandwidthMeter} that will be used by the instance.
- * @param analyticsCollectorFactory A factory for creating the {@link AnalyticsCollector} that
- * will collect and forward all player events.
+ * @param analyticsCollector The {@link AnalyticsCollector} that will collect and forward all
+ * player events.
* @param clock The {@link Clock} that will be used by the instance. Should always be {@link
* Clock#DEFAULT}, unless the player is being used from a test.
* @param looper The {@link Looper} which must be used for all calls to the player and which is
@@ -204,10 +204,11 @@ public class SimpleExoPlayer extends BasePlayer
LoadControl loadControl,
@Nullable DrmSessionManager drmSessionManager,
BandwidthMeter bandwidthMeter,
- AnalyticsCollector.Factory analyticsCollectorFactory,
+ AnalyticsCollector analyticsCollector,
Clock clock,
Looper looper) {
this.bandwidthMeter = bandwidthMeter;
+ this.analyticsCollector = analyticsCollector;
componentListener = new ComponentListener();
videoListeners = new CopyOnWriteArraySet<>();
audioListeners = new CopyOnWriteArraySet<>();
@@ -235,7 +236,7 @@ public class SimpleExoPlayer extends BasePlayer
// Build the player and associated objects.
player =
new ExoPlayerImpl(renderers, trackSelector, loadControl, bandwidthMeter, clock, looper);
- analyticsCollector = analyticsCollectorFactory.createAnalyticsCollector(player, clock);
+ analyticsCollector.setPlayer(player);
addListener(analyticsCollector);
addListener(componentListener);
videoDebugListeners.add(analyticsCollector);
@@ -880,7 +881,8 @@ public class SimpleExoPlayer extends BasePlayer
}
@Override
- public @Nullable ExoPlaybackException getPlaybackError() {
+ @Nullable
+ public ExoPlaybackException getPlaybackError() {
verifyApplicationThread();
return player.getPlaybackError();
}
@@ -1033,26 +1035,12 @@ public class SimpleExoPlayer extends BasePlayer
currentCues = Collections.emptyList();
}
- @Override
- @Deprecated
- @SuppressWarnings("deprecation")
- public void sendMessages(ExoPlayerMessage... messages) {
- player.sendMessages(messages);
- }
-
@Override
public PlayerMessage createMessage(PlayerMessage.Target target) {
verifyApplicationThread();
return player.createMessage(target);
}
- @Override
- @Deprecated
- @SuppressWarnings("deprecation")
- public void blockingSendMessages(ExoPlayerMessage... messages) {
- player.blockingSendMessages(messages);
- }
-
@Override
public int getRendererCount() {
verifyApplicationThread();
@@ -1083,13 +1071,6 @@ public class SimpleExoPlayer extends BasePlayer
return player.getCurrentTimeline();
}
- @Override
- @Nullable
- public Object getCurrentManifest() {
- verifyApplicationThread();
- return player.getCurrentManifest();
- }
-
@Override
public int getCurrentPeriodIndex() {
verifyApplicationThread();
@@ -1232,8 +1213,7 @@ public class SimpleExoPlayer extends BasePlayer
Log.w(
TAG,
"Player is accessed on the wrong thread. See "
- + "https://exoplayer.dev/troubleshooting.html#"
- + "what-do-player-is-accessed-on-the-wrong-thread-warnings-mean",
+ + "https://exoplayer.dev/issues/player-accessed-on-wrong-thread",
hasNotifiedFullWrongThreadWarning ? null : new IllegalStateException());
hasNotifiedFullWrongThreadWarning = true;
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
index 0c64810d58..32fa3a6e4b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
@@ -122,6 +122,9 @@ public abstract class Timeline {
/** A tag for the window. Not necessarily unique. */
@Nullable public Object tag;
+ /** The manifest of the window. May be {@code null}. */
+ @Nullable public Object manifest;
+
/**
* The start time of the presentation to which this window belongs in milliseconds since the
* epoch, or {@link C#TIME_UNSET} if unknown or not applicable. For informational purposes only.
@@ -179,6 +182,7 @@ public abstract class Timeline {
/** Sets the data held by this window. */
public Window set(
@Nullable Object tag,
+ @Nullable Object manifest,
long presentationStartTimeMs,
long windowStartTimeMs,
boolean isSeekable,
@@ -189,6 +193,7 @@ public abstract class Timeline {
int lastPeriodIndex,
long positionInFirstPeriodUs) {
this.tag = tag;
+ this.manifest = manifest;
this.presentationStartTimeMs = presentationStartTimeMs;
this.windowStartTimeMs = windowStartTimeMs;
this.isSeekable = isSeekable;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
index 094024bc36..825424ae04 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
@@ -67,23 +67,6 @@ public class AnalyticsCollector
VideoListener,
AudioListener {
- /** Factory for an analytics collector. */
- public static class Factory {
-
- /**
- * Creates an analytics collector for the specified player.
- *
- * @param player The {@link Player} for which data will be collected. Can be null, if the player
- * is set by calling {@link AnalyticsCollector#setPlayer(Player)} before using the analytics
- * collector.
- * @param clock A {@link Clock} used to generate timestamps.
- * @return An analytics collector.
- */
- public AnalyticsCollector createAnalyticsCollector(@Nullable Player player, Clock clock) {
- return new AnalyticsCollector(player, clock);
- }
- }
-
private final CopyOnWriteArraySet listeners;
private final Clock clock;
private final Window window;
@@ -92,17 +75,11 @@ public class AnalyticsCollector
private @MonotonicNonNull Player player;
/**
- * Creates an analytics collector for the specified player.
+ * Creates an analytics collector.
*
- * @param player The {@link Player} for which data will be collected. Can be null, if the player
- * is set by calling {@link AnalyticsCollector#setPlayer(Player)} before using the analytics
- * collector.
* @param clock A {@link Clock} used to generate timestamps.
*/
- protected AnalyticsCollector(@Nullable Player player, Clock clock) {
- if (player != null) {
- this.player = player;
- }
+ public AnalyticsCollector(Clock clock) {
this.clock = Assertions.checkNotNull(clock);
listeners = new CopyOnWriteArraySet<>();
mediaPeriodQueueTracker = new MediaPeriodQueueTracker();
@@ -437,8 +414,7 @@ public class AnalyticsCollector
// having slightly different real times.
@Override
- public final void onTimelineChanged(
- Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
+ public final void onTimelineChanged(Timeline timeline, @Player.TimelineChangeReason int reason) {
mediaPeriodQueueTracker.onTimelineChanged(timeline);
EventTime eventTime = generatePlayingMediaPeriodEventTime();
for (AnalyticsListener listener : listeners) {
@@ -687,8 +663,9 @@ public class AnalyticsCollector
private final HashMap mediaPeriodIdToInfo;
private final Period period;
- private @Nullable MediaPeriodInfo lastReportedPlayingMediaPeriod;
- private @Nullable MediaPeriodInfo readingMediaPeriod;
+ @Nullable private MediaPeriodInfo lastPlayingMediaPeriod;
+ @Nullable private MediaPeriodInfo lastReportedPlayingMediaPeriod;
+ @Nullable private MediaPeriodInfo readingMediaPeriod;
private Timeline timeline;
private boolean isSeeking;
@@ -706,7 +683,8 @@ public class AnalyticsCollector
* always return null to reflect the uncertainty about the current playing period. May also be
* null, if the timeline is empty or no media period is active yet.
*/
- public @Nullable MediaPeriodInfo getPlayingMediaPeriod() {
+ @Nullable
+ public MediaPeriodInfo getPlayingMediaPeriod() {
return mediaPeriodInfoQueue.isEmpty() || timeline.isEmpty() || isSeeking
? null
: mediaPeriodInfoQueue.get(0);
@@ -719,7 +697,8 @@ public class AnalyticsCollector
* reported until the seek or preparation is processed. May be null, if no media period is
* active yet.
*/
- public @Nullable MediaPeriodInfo getLastReportedPlayingMediaPeriod() {
+ @Nullable
+ public MediaPeriodInfo getLastReportedPlayingMediaPeriod() {
return lastReportedPlayingMediaPeriod;
}
@@ -727,7 +706,8 @@ public class AnalyticsCollector
* Returns the {@link MediaPeriodInfo} of the media period currently being read by the player.
* May be null, if the player is not reading a media period.
*/
- public @Nullable MediaPeriodInfo getReadingMediaPeriod() {
+ @Nullable
+ public MediaPeriodInfo getReadingMediaPeriod() {
return readingMediaPeriod;
}
@@ -736,14 +716,16 @@ public class AnalyticsCollector
* currently loading or will be the next one loading. May be null, if no media period is active
* yet.
*/
- public @Nullable MediaPeriodInfo getLoadingMediaPeriod() {
+ @Nullable
+ public MediaPeriodInfo getLoadingMediaPeriod() {
return mediaPeriodInfoQueue.isEmpty()
? null
: mediaPeriodInfoQueue.get(mediaPeriodInfoQueue.size() - 1);
}
/** Returns the {@link MediaPeriodInfo} for the given {@link MediaPeriodId}. */
- public @Nullable MediaPeriodInfo getMediaPeriodInfo(MediaPeriodId mediaPeriodId) {
+ @Nullable
+ public MediaPeriodInfo getMediaPeriodInfo(MediaPeriodId mediaPeriodId) {
return mediaPeriodIdToInfo.get(mediaPeriodId);
}
@@ -756,7 +738,8 @@ public class AnalyticsCollector
* Tries to find an existing media period info from the specified window index. Only returns a
* non-null media period info if there is a unique, unambiguous match.
*/
- public @Nullable MediaPeriodInfo tryResolveWindowIndex(int windowIndex) {
+ @Nullable
+ public MediaPeriodInfo tryResolveWindowIndex(int windowIndex) {
MediaPeriodInfo match = null;
for (int i = 0; i < mediaPeriodInfoQueue.size(); i++) {
MediaPeriodInfo info = mediaPeriodInfoQueue.get(i);
@@ -775,7 +758,7 @@ public class AnalyticsCollector
/** Updates the queue with a reported position discontinuity . */
public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
- updateLastReportedPlayingMediaPeriod();
+ lastReportedPlayingMediaPeriod = lastPlayingMediaPeriod;
}
/** Updates the queue with a reported timeline change. */
@@ -790,7 +773,7 @@ public class AnalyticsCollector
readingMediaPeriod = updateMediaPeriodInfoToNewTimeline(readingMediaPeriod, timeline);
}
this.timeline = timeline;
- updateLastReportedPlayingMediaPeriod();
+ lastReportedPlayingMediaPeriod = lastPlayingMediaPeriod;
}
/** Updates the queue with a reported start of seek. */
@@ -801,7 +784,7 @@ public class AnalyticsCollector
/** Updates the queue with a reported processed seek. */
public void onSeekProcessed() {
isSeeking = false;
- updateLastReportedPlayingMediaPeriod();
+ lastReportedPlayingMediaPeriod = lastPlayingMediaPeriod;
}
/** Updates the queue with a newly created media period. */
@@ -811,8 +794,9 @@ public class AnalyticsCollector
new MediaPeriodInfo(mediaPeriodId, isInTimeline ? timeline : Timeline.EMPTY, windowIndex);
mediaPeriodInfoQueue.add(mediaPeriodInfo);
mediaPeriodIdToInfo.put(mediaPeriodId, mediaPeriodInfo);
+ lastPlayingMediaPeriod = mediaPeriodInfoQueue.get(0);
if (mediaPeriodInfoQueue.size() == 1 && !timeline.isEmpty()) {
- updateLastReportedPlayingMediaPeriod();
+ lastReportedPlayingMediaPeriod = lastPlayingMediaPeriod;
}
}
@@ -830,6 +814,9 @@ public class AnalyticsCollector
if (readingMediaPeriod != null && mediaPeriodId.equals(readingMediaPeriod.mediaPeriodId)) {
readingMediaPeriod = mediaPeriodInfoQueue.isEmpty() ? null : mediaPeriodInfoQueue.get(0);
}
+ if (!mediaPeriodInfoQueue.isEmpty()) {
+ lastPlayingMediaPeriod = mediaPeriodInfoQueue.get(0);
+ }
return true;
}
@@ -838,12 +825,6 @@ public class AnalyticsCollector
readingMediaPeriod = mediaPeriodIdToInfo.get(mediaPeriodId);
}
- private void updateLastReportedPlayingMediaPeriod() {
- if (!mediaPeriodInfoQueue.isEmpty()) {
- lastReportedPlayingMediaPeriod = mediaPeriodInfoQueue.get(0);
- }
- }
-
private MediaPeriodInfo updateMediaPeriodInfoToNewTimeline(
MediaPeriodInfo info, Timeline newTimeline) {
int newPeriodIndex = newTimeline.getIndexOfPeriod(info.mediaPeriodId.periodUid);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
index 48578d8853..be62ad99d2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
@@ -68,7 +68,7 @@ public interface AnalyticsListener {
* Media period identifier for the media period this event belongs to, or {@code null} if the
* event is not associated with a specific media period.
*/
- public final @Nullable MediaPeriodId mediaPeriodId;
+ @Nullable public final MediaPeriodId mediaPeriodId;
/**
* Position in the window or ad this event belongs to at the time of the event, in milliseconds.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManager.java
index 4ac7ad6506..183a74544d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManager.java
@@ -46,7 +46,7 @@ public final class DefaultPlaybackSessionManager implements PlaybackSessionManag
private final Timeline.Period period;
private final HashMap sessions;
- @MonotonicNonNull private Listener listener;
+ private @MonotonicNonNull Listener listener;
private Timeline currentTimeline;
@Nullable private MediaPeriodId currentMediaPeriodId;
@Nullable private String activeSessionId;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStats.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStats.java
new file mode 100644
index 0000000000..ed127bc550
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStats.java
@@ -0,0 +1,969 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.analytics;
+
+import android.os.SystemClock;
+import androidx.annotation.IntDef;
+import android.util.Pair;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.analytics.AnalyticsListener.EventTime;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Collections;
+import java.util.List;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
+
+/** Statistics about playbacks. */
+public final class PlaybackStats {
+
+ /**
+ * State of a playback. One of {@link #PLAYBACK_STATE_NOT_STARTED}, {@link
+ * #PLAYBACK_STATE_JOINING_FOREGROUND}, {@link #PLAYBACK_STATE_JOINING_BACKGROUND}, {@link
+ * #PLAYBACK_STATE_PLAYING}, {@link #PLAYBACK_STATE_PAUSED}, {@link #PLAYBACK_STATE_SEEKING},
+ * {@link #PLAYBACK_STATE_BUFFERING}, {@link #PLAYBACK_STATE_PAUSED_BUFFERING}, {@link
+ * #PLAYBACK_STATE_SEEK_BUFFERING}, {@link #PLAYBACK_STATE_ENDED}, {@link
+ * #PLAYBACK_STATE_STOPPED}, {@link #PLAYBACK_STATE_FAILED} or {@link #PLAYBACK_STATE_SUSPENDED}.
+ */
+ @Documented
+ @Retention(RetentionPolicy.SOURCE)
+ @Target({ElementType.TYPE_PARAMETER, ElementType.TYPE_USE})
+ @IntDef({
+ PLAYBACK_STATE_NOT_STARTED,
+ PLAYBACK_STATE_JOINING_BACKGROUND,
+ PLAYBACK_STATE_JOINING_FOREGROUND,
+ PLAYBACK_STATE_PLAYING,
+ PLAYBACK_STATE_PAUSED,
+ PLAYBACK_STATE_SEEKING,
+ PLAYBACK_STATE_BUFFERING,
+ PLAYBACK_STATE_PAUSED_BUFFERING,
+ PLAYBACK_STATE_SEEK_BUFFERING,
+ PLAYBACK_STATE_ENDED,
+ PLAYBACK_STATE_STOPPED,
+ PLAYBACK_STATE_FAILED,
+ PLAYBACK_STATE_SUSPENDED
+ })
+ @interface PlaybackState {}
+ /** Playback has not started (initial state). */
+ public static final int PLAYBACK_STATE_NOT_STARTED = 0;
+ /** Playback is buffering in the background for initial playback start. */
+ public static final int PLAYBACK_STATE_JOINING_BACKGROUND = 1;
+ /** Playback is buffering in the foreground for initial playback start. */
+ public static final int PLAYBACK_STATE_JOINING_FOREGROUND = 2;
+ /** Playback is actively playing. */
+ public static final int PLAYBACK_STATE_PLAYING = 3;
+ /** Playback is paused but ready to play. */
+ public static final int PLAYBACK_STATE_PAUSED = 4;
+ /** Playback is handling a seek. */
+ public static final int PLAYBACK_STATE_SEEKING = 5;
+ /** Playback is buffering to restart playback. */
+ public static final int PLAYBACK_STATE_BUFFERING = 6;
+ /** Playback is buffering while paused. */
+ public static final int PLAYBACK_STATE_PAUSED_BUFFERING = 7;
+ /** Playback is buffering after a seek. */
+ public static final int PLAYBACK_STATE_SEEK_BUFFERING = 8;
+ /** Playback has reached the end of the media. */
+ public static final int PLAYBACK_STATE_ENDED = 9;
+ /** Playback is stopped and can be resumed. */
+ public static final int PLAYBACK_STATE_STOPPED = 10;
+ /** Playback is stopped due a fatal error and can be retried. */
+ public static final int PLAYBACK_STATE_FAILED = 11;
+ /** Playback is suspended, e.g. because the user left or it is interrupted by another playback. */
+ public static final int PLAYBACK_STATE_SUSPENDED = 12;
+ /** Total number of playback states. */
+ /* package */ static final int PLAYBACK_STATE_COUNT = 13;
+
+ /** Empty playback stats. */
+ public static final PlaybackStats EMPTY = merge(/* nothing */ );
+
+ /**
+ * Returns the combined {@link PlaybackStats} for all input {@link PlaybackStats}.
+ *
+ * Note that the full history of events is not kept as the history only makes sense in the
+ * context of a single playback.
+ *
+ * @param playbackStats Array of {@link PlaybackStats} to combine.
+ * @return The combined {@link PlaybackStats}.
+ */
+ public static PlaybackStats merge(PlaybackStats... playbackStats) {
+ int playbackCount = 0;
+ long[] playbackStateDurationsMs = new long[PLAYBACK_STATE_COUNT];
+ long firstReportedTimeMs = C.TIME_UNSET;
+ int foregroundPlaybackCount = 0;
+ int abandonedBeforeReadyCount = 0;
+ int endedCount = 0;
+ int backgroundJoiningCount = 0;
+ long totalValidJoinTimeMs = C.TIME_UNSET;
+ int validJoinTimeCount = 0;
+ int totalPauseCount = 0;
+ int totalPauseBufferCount = 0;
+ int totalSeekCount = 0;
+ int totalRebufferCount = 0;
+ long maxRebufferTimeMs = C.TIME_UNSET;
+ int adPlaybackCount = 0;
+ long totalVideoFormatHeightTimeMs = 0;
+ long totalVideoFormatHeightTimeProduct = 0;
+ long totalVideoFormatBitrateTimeMs = 0;
+ long totalVideoFormatBitrateTimeProduct = 0;
+ long totalAudioFormatTimeMs = 0;
+ long totalAudioFormatBitrateTimeProduct = 0;
+ int initialVideoFormatHeightCount = 0;
+ int initialVideoFormatBitrateCount = 0;
+ int totalInitialVideoFormatHeight = C.LENGTH_UNSET;
+ long totalInitialVideoFormatBitrate = C.LENGTH_UNSET;
+ int initialAudioFormatBitrateCount = 0;
+ long totalInitialAudioFormatBitrate = C.LENGTH_UNSET;
+ long totalBandwidthTimeMs = 0;
+ long totalBandwidthBytes = 0;
+ long totalDroppedFrames = 0;
+ long totalAudioUnderruns = 0;
+ int fatalErrorPlaybackCount = 0;
+ int fatalErrorCount = 0;
+ int nonFatalErrorCount = 0;
+ for (PlaybackStats stats : playbackStats) {
+ playbackCount += stats.playbackCount;
+ for (int i = 0; i < PLAYBACK_STATE_COUNT; i++) {
+ playbackStateDurationsMs[i] += stats.playbackStateDurationsMs[i];
+ }
+ if (firstReportedTimeMs == C.TIME_UNSET) {
+ firstReportedTimeMs = stats.firstReportedTimeMs;
+ } else if (stats.firstReportedTimeMs != C.TIME_UNSET) {
+ firstReportedTimeMs = Math.min(firstReportedTimeMs, stats.firstReportedTimeMs);
+ }
+ foregroundPlaybackCount += stats.foregroundPlaybackCount;
+ abandonedBeforeReadyCount += stats.abandonedBeforeReadyCount;
+ endedCount += stats.endedCount;
+ backgroundJoiningCount += stats.backgroundJoiningCount;
+ if (totalValidJoinTimeMs == C.TIME_UNSET) {
+ totalValidJoinTimeMs = stats.totalValidJoinTimeMs;
+ } else if (stats.totalValidJoinTimeMs != C.TIME_UNSET) {
+ totalValidJoinTimeMs += stats.totalValidJoinTimeMs;
+ }
+ validJoinTimeCount += stats.validJoinTimeCount;
+ totalPauseCount += stats.totalPauseCount;
+ totalPauseBufferCount += stats.totalPauseBufferCount;
+ totalSeekCount += stats.totalSeekCount;
+ totalRebufferCount += stats.totalRebufferCount;
+ if (maxRebufferTimeMs == C.TIME_UNSET) {
+ maxRebufferTimeMs = stats.maxRebufferTimeMs;
+ } else if (stats.maxRebufferTimeMs != C.TIME_UNSET) {
+ maxRebufferTimeMs = Math.max(maxRebufferTimeMs, stats.maxRebufferTimeMs);
+ }
+ adPlaybackCount += stats.adPlaybackCount;
+ totalVideoFormatHeightTimeMs += stats.totalVideoFormatHeightTimeMs;
+ totalVideoFormatHeightTimeProduct += stats.totalVideoFormatHeightTimeProduct;
+ totalVideoFormatBitrateTimeMs += stats.totalVideoFormatBitrateTimeMs;
+ totalVideoFormatBitrateTimeProduct += stats.totalVideoFormatBitrateTimeProduct;
+ totalAudioFormatTimeMs += stats.totalAudioFormatTimeMs;
+ totalAudioFormatBitrateTimeProduct += stats.totalAudioFormatBitrateTimeProduct;
+ initialVideoFormatHeightCount += stats.initialVideoFormatHeightCount;
+ initialVideoFormatBitrateCount += stats.initialVideoFormatBitrateCount;
+ if (totalInitialVideoFormatHeight == C.LENGTH_UNSET) {
+ totalInitialVideoFormatHeight = stats.totalInitialVideoFormatHeight;
+ } else if (stats.totalInitialVideoFormatHeight != C.LENGTH_UNSET) {
+ totalInitialVideoFormatHeight += stats.totalInitialVideoFormatHeight;
+ }
+ if (totalInitialVideoFormatBitrate == C.LENGTH_UNSET) {
+ totalInitialVideoFormatBitrate = stats.totalInitialVideoFormatBitrate;
+ } else if (stats.totalInitialVideoFormatBitrate != C.LENGTH_UNSET) {
+ totalInitialVideoFormatBitrate += stats.totalInitialVideoFormatBitrate;
+ }
+ initialAudioFormatBitrateCount += stats.initialAudioFormatBitrateCount;
+ if (totalInitialAudioFormatBitrate == C.LENGTH_UNSET) {
+ totalInitialAudioFormatBitrate = stats.totalInitialAudioFormatBitrate;
+ } else if (stats.totalInitialAudioFormatBitrate != C.LENGTH_UNSET) {
+ totalInitialAudioFormatBitrate += stats.totalInitialAudioFormatBitrate;
+ }
+ totalBandwidthTimeMs += stats.totalBandwidthTimeMs;
+ totalBandwidthBytes += stats.totalBandwidthBytes;
+ totalDroppedFrames += stats.totalDroppedFrames;
+ totalAudioUnderruns += stats.totalAudioUnderruns;
+ fatalErrorPlaybackCount += stats.fatalErrorPlaybackCount;
+ fatalErrorCount += stats.fatalErrorCount;
+ nonFatalErrorCount += stats.nonFatalErrorCount;
+ }
+ return new PlaybackStats(
+ playbackCount,
+ playbackStateDurationsMs,
+ /* playbackStateHistory */ Collections.emptyList(),
+ /* mediaTimeHistory= */ Collections.emptyList(),
+ firstReportedTimeMs,
+ foregroundPlaybackCount,
+ abandonedBeforeReadyCount,
+ endedCount,
+ backgroundJoiningCount,
+ totalValidJoinTimeMs,
+ validJoinTimeCount,
+ totalPauseCount,
+ totalPauseBufferCount,
+ totalSeekCount,
+ totalRebufferCount,
+ maxRebufferTimeMs,
+ adPlaybackCount,
+ /* videoFormatHistory= */ Collections.emptyList(),
+ /* audioFormatHistory= */ Collections.emptyList(),
+ totalVideoFormatHeightTimeMs,
+ totalVideoFormatHeightTimeProduct,
+ totalVideoFormatBitrateTimeMs,
+ totalVideoFormatBitrateTimeProduct,
+ totalAudioFormatTimeMs,
+ totalAudioFormatBitrateTimeProduct,
+ initialVideoFormatHeightCount,
+ initialVideoFormatBitrateCount,
+ totalInitialVideoFormatHeight,
+ totalInitialVideoFormatBitrate,
+ initialAudioFormatBitrateCount,
+ totalInitialAudioFormatBitrate,
+ totalBandwidthTimeMs,
+ totalBandwidthBytes,
+ totalDroppedFrames,
+ totalAudioUnderruns,
+ fatalErrorPlaybackCount,
+ fatalErrorCount,
+ nonFatalErrorCount,
+ /* fatalErrorHistory= */ Collections.emptyList(),
+ /* nonFatalErrorHistory= */ Collections.emptyList());
+ }
+
+ /** The number of individual playbacks for which these stats were collected. */
+ public final int playbackCount;
+
+ // Playback state stats.
+
+ /**
+ * The playback state history as ordered pairs of the {@link EventTime} at which a state became
+ * active and the {@link PlaybackState}.
+ */
+ public final List> playbackStateHistory;
+ /**
+ * The media time history as an ordered list of long[2] arrays with [0] being the realtime as
+ * returned by {@code SystemClock.elapsedRealtime()} and [1] being the media time at this
+ * realtime, in milliseconds.
+ */
+ public final List mediaTimeHistory;
+ /**
+ * The elapsed real-time as returned by {@code SystemClock.elapsedRealtime()} of the first
+ * reported playback event, or {@link C#TIME_UNSET} if no event has been reported.
+ */
+ public final long firstReportedTimeMs;
+ /** The number of playbacks which were the active foreground playback at some point. */
+ public final int foregroundPlaybackCount;
+ /** The number of playbacks which were abandoned before they were ready to play. */
+ public final int abandonedBeforeReadyCount;
+ /** The number of playbacks which reached the ended state at least once. */
+ public final int endedCount;
+ /** The number of playbacks which were pre-buffered in the background. */
+ public final int backgroundJoiningCount;
+ /**
+ * The total time spent joining the playback, in milliseconds, or {@link C#TIME_UNSET} if no valid
+ * join time could be determined.
+ *
+ * Note that this does not include background joining time. A join time may be invalid if the
+ * playback never reached {@link #PLAYBACK_STATE_PLAYING} or {@link #PLAYBACK_STATE_PAUSED}, or
+ * joining was interrupted by a seek, stop, or error state.
+ */
+ public final long totalValidJoinTimeMs;
+ /**
+ * The number of playbacks with a valid join time as documented in {@link #totalValidJoinTimeMs}.
+ */
+ public final int validJoinTimeCount;
+ /** The total number of times a playback has been paused. */
+ public final int totalPauseCount;
+ /** The total number of times a playback has been paused while rebuffering. */
+ public final int totalPauseBufferCount;
+ /**
+ * The total number of times a seek occurred. This includes seeks happening before playback
+ * resumed after another seek.
+ */
+ public final int totalSeekCount;
+ /**
+ * The total number of times a rebuffer occurred. This excludes initial joining and buffering
+ * after seek.
+ */
+ public final int totalRebufferCount;
+ /**
+ * The maximum time spent during a single rebuffer, in milliseconds, or {@link C#TIME_UNSET} if no
+ * rebuffer occurred.
+ */
+ public final long maxRebufferTimeMs;
+ /** The number of ad playbacks. */
+ public final int adPlaybackCount;
+
+ // Format stats.
+
+ /**
+ * The video format history as ordered pairs of the {@link EventTime} at which a format started
+ * being used and the {@link Format}. The {@link Format} may be null if no video format was used.
+ */
+ public final List> videoFormatHistory;
+ /**
+ * The audio format history as ordered pairs of the {@link EventTime} at which a format started
+ * being used and the {@link Format}. The {@link Format} may be null if no audio format was used.
+ */
+ public final List> audioFormatHistory;
+ /** The total media time for which video format height data is available, in milliseconds. */
+ public final long totalVideoFormatHeightTimeMs;
+ /**
+ * The accumulated sum of all video format heights, in pixels, times the time the format was used
+ * for playback, in milliseconds.
+ */
+ public final long totalVideoFormatHeightTimeProduct;
+ /** The total media time for which video format bitrate data is available, in milliseconds. */
+ public final long totalVideoFormatBitrateTimeMs;
+ /**
+ * The accumulated sum of all video format bitrates, in bits per second, times the time the format
+ * was used for playback, in milliseconds.
+ */
+ public final long totalVideoFormatBitrateTimeProduct;
+ /** The total media time for which audio format data is available, in milliseconds. */
+ public final long totalAudioFormatTimeMs;
+ /**
+ * The accumulated sum of all audio format bitrates, in bits per second, times the time the format
+ * was used for playback, in milliseconds.
+ */
+ public final long totalAudioFormatBitrateTimeProduct;
+ /** The number of playbacks with initial video format height data. */
+ public final int initialVideoFormatHeightCount;
+ /** The number of playbacks with initial video format bitrate data. */
+ public final int initialVideoFormatBitrateCount;
+ /**
+ * The total initial video format height for all playbacks, in pixels, or {@link C#LENGTH_UNSET}
+ * if no initial video format data is available.
+ */
+ public final int totalInitialVideoFormatHeight;
+ /**
+ * The total initial video format bitrate for all playbacks, in bits per second, or {@link
+ * C#LENGTH_UNSET} if no initial video format data is available.
+ */
+ public final long totalInitialVideoFormatBitrate;
+ /** The number of playbacks with initial audio format bitrate data. */
+ public final int initialAudioFormatBitrateCount;
+ /**
+ * The total initial audio format bitrate for all playbacks, in bits per second, or {@link
+ * C#LENGTH_UNSET} if no initial audio format data is available.
+ */
+ public final long totalInitialAudioFormatBitrate;
+
+ // Bandwidth stats.
+
+ /** The total time for which bandwidth measurement data is available, in milliseconds. */
+ public final long totalBandwidthTimeMs;
+ /** The total bytes transferred during {@link #totalBandwidthTimeMs}. */
+ public final long totalBandwidthBytes;
+
+ // Renderer quality stats.
+
+ /** The total number of dropped video frames. */
+ public final long totalDroppedFrames;
+ /** The total number of audio underruns. */
+ public final long totalAudioUnderruns;
+
+ // Error stats.
+
+ /**
+ * The total number of playback with at least one fatal error. Errors are fatal if playback
+ * stopped due to this error.
+ */
+ public final int fatalErrorPlaybackCount;
+ /** The total number of fatal errors. Errors are fatal if playback stopped due to this error. */
+ public final int fatalErrorCount;
+ /**
+ * The total number of non-fatal errors. Error are non-fatal if playback can recover from the
+ * error without stopping.
+ */
+ public final int nonFatalErrorCount;
+ /**
+ * The history of fatal errors as ordered pairs of the {@link EventTime} at which an error
+ * occurred and the error. Errors are fatal if playback stopped due to this error.
+ */
+ public final List> fatalErrorHistory;
+ /**
+ * The history of non-fatal errors as ordered pairs of the {@link EventTime} at which an error
+ * occurred and the error. Error are non-fatal if playback can recover from the error without
+ * stopping.
+ */
+ public final List> nonFatalErrorHistory;
+
+ private final long[] playbackStateDurationsMs;
+
+ /* package */ PlaybackStats(
+ int playbackCount,
+ long[] playbackStateDurationsMs,
+ List> playbackStateHistory,
+ List mediaTimeHistory,
+ long firstReportedTimeMs,
+ int foregroundPlaybackCount,
+ int abandonedBeforeReadyCount,
+ int endedCount,
+ int backgroundJoiningCount,
+ long totalValidJoinTimeMs,
+ int validJoinTimeCount,
+ int totalPauseCount,
+ int totalPauseBufferCount,
+ int totalSeekCount,
+ int totalRebufferCount,
+ long maxRebufferTimeMs,
+ int adPlaybackCount,
+ List> videoFormatHistory,
+ List> audioFormatHistory,
+ long totalVideoFormatHeightTimeMs,
+ long totalVideoFormatHeightTimeProduct,
+ long totalVideoFormatBitrateTimeMs,
+ long totalVideoFormatBitrateTimeProduct,
+ long totalAudioFormatTimeMs,
+ long totalAudioFormatBitrateTimeProduct,
+ int initialVideoFormatHeightCount,
+ int initialVideoFormatBitrateCount,
+ int totalInitialVideoFormatHeight,
+ long totalInitialVideoFormatBitrate,
+ int initialAudioFormatBitrateCount,
+ long totalInitialAudioFormatBitrate,
+ long totalBandwidthTimeMs,
+ long totalBandwidthBytes,
+ long totalDroppedFrames,
+ long totalAudioUnderruns,
+ int fatalErrorPlaybackCount,
+ int fatalErrorCount,
+ int nonFatalErrorCount,
+ List> fatalErrorHistory,
+ List> nonFatalErrorHistory) {
+ this.playbackCount = playbackCount;
+ this.playbackStateDurationsMs = playbackStateDurationsMs;
+ this.playbackStateHistory = Collections.unmodifiableList(playbackStateHistory);
+ this.mediaTimeHistory = Collections.unmodifiableList(mediaTimeHistory);
+ this.firstReportedTimeMs = firstReportedTimeMs;
+ this.foregroundPlaybackCount = foregroundPlaybackCount;
+ this.abandonedBeforeReadyCount = abandonedBeforeReadyCount;
+ this.endedCount = endedCount;
+ this.backgroundJoiningCount = backgroundJoiningCount;
+ this.totalValidJoinTimeMs = totalValidJoinTimeMs;
+ this.validJoinTimeCount = validJoinTimeCount;
+ this.totalPauseCount = totalPauseCount;
+ this.totalPauseBufferCount = totalPauseBufferCount;
+ this.totalSeekCount = totalSeekCount;
+ this.totalRebufferCount = totalRebufferCount;
+ this.maxRebufferTimeMs = maxRebufferTimeMs;
+ this.adPlaybackCount = adPlaybackCount;
+ this.videoFormatHistory = Collections.unmodifiableList(videoFormatHistory);
+ this.audioFormatHistory = Collections.unmodifiableList(audioFormatHistory);
+ this.totalVideoFormatHeightTimeMs = totalVideoFormatHeightTimeMs;
+ this.totalVideoFormatHeightTimeProduct = totalVideoFormatHeightTimeProduct;
+ this.totalVideoFormatBitrateTimeMs = totalVideoFormatBitrateTimeMs;
+ this.totalVideoFormatBitrateTimeProduct = totalVideoFormatBitrateTimeProduct;
+ this.totalAudioFormatTimeMs = totalAudioFormatTimeMs;
+ this.totalAudioFormatBitrateTimeProduct = totalAudioFormatBitrateTimeProduct;
+ this.initialVideoFormatHeightCount = initialVideoFormatHeightCount;
+ this.initialVideoFormatBitrateCount = initialVideoFormatBitrateCount;
+ this.totalInitialVideoFormatHeight = totalInitialVideoFormatHeight;
+ this.totalInitialVideoFormatBitrate = totalInitialVideoFormatBitrate;
+ this.initialAudioFormatBitrateCount = initialAudioFormatBitrateCount;
+ this.totalInitialAudioFormatBitrate = totalInitialAudioFormatBitrate;
+ this.totalBandwidthTimeMs = totalBandwidthTimeMs;
+ this.totalBandwidthBytes = totalBandwidthBytes;
+ this.totalDroppedFrames = totalDroppedFrames;
+ this.totalAudioUnderruns = totalAudioUnderruns;
+ this.fatalErrorPlaybackCount = fatalErrorPlaybackCount;
+ this.fatalErrorCount = fatalErrorCount;
+ this.nonFatalErrorCount = nonFatalErrorCount;
+ this.fatalErrorHistory = Collections.unmodifiableList(fatalErrorHistory);
+ this.nonFatalErrorHistory = Collections.unmodifiableList(nonFatalErrorHistory);
+ }
+
+ /**
+ * Returns the total time spent in a given {@link PlaybackState}, in milliseconds.
+ *
+ * @param playbackState A {@link PlaybackState}.
+ * @return Total spent in the given playback state, in milliseconds
+ */
+ public long getPlaybackStateDurationMs(@PlaybackState int playbackState) {
+ return playbackStateDurationsMs[playbackState];
+ }
+
+ /**
+ * Returns the {@link PlaybackState} at the given time.
+ *
+ * @param realtimeMs The time as returned by {@link SystemClock#elapsedRealtime()}.
+ * @return The {@link PlaybackState} at that time, or {@link #PLAYBACK_STATE_NOT_STARTED} if the
+ * given time is before the first known playback state in the history.
+ */
+ public @PlaybackState int getPlaybackStateAtTime(long realtimeMs) {
+ @PlaybackState int state = PLAYBACK_STATE_NOT_STARTED;
+ for (Pair timeAndState : playbackStateHistory) {
+ if (timeAndState.first.realtimeMs > realtimeMs) {
+ break;
+ }
+ state = timeAndState.second;
+ }
+ return state;
+ }
+
+ /**
+ * Returns the estimated media time at the given realtime, in milliseconds, or {@link
+ * C#TIME_UNSET} if the media time history is unknown.
+ *
+ * @param realtimeMs The realtime as returned by {@link SystemClock#elapsedRealtime()}.
+ * @return The estimated media time in milliseconds at this realtime, {@link C#TIME_UNSET} if no
+ * estimate can be given.
+ */
+ public long getMediaTimeMsAtRealtimeMs(long realtimeMs) {
+ if (mediaTimeHistory.isEmpty()) {
+ return C.TIME_UNSET;
+ }
+ int nextIndex = 0;
+ while (nextIndex < mediaTimeHistory.size()
+ && mediaTimeHistory.get(nextIndex)[0] <= realtimeMs) {
+ nextIndex++;
+ }
+ if (nextIndex == 0) {
+ return mediaTimeHistory.get(0)[1];
+ }
+ if (nextIndex == mediaTimeHistory.size()) {
+ return mediaTimeHistory.get(mediaTimeHistory.size() - 1)[1];
+ }
+ long prevRealtimeMs = mediaTimeHistory.get(nextIndex - 1)[0];
+ long prevMediaTimeMs = mediaTimeHistory.get(nextIndex - 1)[1];
+ long nextRealtimeMs = mediaTimeHistory.get(nextIndex)[0];
+ long nextMediaTimeMs = mediaTimeHistory.get(nextIndex)[1];
+ long realtimeDurationMs = nextRealtimeMs - prevRealtimeMs;
+ if (realtimeDurationMs == 0) {
+ return prevMediaTimeMs;
+ }
+ float fraction = (float) (realtimeMs - prevRealtimeMs) / realtimeDurationMs;
+ return prevMediaTimeMs + (long) ((nextMediaTimeMs - prevMediaTimeMs) * fraction);
+ }
+
+ /**
+ * Returns the mean time spent joining the playback, in milliseconds, or {@link C#TIME_UNSET} if
+ * no valid join time is available. Only includes playbacks with valid join times as documented in
+ * {@link #totalValidJoinTimeMs}.
+ */
+ public long getMeanJoinTimeMs() {
+ return validJoinTimeCount == 0 ? C.TIME_UNSET : totalValidJoinTimeMs / validJoinTimeCount;
+ }
+
+ /**
+ * Returns the total time spent joining the playback in foreground, in milliseconds. This does
+ * include invalid join times where the playback never reached {@link #PLAYBACK_STATE_PLAYING} or
+ * {@link #PLAYBACK_STATE_PAUSED}, or joining was interrupted by a seek, stop, or error state.
+ */
+ public long getTotalJoinTimeMs() {
+ return getPlaybackStateDurationMs(PLAYBACK_STATE_JOINING_FOREGROUND);
+ }
+
+ /** Returns the total time spent actively playing, in milliseconds. */
+ public long getTotalPlayTimeMs() {
+ return getPlaybackStateDurationMs(PLAYBACK_STATE_PLAYING);
+ }
+
+ /**
+ * Returns the mean time spent actively playing per foreground playback, in milliseconds, or
+ * {@link C#TIME_UNSET} if no playback has been in foreground.
+ */
+ public long getMeanPlayTimeMs() {
+ return foregroundPlaybackCount == 0
+ ? C.TIME_UNSET
+ : getTotalPlayTimeMs() / foregroundPlaybackCount;
+ }
+
+ /** Returns the total time spent in a paused state, in milliseconds. */
+ public long getTotalPausedTimeMs() {
+ return getPlaybackStateDurationMs(PLAYBACK_STATE_PAUSED)
+ + getPlaybackStateDurationMs(PLAYBACK_STATE_PAUSED_BUFFERING);
+ }
+
+ /**
+ * Returns the mean time spent in a paused state per foreground playback, in milliseconds, or
+ * {@link C#TIME_UNSET} if no playback has been in foreground.
+ */
+ public long getMeanPausedTimeMs() {
+ return foregroundPlaybackCount == 0
+ ? C.TIME_UNSET
+ : getTotalPausedTimeMs() / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the total time spent rebuffering, in milliseconds. This excludes initial join times,
+ * buffer times after a seek and buffering while paused.
+ */
+ public long getTotalRebufferTimeMs() {
+ return getPlaybackStateDurationMs(PLAYBACK_STATE_BUFFERING);
+ }
+
+ /**
+ * Returns the mean time spent rebuffering per foreground playback, in milliseconds, or {@link
+ * C#TIME_UNSET} if no playback has been in foreground. This excludes initial join times, buffer
+ * times after a seek and buffering while paused.
+ */
+ public long getMeanRebufferTimeMs() {
+ return foregroundPlaybackCount == 0
+ ? C.TIME_UNSET
+ : getTotalRebufferTimeMs() / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the mean time spent during a single rebuffer, in milliseconds, or {@link C#TIME_UNSET}
+ * if no rebuffer was recorded. This excludes initial join times and buffer times after a seek.
+ */
+ public long getMeanSingleRebufferTimeMs() {
+ return totalRebufferCount == 0
+ ? C.TIME_UNSET
+ : (getPlaybackStateDurationMs(PLAYBACK_STATE_BUFFERING)
+ + getPlaybackStateDurationMs(PLAYBACK_STATE_PAUSED_BUFFERING))
+ / totalRebufferCount;
+ }
+
+ /**
+ * Returns the total time spent from the start of a seek until playback is ready again, in
+ * milliseconds.
+ */
+ public long getTotalSeekTimeMs() {
+ return getPlaybackStateDurationMs(PLAYBACK_STATE_SEEKING)
+ + getPlaybackStateDurationMs(PLAYBACK_STATE_SEEK_BUFFERING);
+ }
+
+ /**
+ * Returns the mean time spent per foreground playback from the start of a seek until playback is
+ * ready again, in milliseconds, or {@link C#TIME_UNSET} if no playback has been in foreground.
+ */
+ public long getMeanSeekTimeMs() {
+ return foregroundPlaybackCount == 0
+ ? C.TIME_UNSET
+ : getTotalSeekTimeMs() / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the mean time spent from the start of a single seek until playback is ready again, in
+ * milliseconds, or {@link C#TIME_UNSET} if no seek occurred.
+ */
+ public long getMeanSingleSeekTimeMs() {
+ return totalSeekCount == 0 ? C.TIME_UNSET : getTotalSeekTimeMs() / totalSeekCount;
+ }
+
+ /**
+ * Returns the total time spent actively waiting for playback, in milliseconds. This includes all
+ * join times, rebuffer times and seek times, but excludes times without user intention to play,
+ * e.g. all paused states.
+ */
+ public long getTotalWaitTimeMs() {
+ return getPlaybackStateDurationMs(PLAYBACK_STATE_JOINING_FOREGROUND)
+ + getPlaybackStateDurationMs(PLAYBACK_STATE_BUFFERING)
+ + getPlaybackStateDurationMs(PLAYBACK_STATE_SEEKING)
+ + getPlaybackStateDurationMs(PLAYBACK_STATE_SEEK_BUFFERING);
+ }
+
+ /**
+ * Returns the mean time spent actively waiting for playback per foreground playback, in
+ * milliseconds, or {@link C#TIME_UNSET} if no playback has been in foreground. This includes all
+ * join times, rebuffer times and seek times, but excludes times without user intention to play,
+ * e.g. all paused states.
+ */
+ public long getMeanWaitTimeMs() {
+ return foregroundPlaybackCount == 0
+ ? C.TIME_UNSET
+ : getTotalWaitTimeMs() / foregroundPlaybackCount;
+ }
+
+ /** Returns the total time spent playing or actively waiting for playback, in milliseconds. */
+ public long getTotalPlayAndWaitTimeMs() {
+ return getTotalPlayTimeMs() + getTotalWaitTimeMs();
+ }
+
+ /**
+ * Returns the mean time spent playing or actively waiting for playback per foreground playback,
+ * in milliseconds, or {@link C#TIME_UNSET} if no playback has been in foreground.
+ */
+ public long getMeanPlayAndWaitTimeMs() {
+ return foregroundPlaybackCount == 0
+ ? C.TIME_UNSET
+ : getTotalPlayAndWaitTimeMs() / foregroundPlaybackCount;
+ }
+
+ /** Returns the total time covered by any playback state, in milliseconds. */
+ public long getTotalElapsedTimeMs() {
+ long totalTimeMs = 0;
+ for (int i = 0; i < PLAYBACK_STATE_COUNT; i++) {
+ totalTimeMs += playbackStateDurationsMs[i];
+ }
+ return totalTimeMs;
+ }
+
+ /**
+ * Returns the mean time covered by any playback state per playback, in milliseconds, or {@link
+ * C#TIME_UNSET} if no playback was recorded.
+ */
+ public long getMeanElapsedTimeMs() {
+ return playbackCount == 0 ? C.TIME_UNSET : getTotalElapsedTimeMs() / playbackCount;
+ }
+
+ /**
+ * Returns the ratio of foreground playbacks which were abandoned before they were ready to play,
+ * or {@code 0.0} if no playback has been in foreground.
+ */
+ public float getAbandonedBeforeReadyRatio() {
+ int foregroundAbandonedBeforeReady =
+ abandonedBeforeReadyCount - (playbackCount - foregroundPlaybackCount);
+ return foregroundPlaybackCount == 0
+ ? 0f
+ : (float) foregroundAbandonedBeforeReady / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the ratio of foreground playbacks which reached the ended state at least once, or
+ * {@code 0.0} if no playback has been in foreground.
+ */
+ public float getEndedRatio() {
+ return foregroundPlaybackCount == 0 ? 0f : (float) endedCount / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the mean number of times a playback has been paused per foreground playback, or {@code
+ * 0.0} if no playback has been in foreground.
+ */
+ public float getMeanPauseCount() {
+ return foregroundPlaybackCount == 0 ? 0f : (float) totalPauseCount / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the mean number of times a playback has been paused while rebuffering per foreground
+ * playback, or {@code 0.0} if no playback has been in foreground.
+ */
+ public float getMeanPauseBufferCount() {
+ return foregroundPlaybackCount == 0
+ ? 0f
+ : (float) totalPauseBufferCount / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the mean number of times a seek occurred per foreground playback, or {@code 0.0} if no
+ * playback has been in foreground. This includes seeks happening before playback resumed after
+ * another seek.
+ */
+ public float getMeanSeekCount() {
+ return foregroundPlaybackCount == 0 ? 0f : (float) totalSeekCount / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the mean number of times a rebuffer occurred per foreground playback, or {@code 0.0} if
+ * no playback has been in foreground. This excludes initial joining and buffering after seek.
+ */
+ public float getMeanRebufferCount() {
+ return foregroundPlaybackCount == 0 ? 0f : (float) totalRebufferCount / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the ratio of wait times to the total time spent playing and waiting, or {@code 0.0} if
+ * no time was spend playing or waiting. This is equivalent to {@link #getTotalWaitTimeMs()} /
+ * {@link #getTotalPlayAndWaitTimeMs()} and also to {@link #getJoinTimeRatio()} + {@link
+ * #getRebufferTimeRatio()} + {@link #getSeekTimeRatio()}.
+ */
+ public float getWaitTimeRatio() {
+ long playAndWaitTimeMs = getTotalPlayAndWaitTimeMs();
+ return playAndWaitTimeMs == 0 ? 0f : (float) getTotalWaitTimeMs() / playAndWaitTimeMs;
+ }
+
+ /**
+ * Returns the ratio of foreground join time to the total time spent playing and waiting, or
+ * {@code 0.0} if no time was spend playing or waiting. This is equivalent to {@link
+ * #getTotalJoinTimeMs()} / {@link #getTotalPlayAndWaitTimeMs()}.
+ */
+ public float getJoinTimeRatio() {
+ long playAndWaitTimeMs = getTotalPlayAndWaitTimeMs();
+ return playAndWaitTimeMs == 0 ? 0f : (float) getTotalJoinTimeMs() / playAndWaitTimeMs;
+ }
+
+ /**
+ * Returns the ratio of rebuffer time to the total time spent playing and waiting, or {@code 0.0}
+ * if no time was spend playing or waiting. This is equivalent to {@link
+ * #getTotalRebufferTimeMs()} / {@link #getTotalPlayAndWaitTimeMs()}.
+ */
+ public float getRebufferTimeRatio() {
+ long playAndWaitTimeMs = getTotalPlayAndWaitTimeMs();
+ return playAndWaitTimeMs == 0 ? 0f : (float) getTotalRebufferTimeMs() / playAndWaitTimeMs;
+ }
+
+ /**
+ * Returns the ratio of seek time to the total time spent playing and waiting, or {@code 0.0} if
+ * no time was spend playing or waiting. This is equivalent to {@link #getTotalSeekTimeMs()} /
+ * {@link #getTotalPlayAndWaitTimeMs()}.
+ */
+ public float getSeekTimeRatio() {
+ long playAndWaitTimeMs = getTotalPlayAndWaitTimeMs();
+ return playAndWaitTimeMs == 0 ? 0f : (float) getTotalSeekTimeMs() / playAndWaitTimeMs;
+ }
+
+ /**
+ * Returns the rate of rebuffer events, in rebuffers per play time second, or {@code 0.0} if no
+ * time was spend playing. This is equivalent to 1.0 / {@link #getMeanTimeBetweenRebuffers()}.
+ */
+ public float getRebufferRate() {
+ long playTimeMs = getTotalPlayTimeMs();
+ return playTimeMs == 0 ? 0f : 1000f * totalRebufferCount / playTimeMs;
+ }
+
+ /**
+ * Returns the mean play time between rebuffer events, in seconds. This is equivalent to 1.0 /
+ * {@link #getRebufferRate()}. Note that this may return {@link Float#POSITIVE_INFINITY}.
+ */
+ public float getMeanTimeBetweenRebuffers() {
+ return 1f / getRebufferRate();
+ }
+
+ /**
+ * Returns the mean initial video format height, in pixels, or {@link C#LENGTH_UNSET} if no video
+ * format data is available.
+ */
+ public int getMeanInitialVideoFormatHeight() {
+ return initialVideoFormatHeightCount == 0
+ ? C.LENGTH_UNSET
+ : totalInitialVideoFormatHeight / initialVideoFormatHeightCount;
+ }
+
+ /**
+ * Returns the mean initial video format bitrate, in bits per second, or {@link C#LENGTH_UNSET} if
+ * no video format data is available.
+ */
+ public int getMeanInitialVideoFormatBitrate() {
+ return initialVideoFormatBitrateCount == 0
+ ? C.LENGTH_UNSET
+ : (int) (totalInitialVideoFormatBitrate / initialVideoFormatBitrateCount);
+ }
+
+ /**
+ * Returns the mean initial audio format bitrate, in bits per second, or {@link C#LENGTH_UNSET} if
+ * no audio format data is available.
+ */
+ public int getMeanInitialAudioFormatBitrate() {
+ return initialAudioFormatBitrateCount == 0
+ ? C.LENGTH_UNSET
+ : (int) (totalInitialAudioFormatBitrate / initialAudioFormatBitrateCount);
+ }
+
+ /**
+ * Returns the mean video format height, in pixels, or {@link C#LENGTH_UNSET} if no video format
+ * data is available. This is a weighted average taking the time the format was used for playback
+ * into account.
+ */
+ public int getMeanVideoFormatHeight() {
+ return totalVideoFormatHeightTimeMs == 0
+ ? C.LENGTH_UNSET
+ : (int) (totalVideoFormatHeightTimeProduct / totalVideoFormatHeightTimeMs);
+ }
+
+ /**
+ * Returns the mean video format bitrate, in bits per second, or {@link C#LENGTH_UNSET} if no
+ * video format data is available. This is a weighted average taking the time the format was used
+ * for playback into account.
+ */
+ public int getMeanVideoFormatBitrate() {
+ return totalVideoFormatBitrateTimeMs == 0
+ ? C.LENGTH_UNSET
+ : (int) (totalVideoFormatBitrateTimeProduct / totalVideoFormatBitrateTimeMs);
+ }
+
+ /**
+ * Returns the mean audio format bitrate, in bits per second, or {@link C#LENGTH_UNSET} if no
+ * audio format data is available. This is a weighted average taking the time the format was used
+ * for playback into account.
+ */
+ public int getMeanAudioFormatBitrate() {
+ return totalAudioFormatTimeMs == 0
+ ? C.LENGTH_UNSET
+ : (int) (totalAudioFormatBitrateTimeProduct / totalAudioFormatTimeMs);
+ }
+
+ /**
+ * Returns the mean network bandwidth based on transfer measurements, in bits per second, or
+ * {@link C#LENGTH_UNSET} if no transfer data is available.
+ */
+ public int getMeanBandwidth() {
+ return totalBandwidthTimeMs == 0
+ ? C.LENGTH_UNSET
+ : (int) (totalBandwidthBytes * 8000 / totalBandwidthTimeMs);
+ }
+
+ /**
+ * Returns the mean rate at which video frames are dropped, in dropped frames per play time
+ * second, or {@code 0.0} if no time was spent playing.
+ */
+ public float getDroppedFramesRate() {
+ long playTimeMs = getTotalPlayTimeMs();
+ return playTimeMs == 0 ? 0f : 1000f * totalDroppedFrames / playTimeMs;
+ }
+
+ /**
+ * Returns the mean rate at which audio underruns occurred, in underruns per play time second, or
+ * {@code 0.0} if no time was spent playing.
+ */
+ public float getAudioUnderrunRate() {
+ long playTimeMs = getTotalPlayTimeMs();
+ return playTimeMs == 0 ? 0f : 1000f * totalAudioUnderruns / playTimeMs;
+ }
+
+ /**
+ * Returns the ratio of foreground playbacks which experienced fatal errors, or {@code 0.0} if no
+ * playback has been in foreground.
+ */
+ public float getFatalErrorRatio() {
+ return foregroundPlaybackCount == 0
+ ? 0f
+ : (float) fatalErrorPlaybackCount / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the rate of fatal errors, in errors per play time second, or {@code 0.0} if no time was
+ * spend playing. This is equivalent to 1.0 / {@link #getMeanTimeBetweenFatalErrors()}.
+ */
+ public float getFatalErrorRate() {
+ long playTimeMs = getTotalPlayTimeMs();
+ return playTimeMs == 0 ? 0f : 1000f * fatalErrorCount / playTimeMs;
+ }
+
+ /**
+ * Returns the mean play time between fatal errors, in seconds. This is equivalent to 1.0 / {@link
+ * #getFatalErrorRate()}. Note that this may return {@link Float#POSITIVE_INFINITY}.
+ */
+ public float getMeanTimeBetweenFatalErrors() {
+ return 1f / getFatalErrorRate();
+ }
+
+ /**
+ * Returns the mean number of non-fatal errors per foreground playback, or {@code 0.0} if no
+ * playback has been in foreground.
+ */
+ public float getMeanNonFatalErrorCount() {
+ return foregroundPlaybackCount == 0 ? 0f : (float) nonFatalErrorCount / foregroundPlaybackCount;
+ }
+
+ /**
+ * Returns the rate of non-fatal errors, in errors per play time second, or {@code 0.0} if no time
+ * was spend playing. This is equivalent to 1.0 / {@link #getMeanTimeBetweenNonFatalErrors()}.
+ */
+ public float getNonFatalErrorRate() {
+ long playTimeMs = getTotalPlayTimeMs();
+ return playTimeMs == 0 ? 0f : 1000f * nonFatalErrorCount / playTimeMs;
+ }
+
+ /**
+ * Returns the mean play time between non-fatal errors, in seconds. This is equivalent to 1.0 /
+ * {@link #getNonFatalErrorRate()}. Note that this may return {@link Float#POSITIVE_INFINITY}.
+ */
+ public float getMeanTimeBetweenNonFatalErrors() {
+ return 1f / getNonFatalErrorRate();
+ }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
new file mode 100644
index 0000000000..6444b4747f
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
@@ -0,0 +1,1005 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.analytics;
+
+import android.os.SystemClock;
+import androidx.annotation.Nullable;
+import android.util.Pair;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.Timeline.Period;
+import com.google.android.exoplayer2.analytics.PlaybackStats.PlaybackState;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.source.MediaSourceEventListener.LoadEventInfo;
+import com.google.android.exoplayer2.source.MediaSourceEventListener.MediaLoadData;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.Util;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
+
+/**
+ * {@link AnalyticsListener} to gather {@link PlaybackStats} from the player.
+ *
+ * For accurate measurements, the listener should be added to the player before loading media,
+ * i.e., {@link Player#getPlaybackState()} should be {@link Player#STATE_IDLE}.
+ *
+ *
Playback stats are gathered separately for all playback session, i.e. each window in the
+ * {@link Timeline} and each single ad.
+ */
+public final class PlaybackStatsListener
+ implements AnalyticsListener, PlaybackSessionManager.Listener {
+
+ /** A listener for {@link PlaybackStats} updates. */
+ public interface Callback {
+
+ /**
+ * Called when a playback session ends and its {@link PlaybackStats} are ready.
+ *
+ * @param eventTime The {@link EventTime} at which the playback session started. Can be used to
+ * identify the playback session.
+ * @param playbackStats The {@link PlaybackStats} for the ended playback session.
+ */
+ void onPlaybackStatsReady(EventTime eventTime, PlaybackStats playbackStats);
+ }
+
+ private final PlaybackSessionManager sessionManager;
+ private final Map playbackStatsTrackers;
+ private final Map sessionStartEventTimes;
+ @Nullable private final Callback callback;
+ private final boolean keepHistory;
+ private final Period period;
+
+ private PlaybackStats finishedPlaybackStats;
+ @Nullable private String activeContentPlayback;
+ @Nullable private String activeAdPlayback;
+ private boolean playWhenReady;
+ @Player.State private int playbackState;
+ private float playbackSpeed;
+
+ /**
+ * Creates listener for playback stats.
+ *
+ * @param keepHistory Whether the reported {@link PlaybackStats} should keep the full history of
+ * events.
+ * @param callback An optional callback for finished {@link PlaybackStats}.
+ */
+ public PlaybackStatsListener(boolean keepHistory, @Nullable Callback callback) {
+ this.callback = callback;
+ this.keepHistory = keepHistory;
+ sessionManager = new DefaultPlaybackSessionManager();
+ playbackStatsTrackers = new HashMap<>();
+ sessionStartEventTimes = new HashMap<>();
+ finishedPlaybackStats = PlaybackStats.EMPTY;
+ playWhenReady = false;
+ playbackState = Player.STATE_IDLE;
+ playbackSpeed = 1f;
+ period = new Period();
+ sessionManager.setListener(this);
+ }
+
+ /**
+ * Returns the combined {@link PlaybackStats} for all playback sessions this listener was and is
+ * listening to.
+ *
+ * Note that these {@link PlaybackStats} will not contain the full history of events.
+ *
+ * @return The combined {@link PlaybackStats} for all playback sessions.
+ */
+ public PlaybackStats getCombinedPlaybackStats() {
+ PlaybackStats[] allPendingPlaybackStats = new PlaybackStats[playbackStatsTrackers.size() + 1];
+ allPendingPlaybackStats[0] = finishedPlaybackStats;
+ int index = 1;
+ for (PlaybackStatsTracker tracker : playbackStatsTrackers.values()) {
+ allPendingPlaybackStats[index++] = tracker.build(/* isFinal= */ false);
+ }
+ return PlaybackStats.merge(allPendingPlaybackStats);
+ }
+
+ /**
+ * Returns the {@link PlaybackStats} for the currently playback session, or null if no session is
+ * active.
+ *
+ * @return {@link PlaybackStats} for the current playback session.
+ */
+ @Nullable
+ public PlaybackStats getPlaybackStats() {
+ PlaybackStatsTracker activeStatsTracker =
+ activeAdPlayback != null
+ ? playbackStatsTrackers.get(activeAdPlayback)
+ : activeContentPlayback != null
+ ? playbackStatsTrackers.get(activeContentPlayback)
+ : null;
+ return activeStatsTracker == null ? null : activeStatsTracker.build(/* isFinal= */ false);
+ }
+
+ /**
+ * Finishes all pending playback sessions. Should be called when the listener is removed from the
+ * player or when the player is released.
+ */
+ public void finishAllSessions() {
+ // TODO: Add AnalyticsListener.onAttachedToPlayer and onDetachedFromPlayer to auto-release with
+ // an actual EventTime. Should also simplify other cases where the listener needs to be released
+ // separately from the player.
+ HashMap trackerCopy = new HashMap<>(playbackStatsTrackers);
+ EventTime dummyEventTime =
+ new EventTime(
+ SystemClock.elapsedRealtime(),
+ Timeline.EMPTY,
+ /* windowIndex= */ 0,
+ /* mediaPeriodId= */ null,
+ /* eventPlaybackPositionMs= */ 0,
+ /* currentPlaybackPositionMs= */ 0,
+ /* totalBufferedDurationMs= */ 0);
+ for (String session : trackerCopy.keySet()) {
+ onSessionFinished(dummyEventTime, session, /* automaticTransition= */ false);
+ }
+ }
+
+ // PlaybackSessionManager.Listener implementation.
+
+ @Override
+ public void onSessionCreated(EventTime eventTime, String session) {
+ PlaybackStatsTracker tracker = new PlaybackStatsTracker(keepHistory, eventTime);
+ tracker.onPlayerStateChanged(
+ eventTime, playWhenReady, playbackState, /* belongsToPlayback= */ true);
+ tracker.onPlaybackSpeedChanged(eventTime, playbackSpeed);
+ playbackStatsTrackers.put(session, tracker);
+ sessionStartEventTimes.put(session, eventTime);
+ }
+
+ @Override
+ public void onSessionActive(EventTime eventTime, String session) {
+ Assertions.checkNotNull(playbackStatsTrackers.get(session)).onForeground(eventTime);
+ if (eventTime.mediaPeriodId != null && eventTime.mediaPeriodId.isAd()) {
+ activeAdPlayback = session;
+ } else {
+ activeContentPlayback = session;
+ }
+ }
+
+ @Override
+ public void onAdPlaybackStarted(EventTime eventTime, String contentSession, String adSession) {
+ Assertions.checkState(Assertions.checkNotNull(eventTime.mediaPeriodId).isAd());
+ long contentPositionUs =
+ eventTime
+ .timeline
+ .getPeriodByUid(eventTime.mediaPeriodId.periodUid, period)
+ .getAdGroupTimeUs(eventTime.mediaPeriodId.adGroupIndex);
+ EventTime contentEventTime =
+ new EventTime(
+ eventTime.realtimeMs,
+ eventTime.timeline,
+ eventTime.windowIndex,
+ new MediaPeriodId(
+ eventTime.mediaPeriodId.periodUid,
+ eventTime.mediaPeriodId.windowSequenceNumber,
+ eventTime.mediaPeriodId.adGroupIndex),
+ /* eventPlaybackPositionMs= */ C.usToMs(contentPositionUs),
+ eventTime.currentPlaybackPositionMs,
+ eventTime.totalBufferedDurationMs);
+ Assertions.checkNotNull(playbackStatsTrackers.get(contentSession))
+ .onSuspended(contentEventTime, /* belongsToPlayback= */ true);
+ }
+
+ @Override
+ public void onSessionFinished(EventTime eventTime, String session, boolean automaticTransition) {
+ if (session.equals(activeAdPlayback)) {
+ activeAdPlayback = null;
+ } else if (session.equals(activeContentPlayback)) {
+ activeContentPlayback = null;
+ }
+ PlaybackStatsTracker tracker = Assertions.checkNotNull(playbackStatsTrackers.remove(session));
+ EventTime startEventTime = Assertions.checkNotNull(sessionStartEventTimes.remove(session));
+ if (automaticTransition) {
+ // Simulate ENDED state to record natural ending of playback.
+ tracker.onPlayerStateChanged(
+ eventTime, /* playWhenReady= */ true, Player.STATE_ENDED, /* belongsToPlayback= */ false);
+ }
+ tracker.onSuspended(eventTime, /* belongsToPlayback= */ false);
+ PlaybackStats playbackStats = tracker.build(/* isFinal= */ true);
+ finishedPlaybackStats = PlaybackStats.merge(finishedPlaybackStats, playbackStats);
+ if (callback != null) {
+ callback.onPlaybackStatsReady(startEventTime, playbackStats);
+ }
+ }
+
+ // AnalyticsListener implementation.
+
+ @Override
+ public void onPlayerStateChanged(
+ EventTime eventTime, boolean playWhenReady, @Player.State int playbackState) {
+ this.playWhenReady = playWhenReady;
+ this.playbackState = playbackState;
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ boolean belongsToPlayback = sessionManager.belongsToSession(eventTime, session);
+ playbackStatsTrackers
+ .get(session)
+ .onPlayerStateChanged(eventTime, playWhenReady, playbackState, belongsToPlayback);
+ }
+ }
+
+ @Override
+ public void onTimelineChanged(EventTime eventTime, int reason) {
+ sessionManager.handleTimelineUpdate(eventTime);
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onPositionDiscontinuity(eventTime);
+ }
+ }
+ }
+
+ @Override
+ public void onPositionDiscontinuity(EventTime eventTime, int reason) {
+ sessionManager.handlePositionDiscontinuity(eventTime, reason);
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onPositionDiscontinuity(eventTime);
+ }
+ }
+ }
+
+ @Override
+ public void onSeekStarted(EventTime eventTime) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onSeekStarted(eventTime);
+ }
+ }
+ }
+
+ @Override
+ public void onSeekProcessed(EventTime eventTime) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onSeekProcessed(eventTime);
+ }
+ }
+ }
+
+ @Override
+ public void onPlayerError(EventTime eventTime, ExoPlaybackException error) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onFatalError(eventTime, error);
+ }
+ }
+ }
+
+ @Override
+ public void onPlaybackParametersChanged(
+ EventTime eventTime, PlaybackParameters playbackParameters) {
+ playbackSpeed = playbackParameters.speed;
+ sessionManager.updateSessions(eventTime);
+ for (PlaybackStatsTracker tracker : playbackStatsTrackers.values()) {
+ tracker.onPlaybackSpeedChanged(eventTime, playbackSpeed);
+ }
+ }
+
+ @Override
+ public void onTracksChanged(
+ EventTime eventTime, TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onTracksChanged(eventTime, trackSelections);
+ }
+ }
+ }
+
+ @Override
+ public void onLoadStarted(
+ EventTime eventTime, LoadEventInfo loadEventInfo, MediaLoadData mediaLoadData) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onLoadStarted(eventTime);
+ }
+ }
+ }
+
+ @Override
+ public void onDownstreamFormatChanged(EventTime eventTime, MediaLoadData mediaLoadData) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onDownstreamFormatChanged(eventTime, mediaLoadData);
+ }
+ }
+ }
+
+ @Override
+ public void onVideoSizeChanged(
+ EventTime eventTime,
+ int width,
+ int height,
+ int unappliedRotationDegrees,
+ float pixelWidthHeightRatio) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onVideoSizeChanged(eventTime, width, height);
+ }
+ }
+ }
+
+ @Override
+ public void onBandwidthEstimate(
+ EventTime eventTime, int totalLoadTimeMs, long totalBytesLoaded, long bitrateEstimate) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onBandwidthData(totalLoadTimeMs, totalBytesLoaded);
+ }
+ }
+ }
+
+ @Override
+ public void onAudioUnderrun(
+ EventTime eventTime, int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onAudioUnderrun();
+ }
+ }
+ }
+
+ @Override
+ public void onDroppedVideoFrames(EventTime eventTime, int droppedFrames, long elapsedMs) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onDroppedVideoFrames(droppedFrames);
+ }
+ }
+ }
+
+ @Override
+ public void onLoadError(
+ EventTime eventTime,
+ LoadEventInfo loadEventInfo,
+ MediaLoadData mediaLoadData,
+ IOException error,
+ boolean wasCanceled) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onNonFatalError(eventTime, error);
+ }
+ }
+ }
+
+ @Override
+ public void onDrmSessionManagerError(EventTime eventTime, Exception error) {
+ sessionManager.updateSessions(eventTime);
+ for (String session : playbackStatsTrackers.keySet()) {
+ if (sessionManager.belongsToSession(eventTime, session)) {
+ playbackStatsTrackers.get(session).onNonFatalError(eventTime, error);
+ }
+ }
+ }
+
+ /** Tracker for playback stats of a single playback. */
+ private static final class PlaybackStatsTracker {
+
+ // Final stats.
+ private final boolean keepHistory;
+ private final long[] playbackStateDurationsMs;
+ private final List> playbackStateHistory;
+ private final List mediaTimeHistory;
+ private final List> videoFormatHistory;
+ private final List> audioFormatHistory;
+ private final List> fatalErrorHistory;
+ private final List> nonFatalErrorHistory;
+ private final boolean isAd;
+
+ private long firstReportedTimeMs;
+ private boolean hasBeenReady;
+ private boolean hasEnded;
+ private boolean isJoinTimeInvalid;
+ private int pauseCount;
+ private int pauseBufferCount;
+ private int seekCount;
+ private int rebufferCount;
+ private long maxRebufferTimeMs;
+ private int initialVideoFormatHeight;
+ private long initialVideoFormatBitrate;
+ private long initialAudioFormatBitrate;
+ private long videoFormatHeightTimeMs;
+ private long videoFormatHeightTimeProduct;
+ private long videoFormatBitrateTimeMs;
+ private long videoFormatBitrateTimeProduct;
+ private long audioFormatTimeMs;
+ private long audioFormatBitrateTimeProduct;
+ private long bandwidthTimeMs;
+ private long bandwidthBytes;
+ private long droppedFrames;
+ private long audioUnderruns;
+ private int fatalErrorCount;
+ private int nonFatalErrorCount;
+
+ // Current player state tracking.
+ private @PlaybackState int currentPlaybackState;
+ private long currentPlaybackStateStartTimeMs;
+ private boolean isSeeking;
+ private boolean isForeground;
+ private boolean isSuspended;
+ private boolean playWhenReady;
+ @Player.State private int playerPlaybackState;
+ private boolean hasFatalError;
+ private boolean startedLoading;
+ private long lastRebufferStartTimeMs;
+ @Nullable private Format currentVideoFormat;
+ @Nullable private Format currentAudioFormat;
+ private long lastVideoFormatStartTimeMs;
+ private long lastAudioFormatStartTimeMs;
+ private float currentPlaybackSpeed;
+
+ /**
+ * Creates a tracker for playback stats.
+ *
+ * @param keepHistory Whether to keep a full history of events.
+ * @param startTime The {@link EventTime} at which the playback stats start.
+ */
+ public PlaybackStatsTracker(boolean keepHistory, EventTime startTime) {
+ this.keepHistory = keepHistory;
+ playbackStateDurationsMs = new long[PlaybackStats.PLAYBACK_STATE_COUNT];
+ playbackStateHistory = keepHistory ? new ArrayList<>() : Collections.emptyList();
+ mediaTimeHistory = keepHistory ? new ArrayList<>() : Collections.emptyList();
+ videoFormatHistory = keepHistory ? new ArrayList<>() : Collections.emptyList();
+ audioFormatHistory = keepHistory ? new ArrayList<>() : Collections.emptyList();
+ fatalErrorHistory = keepHistory ? new ArrayList<>() : Collections.emptyList();
+ nonFatalErrorHistory = keepHistory ? new ArrayList<>() : Collections.emptyList();
+ currentPlaybackState = PlaybackStats.PLAYBACK_STATE_NOT_STARTED;
+ currentPlaybackStateStartTimeMs = startTime.realtimeMs;
+ playerPlaybackState = Player.STATE_IDLE;
+ firstReportedTimeMs = C.TIME_UNSET;
+ maxRebufferTimeMs = C.TIME_UNSET;
+ isAd = startTime.mediaPeriodId != null && startTime.mediaPeriodId.isAd();
+ initialAudioFormatBitrate = C.LENGTH_UNSET;
+ initialVideoFormatBitrate = C.LENGTH_UNSET;
+ initialVideoFormatHeight = C.LENGTH_UNSET;
+ currentPlaybackSpeed = 1f;
+ }
+
+ /**
+ * Notifies the tracker of a player state change event, including all player state changes while
+ * the playback is not in the foreground.
+ *
+ * @param eventTime The {@link EventTime}.
+ * @param playWhenReady Whether the playback will proceed when ready.
+ * @param playbackState The current {@link Player.State}.
+ * @param belongsToPlayback Whether the {@code eventTime} belongs to the current playback.
+ */
+ public void onPlayerStateChanged(
+ EventTime eventTime,
+ boolean playWhenReady,
+ @Player.State int playbackState,
+ boolean belongsToPlayback) {
+ this.playWhenReady = playWhenReady;
+ playerPlaybackState = playbackState;
+ if (playbackState != Player.STATE_IDLE) {
+ hasFatalError = false;
+ }
+ if (playbackState == Player.STATE_IDLE || playbackState == Player.STATE_ENDED) {
+ isSuspended = false;
+ }
+ maybeUpdatePlaybackState(eventTime, belongsToPlayback);
+ }
+
+ /**
+ * Notifies the tracker of a position discontinuity or timeline update for the current playback.
+ *
+ * @param eventTime The {@link EventTime}.
+ */
+ public void onPositionDiscontinuity(EventTime eventTime) {
+ isSuspended = false;
+ maybeUpdatePlaybackState(eventTime, /* belongsToPlayback= */ true);
+ }
+
+ /**
+ * Notifies the tracker of the start of a seek in the current playback.
+ *
+ * @param eventTime The {@link EventTime}.
+ */
+ public void onSeekStarted(EventTime eventTime) {
+ isSeeking = true;
+ maybeUpdatePlaybackState(eventTime, /* belongsToPlayback= */ true);
+ }
+
+ /**
+ * Notifies the tracker of a seek has been processed in the current playback.
+ *
+ * @param eventTime The {@link EventTime}.
+ */
+ public void onSeekProcessed(EventTime eventTime) {
+ isSeeking = false;
+ maybeUpdatePlaybackState(eventTime, /* belongsToPlayback= */ true);
+ }
+
+ /**
+ * Notifies the tracker of fatal player error in the current playback.
+ *
+ * @param eventTime The {@link EventTime}.
+ */
+ public void onFatalError(EventTime eventTime, Exception error) {
+ fatalErrorCount++;
+ if (keepHistory) {
+ fatalErrorHistory.add(Pair.create(eventTime, error));
+ }
+ hasFatalError = true;
+ isSuspended = false;
+ isSeeking = false;
+ maybeUpdatePlaybackState(eventTime, /* belongsToPlayback= */ true);
+ }
+
+ /**
+ * Notifies the tracker that a load for the current playback has started.
+ *
+ * @param eventTime The {@link EventTime}.
+ */
+ public void onLoadStarted(EventTime eventTime) {
+ startedLoading = true;
+ maybeUpdatePlaybackState(eventTime, /* belongsToPlayback= */ true);
+ }
+
+ /**
+ * Notifies the tracker that the current playback became the active foreground playback.
+ *
+ * @param eventTime The {@link EventTime}.
+ */
+ public void onForeground(EventTime eventTime) {
+ isForeground = true;
+ maybeUpdatePlaybackState(eventTime, /* belongsToPlayback= */ true);
+ }
+
+ /**
+ * Notifies the tracker that the current playback has been suspended, e.g. for ad playback or
+ * permanently.
+ *
+ * @param eventTime The {@link EventTime}.
+ * @param belongsToPlayback Whether the {@code eventTime} belongs to the current playback.
+ */
+ public void onSuspended(EventTime eventTime, boolean belongsToPlayback) {
+ isSuspended = true;
+ isSeeking = false;
+ maybeUpdatePlaybackState(eventTime, belongsToPlayback);
+ }
+
+ /**
+ * Notifies the tracker that the track selection for the current playback changed.
+ *
+ * @param eventTime The {@link EventTime}.
+ * @param trackSelections The new {@link TrackSelectionArray}.
+ */
+ public void onTracksChanged(EventTime eventTime, TrackSelectionArray trackSelections) {
+ boolean videoEnabled = false;
+ boolean audioEnabled = false;
+ for (TrackSelection trackSelection : trackSelections.getAll()) {
+ if (trackSelection != null && trackSelection.length() > 0) {
+ int trackType = MimeTypes.getTrackType(trackSelection.getFormat(0).sampleMimeType);
+ if (trackType == C.TRACK_TYPE_VIDEO) {
+ videoEnabled = true;
+ } else if (trackType == C.TRACK_TYPE_AUDIO) {
+ audioEnabled = true;
+ }
+ }
+ }
+ if (!videoEnabled) {
+ maybeUpdateVideoFormat(eventTime, /* newFormat= */ null);
+ }
+ if (!audioEnabled) {
+ maybeUpdateAudioFormat(eventTime, /* newFormat= */ null);
+ }
+ }
+
+ /**
+ * Notifies the tracker that a format being read by the renderers for the current playback
+ * changed.
+ *
+ * @param eventTime The {@link EventTime}.
+ * @param mediaLoadData The {@link MediaLoadData} describing the format change.
+ */
+ public void onDownstreamFormatChanged(EventTime eventTime, MediaLoadData mediaLoadData) {
+ if (mediaLoadData.trackType == C.TRACK_TYPE_VIDEO
+ || mediaLoadData.trackType == C.TRACK_TYPE_DEFAULT) {
+ maybeUpdateVideoFormat(eventTime, mediaLoadData.trackFormat);
+ } else if (mediaLoadData.trackType == C.TRACK_TYPE_AUDIO) {
+ maybeUpdateAudioFormat(eventTime, mediaLoadData.trackFormat);
+ }
+ }
+
+ /**
+ * Notifies the tracker that the video size for the current playback changed.
+ *
+ * @param eventTime The {@link EventTime}.
+ * @param width The video width in pixels.
+ * @param height The video height in pixels.
+ */
+ public void onVideoSizeChanged(EventTime eventTime, int width, int height) {
+ if (currentVideoFormat != null && currentVideoFormat.height == Format.NO_VALUE) {
+ Format formatWithHeight = currentVideoFormat.copyWithVideoSize(width, height);
+ maybeUpdateVideoFormat(eventTime, formatWithHeight);
+ }
+ }
+
+ /**
+ * Notifies the tracker of a playback speed change, including all playback speed changes while
+ * the playback is not in the foreground.
+ *
+ * @param eventTime The {@link EventTime}.
+ * @param playbackSpeed The new playback speed.
+ */
+ public void onPlaybackSpeedChanged(EventTime eventTime, float playbackSpeed) {
+ maybeUpdateMediaTimeHistory(eventTime.realtimeMs, eventTime.eventPlaybackPositionMs);
+ maybeRecordVideoFormatTime(eventTime.realtimeMs);
+ maybeRecordAudioFormatTime(eventTime.realtimeMs);
+ currentPlaybackSpeed = playbackSpeed;
+ }
+
+ /** Notifies the builder of an audio underrun for the current playback. */
+ public void onAudioUnderrun() {
+ audioUnderruns++;
+ }
+
+ /**
+ * Notifies the tracker of dropped video frames for the current playback.
+ *
+ * @param droppedFrames The number of dropped video frames.
+ */
+ public void onDroppedVideoFrames(int droppedFrames) {
+ this.droppedFrames += droppedFrames;
+ }
+
+ /**
+ * Notifies the tracker of bandwidth measurement data for the current playback.
+ *
+ * @param timeMs The time for which bandwidth measurement data is available, in milliseconds.
+ * @param bytes The bytes transferred during {@code timeMs}.
+ */
+ public void onBandwidthData(long timeMs, long bytes) {
+ bandwidthTimeMs += timeMs;
+ bandwidthBytes += bytes;
+ }
+
+ /**
+ * Notifies the tracker of a non-fatal error in the current playback.
+ *
+ * @param eventTime The {@link EventTime}.
+ * @param error The error.
+ */
+ public void onNonFatalError(EventTime eventTime, Exception error) {
+ nonFatalErrorCount++;
+ if (keepHistory) {
+ nonFatalErrorHistory.add(Pair.create(eventTime, error));
+ }
+ }
+
+ /**
+ * Builds the playback stats.
+ *
+ * @param isFinal Whether this is the final build and no further events are expected.
+ */
+ public PlaybackStats build(boolean isFinal) {
+ long[] playbackStateDurationsMs = this.playbackStateDurationsMs;
+ List mediaTimeHistory = this.mediaTimeHistory;
+ if (!isFinal) {
+ long buildTimeMs = SystemClock.elapsedRealtime();
+ playbackStateDurationsMs =
+ Arrays.copyOf(this.playbackStateDurationsMs, PlaybackStats.PLAYBACK_STATE_COUNT);
+ long lastStateDurationMs = Math.max(0, buildTimeMs - currentPlaybackStateStartTimeMs);
+ playbackStateDurationsMs[currentPlaybackState] += lastStateDurationMs;
+ maybeUpdateMaxRebufferTimeMs(buildTimeMs);
+ maybeRecordVideoFormatTime(buildTimeMs);
+ maybeRecordAudioFormatTime(buildTimeMs);
+ mediaTimeHistory = new ArrayList<>(this.mediaTimeHistory);
+ if (keepHistory && currentPlaybackState == PlaybackStats.PLAYBACK_STATE_PLAYING) {
+ mediaTimeHistory.add(guessMediaTimeBasedOnElapsedRealtime(buildTimeMs));
+ }
+ }
+ boolean isJoinTimeInvalid = this.isJoinTimeInvalid || !hasBeenReady;
+ long validJoinTimeMs =
+ isJoinTimeInvalid
+ ? C.TIME_UNSET
+ : playbackStateDurationsMs[PlaybackStats.PLAYBACK_STATE_JOINING_FOREGROUND];
+ boolean hasBackgroundJoin =
+ playbackStateDurationsMs[PlaybackStats.PLAYBACK_STATE_JOINING_BACKGROUND] > 0;
+ List> videoHistory =
+ isFinal ? videoFormatHistory : new ArrayList<>(videoFormatHistory);
+ List> audioHistory =
+ isFinal ? audioFormatHistory : new ArrayList<>(audioFormatHistory);
+ return new PlaybackStats(
+ /* playbackCount= */ 1,
+ playbackStateDurationsMs,
+ isFinal ? playbackStateHistory : new ArrayList<>(playbackStateHistory),
+ mediaTimeHistory,
+ firstReportedTimeMs,
+ /* foregroundPlaybackCount= */ isForeground ? 1 : 0,
+ /* abandonedBeforeReadyCount= */ hasBeenReady ? 0 : 1,
+ /* endedCount= */ hasEnded ? 1 : 0,
+ /* backgroundJoiningCount= */ hasBackgroundJoin ? 1 : 0,
+ validJoinTimeMs,
+ /* validJoinTimeCount= */ isJoinTimeInvalid ? 0 : 1,
+ pauseCount,
+ pauseBufferCount,
+ seekCount,
+ rebufferCount,
+ maxRebufferTimeMs,
+ /* adPlaybackCount= */ isAd ? 1 : 0,
+ videoHistory,
+ audioHistory,
+ videoFormatHeightTimeMs,
+ videoFormatHeightTimeProduct,
+ videoFormatBitrateTimeMs,
+ videoFormatBitrateTimeProduct,
+ audioFormatTimeMs,
+ audioFormatBitrateTimeProduct,
+ /* initialVideoFormatHeightCount= */ initialVideoFormatHeight == C.LENGTH_UNSET ? 0 : 1,
+ /* initialVideoFormatBitrateCount= */ initialVideoFormatBitrate == C.LENGTH_UNSET ? 0 : 1,
+ initialVideoFormatHeight,
+ initialVideoFormatBitrate,
+ /* initialAudioFormatBitrateCount= */ initialAudioFormatBitrate == C.LENGTH_UNSET ? 0 : 1,
+ initialAudioFormatBitrate,
+ bandwidthTimeMs,
+ bandwidthBytes,
+ droppedFrames,
+ audioUnderruns,
+ /* fatalErrorPlaybackCount= */ fatalErrorCount > 0 ? 1 : 0,
+ fatalErrorCount,
+ nonFatalErrorCount,
+ fatalErrorHistory,
+ nonFatalErrorHistory);
+ }
+
+ private void maybeUpdatePlaybackState(EventTime eventTime, boolean belongsToPlayback) {
+ @PlaybackState int newPlaybackState = resolveNewPlaybackState();
+ if (newPlaybackState == currentPlaybackState) {
+ return;
+ }
+ Assertions.checkArgument(eventTime.realtimeMs >= currentPlaybackStateStartTimeMs);
+
+ long stateDurationMs = eventTime.realtimeMs - currentPlaybackStateStartTimeMs;
+ playbackStateDurationsMs[currentPlaybackState] += stateDurationMs;
+ if (firstReportedTimeMs == C.TIME_UNSET) {
+ firstReportedTimeMs = eventTime.realtimeMs;
+ }
+ isJoinTimeInvalid |= isInvalidJoinTransition(currentPlaybackState, newPlaybackState);
+ hasBeenReady |= isReadyState(newPlaybackState);
+ hasEnded |= newPlaybackState == PlaybackStats.PLAYBACK_STATE_ENDED;
+ if (!isPausedState(currentPlaybackState) && isPausedState(newPlaybackState)) {
+ pauseCount++;
+ }
+ if (newPlaybackState == PlaybackStats.PLAYBACK_STATE_SEEKING) {
+ seekCount++;
+ }
+ if (!isRebufferingState(currentPlaybackState) && isRebufferingState(newPlaybackState)) {
+ rebufferCount++;
+ lastRebufferStartTimeMs = eventTime.realtimeMs;
+ }
+ if (newPlaybackState == PlaybackStats.PLAYBACK_STATE_PAUSED_BUFFERING
+ && currentPlaybackState == PlaybackStats.PLAYBACK_STATE_BUFFERING) {
+ pauseBufferCount++;
+ }
+
+ maybeUpdateMediaTimeHistory(
+ eventTime.realtimeMs,
+ /* mediaTimeMs= */ belongsToPlayback ? eventTime.eventPlaybackPositionMs : C.TIME_UNSET);
+ maybeUpdateMaxRebufferTimeMs(eventTime.realtimeMs);
+ maybeRecordVideoFormatTime(eventTime.realtimeMs);
+ maybeRecordAudioFormatTime(eventTime.realtimeMs);
+
+ currentPlaybackState = newPlaybackState;
+ currentPlaybackStateStartTimeMs = eventTime.realtimeMs;
+ if (keepHistory) {
+ playbackStateHistory.add(Pair.create(eventTime, currentPlaybackState));
+ }
+ }
+
+ private @PlaybackState int resolveNewPlaybackState() {
+ if (isSuspended) {
+ // Keep VIDEO_STATE_ENDED if playback naturally ended (or progressed to next item).
+ return currentPlaybackState == PlaybackStats.PLAYBACK_STATE_ENDED
+ ? PlaybackStats.PLAYBACK_STATE_ENDED
+ : PlaybackStats.PLAYBACK_STATE_SUSPENDED;
+ } else if (isSeeking) {
+ // Seeking takes precedence over errors such that we report a seek while in error state.
+ return PlaybackStats.PLAYBACK_STATE_SEEKING;
+ } else if (hasFatalError) {
+ return PlaybackStats.PLAYBACK_STATE_FAILED;
+ } else if (!isForeground) {
+ // Before the playback becomes foreground, only report background joining and not started.
+ return startedLoading
+ ? PlaybackStats.PLAYBACK_STATE_JOINING_BACKGROUND
+ : PlaybackStats.PLAYBACK_STATE_NOT_STARTED;
+ } else if (playerPlaybackState == Player.STATE_ENDED) {
+ return PlaybackStats.PLAYBACK_STATE_ENDED;
+ } else if (playerPlaybackState == Player.STATE_BUFFERING) {
+ if (currentPlaybackState == PlaybackStats.PLAYBACK_STATE_NOT_STARTED
+ || currentPlaybackState == PlaybackStats.PLAYBACK_STATE_JOINING_BACKGROUND
+ || currentPlaybackState == PlaybackStats.PLAYBACK_STATE_JOINING_FOREGROUND
+ || currentPlaybackState == PlaybackStats.PLAYBACK_STATE_SUSPENDED) {
+ return PlaybackStats.PLAYBACK_STATE_JOINING_FOREGROUND;
+ }
+ if (currentPlaybackState == PlaybackStats.PLAYBACK_STATE_SEEKING
+ || currentPlaybackState == PlaybackStats.PLAYBACK_STATE_SEEK_BUFFERING) {
+ return PlaybackStats.PLAYBACK_STATE_SEEK_BUFFERING;
+ }
+ return playWhenReady
+ ? PlaybackStats.PLAYBACK_STATE_BUFFERING
+ : PlaybackStats.PLAYBACK_STATE_PAUSED_BUFFERING;
+ } else if (playerPlaybackState == Player.STATE_READY) {
+ return playWhenReady
+ ? PlaybackStats.PLAYBACK_STATE_PLAYING
+ : PlaybackStats.PLAYBACK_STATE_PAUSED;
+ } else if (playerPlaybackState == Player.STATE_IDLE
+ && currentPlaybackState != PlaybackStats.PLAYBACK_STATE_NOT_STARTED) {
+ // This case only applies for calls to player.stop(). All other IDLE cases are handled by
+ // !isForeground, hasFatalError or isSuspended. NOT_STARTED is deliberately ignored.
+ return PlaybackStats.PLAYBACK_STATE_STOPPED;
+ }
+ return currentPlaybackState;
+ }
+
+ private void maybeUpdateMaxRebufferTimeMs(long nowMs) {
+ if (isRebufferingState(currentPlaybackState)) {
+ long rebufferDurationMs = nowMs - lastRebufferStartTimeMs;
+ if (maxRebufferTimeMs == C.TIME_UNSET || rebufferDurationMs > maxRebufferTimeMs) {
+ maxRebufferTimeMs = rebufferDurationMs;
+ }
+ }
+ }
+
+ private void maybeUpdateMediaTimeHistory(long realtimeMs, long mediaTimeMs) {
+ if (currentPlaybackState != PlaybackStats.PLAYBACK_STATE_PLAYING) {
+ if (mediaTimeMs == C.TIME_UNSET) {
+ return;
+ }
+ if (!mediaTimeHistory.isEmpty()) {
+ long previousMediaTimeMs = mediaTimeHistory.get(mediaTimeHistory.size() - 1)[1];
+ if (previousMediaTimeMs != mediaTimeMs) {
+ mediaTimeHistory.add(new long[] {realtimeMs, previousMediaTimeMs});
+ }
+ }
+ }
+ mediaTimeHistory.add(
+ mediaTimeMs == C.TIME_UNSET
+ ? guessMediaTimeBasedOnElapsedRealtime(realtimeMs)
+ : new long[] {realtimeMs, mediaTimeMs});
+ }
+
+ private long[] guessMediaTimeBasedOnElapsedRealtime(long realtimeMs) {
+ long[] previousKnownMediaTimeHistory = mediaTimeHistory.get(mediaTimeHistory.size() - 1);
+ long previousRealtimeMs = previousKnownMediaTimeHistory[0];
+ long previousMediaTimeMs = previousKnownMediaTimeHistory[1];
+ long elapsedMediaTimeEstimateMs =
+ (long) ((realtimeMs - previousRealtimeMs) * currentPlaybackSpeed);
+ long mediaTimeEstimateMs = previousMediaTimeMs + elapsedMediaTimeEstimateMs;
+ return new long[] {realtimeMs, mediaTimeEstimateMs};
+ }
+
+ private void maybeUpdateVideoFormat(EventTime eventTime, @Nullable Format newFormat) {
+ if (Util.areEqual(currentVideoFormat, newFormat)) {
+ return;
+ }
+ maybeRecordVideoFormatTime(eventTime.realtimeMs);
+ if (newFormat != null) {
+ if (initialVideoFormatHeight == C.LENGTH_UNSET && newFormat.height != Format.NO_VALUE) {
+ initialVideoFormatHeight = newFormat.height;
+ }
+ if (initialVideoFormatBitrate == C.LENGTH_UNSET && newFormat.bitrate != Format.NO_VALUE) {
+ initialVideoFormatBitrate = newFormat.bitrate;
+ }
+ }
+ currentVideoFormat = newFormat;
+ if (keepHistory) {
+ videoFormatHistory.add(Pair.create(eventTime, currentVideoFormat));
+ }
+ }
+
+ private void maybeUpdateAudioFormat(EventTime eventTime, @Nullable Format newFormat) {
+ if (Util.areEqual(currentAudioFormat, newFormat)) {
+ return;
+ }
+ maybeRecordAudioFormatTime(eventTime.realtimeMs);
+ if (newFormat != null
+ && initialAudioFormatBitrate == C.LENGTH_UNSET
+ && newFormat.bitrate != Format.NO_VALUE) {
+ initialAudioFormatBitrate = newFormat.bitrate;
+ }
+ currentAudioFormat = newFormat;
+ if (keepHistory) {
+ audioFormatHistory.add(Pair.create(eventTime, currentAudioFormat));
+ }
+ }
+
+ private void maybeRecordVideoFormatTime(long nowMs) {
+ if (currentPlaybackState == PlaybackStats.PLAYBACK_STATE_PLAYING
+ && currentVideoFormat != null) {
+ long mediaDurationMs = (long) ((nowMs - lastVideoFormatStartTimeMs) * currentPlaybackSpeed);
+ if (currentVideoFormat.height != Format.NO_VALUE) {
+ videoFormatHeightTimeMs += mediaDurationMs;
+ videoFormatHeightTimeProduct += mediaDurationMs * currentVideoFormat.height;
+ }
+ if (currentVideoFormat.bitrate != Format.NO_VALUE) {
+ videoFormatBitrateTimeMs += mediaDurationMs;
+ videoFormatBitrateTimeProduct += mediaDurationMs * currentVideoFormat.bitrate;
+ }
+ }
+ lastVideoFormatStartTimeMs = nowMs;
+ }
+
+ private void maybeRecordAudioFormatTime(long nowMs) {
+ if (currentPlaybackState == PlaybackStats.PLAYBACK_STATE_PLAYING
+ && currentAudioFormat != null
+ && currentAudioFormat.bitrate != Format.NO_VALUE) {
+ long mediaDurationMs = (long) ((nowMs - lastAudioFormatStartTimeMs) * currentPlaybackSpeed);
+ audioFormatTimeMs += mediaDurationMs;
+ audioFormatBitrateTimeProduct += mediaDurationMs * currentAudioFormat.bitrate;
+ }
+ lastAudioFormatStartTimeMs = nowMs;
+ }
+
+ private static boolean isReadyState(@PlaybackState int state) {
+ return state == PlaybackStats.PLAYBACK_STATE_PLAYING
+ || state == PlaybackStats.PLAYBACK_STATE_PAUSED;
+ }
+
+ private static boolean isPausedState(@PlaybackState int state) {
+ return state == PlaybackStats.PLAYBACK_STATE_PAUSED
+ || state == PlaybackStats.PLAYBACK_STATE_PAUSED_BUFFERING;
+ }
+
+ private static boolean isRebufferingState(@PlaybackState int state) {
+ return state == PlaybackStats.PLAYBACK_STATE_BUFFERING
+ || state == PlaybackStats.PLAYBACK_STATE_PAUSED_BUFFERING;
+ }
+
+ private static boolean isInvalidJoinTransition(
+ @PlaybackState int oldState, @PlaybackState int newState) {
+ if (oldState != PlaybackStats.PLAYBACK_STATE_JOINING_BACKGROUND
+ && oldState != PlaybackStats.PLAYBACK_STATE_JOINING_FOREGROUND
+ && oldState != PlaybackStats.PLAYBACK_STATE_SUSPENDED) {
+ return false;
+ }
+ return newState != PlaybackStats.PLAYBACK_STATE_JOINING_BACKGROUND
+ && newState != PlaybackStats.PLAYBACK_STATE_JOINING_FOREGROUND
+ && newState != PlaybackStats.PLAYBACK_STATE_SUSPENDED
+ && newState != PlaybackStats.PLAYBACK_STATE_PLAYING
+ && newState != PlaybackStats.PLAYBACK_STATE_PAUSED
+ && newState != PlaybackStats.PLAYBACK_STATE_ENDED;
+ }
+ }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
index 3cc05e87df..44bcdfd495 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
@@ -103,11 +103,11 @@ public final class AudioFocusManager {
private final AudioManager audioManager;
private final AudioFocusListener focusListener;
private final PlayerControl playerControl;
- private @Nullable AudioAttributes audioAttributes;
+ @Nullable private AudioAttributes audioAttributes;
- private @AudioFocusState int audioFocusState;
- private int focusGain;
- private float volumeMultiplier = 1.0f;
+ @AudioFocusState private int audioFocusState;
+ @C.AudioFocusGain private int focusGain;
+ private float volumeMultiplier = VOLUME_MULTIPLIER_DEFAULT;
private @MonotonicNonNull AudioFocusRequest audioFocusRequest;
private boolean rebuildAudioFocusRequest;
@@ -310,6 +310,7 @@ public final class AudioFocusManager {
* @param audioAttributes The audio attributes associated with this focus request.
* @return The type of audio focus gain that should be requested.
*/
+ @C.AudioFocusGain
private static int convertAudioAttributesToFocusGain(@Nullable AudioAttributes audioAttributes) {
if (audioAttributes == null) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
index 393380453c..f2458a7471 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
@@ -259,13 +259,12 @@ public interface AudioSink {
boolean hasPendingData();
/**
- * Attempts to set the playback parameters and returns the active playback parameters, which may
- * differ from those passed in.
+ * Attempts to set the playback parameters. The audio sink may override these parameters if they
+ * are not supported.
*
* @param playbackParameters The new playback parameters to attempt to set.
- * @return The active playback parameters.
*/
- PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters);
+ void setPlaybackParameters(PlaybackParameters playbackParameters);
/**
* Gets the active {@link PlaybackParameters}.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
index d43972d7b0..0564591f1f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
@@ -82,7 +82,7 @@ import java.lang.annotation.RetentionPolicy;
*/
private static final int INITIALIZING_DURATION_US = 500_000;
- private final @Nullable AudioTimestampV19 audioTimestamp;
+ @Nullable private final AudioTimestampV19 audioTimestamp;
private @State int state;
private long initializeSystemTimeUs;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
index e87e49d2da..4ee70bd813 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
@@ -133,10 +133,10 @@ import java.lang.reflect.Method;
private final Listener listener;
private final long[] playheadOffsets;
- private @Nullable AudioTrack audioTrack;
+ @Nullable private AudioTrack audioTrack;
private int outputPcmFrameSize;
private int bufferSize;
- private @Nullable AudioTimestampPoller audioTimestampPoller;
+ @Nullable private AudioTimestampPoller audioTimestampPoller;
private int outputSampleRate;
private boolean needsPassthroughWorkarounds;
private long bufferSizeUs;
@@ -144,7 +144,7 @@ import java.lang.reflect.Method;
private long smoothedPlayheadOffsetUs;
private long lastPlayheadSampleTimeUs;
- private @Nullable Method getLatencyMethod;
+ @Nullable private Method getLatencyMethod;
private long latencyUs;
private boolean hasData;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index cf914567d6..b4e0058982 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -501,7 +501,7 @@ public final class DefaultAudioSink implements AudioSink {
}
}
- private void initialize() throws InitializationException {
+ private void initialize(long presentationTimeUs) throws InitializationException {
// If we're asynchronously releasing a previous audio track then we block until it has been
// released. This guarantees that we cannot end up in a state where we have multiple audio
// track instances. Without this guarantee it would be possible, in extreme cases, to exhaust
@@ -533,11 +533,7 @@ public final class DefaultAudioSink implements AudioSink {
}
}
- playbackParameters =
- configuration.canApplyPlaybackParameters
- ? audioProcessorChain.applyPlaybackParameters(playbackParameters)
- : PlaybackParameters.DEFAULT;
- setupAudioProcessors();
+ applyPlaybackParameters(playbackParameters, presentationTimeUs);
audioTrackPositionTracker.setAudioTrack(
audioTrack,
@@ -591,15 +587,12 @@ public final class DefaultAudioSink implements AudioSink {
configuration = pendingConfiguration;
pendingConfiguration = null;
}
- playbackParameters =
- configuration.canApplyPlaybackParameters
- ? audioProcessorChain.applyPlaybackParameters(playbackParameters)
- : PlaybackParameters.DEFAULT;
- setupAudioProcessors();
+ // Re-apply playback parameters.
+ applyPlaybackParameters(playbackParameters, presentationTimeUs);
}
if (!isInitialized()) {
- initialize();
+ initialize(presentationTimeUs);
if (playing) {
play();
}
@@ -635,15 +628,7 @@ public final class DefaultAudioSink implements AudioSink {
}
PlaybackParameters newPlaybackParameters = afterDrainPlaybackParameters;
afterDrainPlaybackParameters = null;
- newPlaybackParameters = audioProcessorChain.applyPlaybackParameters(newPlaybackParameters);
- // Store the position and corresponding media time from which the parameters will apply.
- playbackParametersCheckpoints.add(
- new PlaybackParametersCheckpoint(
- newPlaybackParameters,
- Math.max(0, presentationTimeUs),
- configuration.framesToDurationUs(getWrittenFrames())));
- // Update the set of active audio processors to take into account the new parameters.
- setupAudioProcessors();
+ applyPlaybackParameters(newPlaybackParameters, presentationTimeUs);
}
if (startMediaTimeState == START_NOT_SET) {
@@ -840,33 +825,33 @@ public final class DefaultAudioSink implements AudioSink {
}
@Override
- public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
+ public void setPlaybackParameters(PlaybackParameters playbackParameters) {
if (configuration != null && !configuration.canApplyPlaybackParameters) {
this.playbackParameters = PlaybackParameters.DEFAULT;
- return this.playbackParameters;
+ return;
}
- PlaybackParameters lastSetPlaybackParameters =
- afterDrainPlaybackParameters != null
- ? afterDrainPlaybackParameters
- : !playbackParametersCheckpoints.isEmpty()
- ? playbackParametersCheckpoints.getLast().playbackParameters
- : this.playbackParameters;
+ PlaybackParameters lastSetPlaybackParameters = getPlaybackParameters();
if (!playbackParameters.equals(lastSetPlaybackParameters)) {
if (isInitialized()) {
// Drain the audio processors so we can determine the frame position at which the new
// parameters apply.
afterDrainPlaybackParameters = playbackParameters;
} else {
- // Update the playback parameters now.
- this.playbackParameters = audioProcessorChain.applyPlaybackParameters(playbackParameters);
+ // Update the playback parameters now. They will be applied to the audio processors during
+ // initialization.
+ this.playbackParameters = playbackParameters;
}
}
- return this.playbackParameters;
}
@Override
public PlaybackParameters getPlaybackParameters() {
- return playbackParameters;
+ // Mask the already set parameters.
+ return afterDrainPlaybackParameters != null
+ ? afterDrainPlaybackParameters
+ : !playbackParametersCheckpoints.isEmpty()
+ ? playbackParametersCheckpoints.getLast().playbackParameters
+ : playbackParameters;
}
@Override
@@ -1040,6 +1025,21 @@ public final class DefaultAudioSink implements AudioSink {
}.start();
}
+ private void applyPlaybackParameters(
+ PlaybackParameters playbackParameters, long presentationTimeUs) {
+ PlaybackParameters newPlaybackParameters =
+ configuration.canApplyPlaybackParameters
+ ? audioProcessorChain.applyPlaybackParameters(playbackParameters)
+ : PlaybackParameters.DEFAULT;
+ // Store the position and corresponding media time from which the parameters will apply.
+ playbackParametersCheckpoints.add(
+ new PlaybackParametersCheckpoint(
+ newPlaybackParameters,
+ /* mediaTimeUs= */ Math.max(0, presentationTimeUs),
+ /* positionUs= */ configuration.framesToDurationUs(getWrittenFrames())));
+ setupAudioProcessors();
+ }
+
private long applySpeedup(long positionUs) {
@Nullable PlaybackParametersCheckpoint checkpoint = null;
while (!playbackParametersCheckpoints.isEmpty()
@@ -1125,6 +1125,7 @@ public final class DefaultAudioSink implements AudioSink {
case C.ENCODING_AC3:
return 640 * 1000 / 8;
case C.ENCODING_E_AC3:
+ case C.ENCODING_E_AC3_JOC:
return 6144 * 1000 / 8;
case C.ENCODING_AC4:
return 2688 * 1000 / 8;
@@ -1154,7 +1155,7 @@ public final class DefaultAudioSink implements AudioSink {
return DtsUtil.parseDtsAudioSampleCount(buffer);
} else if (encoding == C.ENCODING_AC3) {
return Ac3Util.getAc3SyncframeAudioSampleCount();
- } else if (encoding == C.ENCODING_E_AC3) {
+ } else if (encoding == C.ENCODING_E_AC3 || encoding == C.ENCODING_E_AC3_JOC) {
return Ac3Util.parseEAc3SyncframeAudioSampleCount(buffer);
} else if (encoding == C.ENCODING_AC4) {
return Ac4Util.parseAc4SyncframeAudioSampleCount(buffer);
@@ -1177,11 +1178,10 @@ public final class DefaultAudioSink implements AudioSink {
@TargetApi(21)
private int writeNonBlockingWithAvSyncV21(AudioTrack audioTrack, ByteBuffer buffer, int size,
long presentationTimeUs) {
- // TODO: Uncomment this when [Internal ref: b/33627517] is clarified or fixed.
- // if (Util.SDK_INT >= 23) {
- // // The underlying platform AudioTrack writes AV sync headers directly.
- // return audioTrack.write(buffer, size, WRITE_NON_BLOCKING, presentationTimeUs * 1000);
- // }
+ if (Util.SDK_INT >= 26) {
+ // The underlying platform AudioTrack writes AV sync headers directly.
+ return audioTrack.write(buffer, size, WRITE_NON_BLOCKING, presentationTimeUs * 1000);
+ }
if (avSyncHeader == null) {
avSyncHeader = ByteBuffer.allocate(16);
avSyncHeader.order(ByteOrder.BIG_ENDIAN);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index c3ec759c2d..6a29f316e1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -246,12 +246,50 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
@Nullable Handler eventHandler,
@Nullable AudioRendererEventListener eventListener,
AudioSink audioSink) {
+ this(
+ context,
+ mediaCodecSelector,
+ drmSessionManager,
+ playClearSamplesWithoutKeys,
+ /* enableDecoderFallback= */ false,
+ eventHandler,
+ eventListener,
+ audioSink);
+ }
+
+ /**
+ * @param context A context.
+ * @param mediaCodecSelector A decoder selector.
+ * @param drmSessionManager For use with encrypted content. May be null if support for encrypted
+ * content is not required.
+ * @param playClearSamplesWithoutKeys Encrypted media may contain clear (un-encrypted) regions.
+ * For example a media file may start with a short clear region so as to allow playback to
+ * begin in parallel with key acquisition. This parameter specifies whether the renderer is
+ * permitted to play clear regions of encrypted media files before {@code drmSessionManager}
+ * has obtained the keys necessary to decrypt encrypted regions of the media.
+ * @param enableDecoderFallback Whether to enable fallback to lower-priority decoders if decoder
+ * initialization fails. This may result in using a decoder that is slower/less efficient than
+ * the primary decoder.
+ * @param eventHandler A handler to use when delivering events to {@code eventListener}. May be
+ * null if delivery of events is not required.
+ * @param eventListener A listener of events. May be null if delivery of events is not required.
+ * @param audioSink The sink to which audio will be output.
+ */
+ public MediaCodecAudioRenderer(
+ Context context,
+ MediaCodecSelector mediaCodecSelector,
+ @Nullable DrmSessionManager drmSessionManager,
+ boolean playClearSamplesWithoutKeys,
+ boolean enableDecoderFallback,
+ @Nullable Handler eventHandler,
+ @Nullable AudioRendererEventListener eventListener,
+ AudioSink audioSink) {
super(
C.TRACK_TYPE_AUDIO,
mediaCodecSelector,
drmSessionManager,
playClearSamplesWithoutKeys,
- /* enableDecoderFallback= */ false,
+ enableDecoderFallback,
/* assumedMinimumCodecOperatingRate= */ 44100);
this.context = context.getApplicationContext();
this.audioSink = audioSink;
@@ -270,7 +308,11 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
return FORMAT_UNSUPPORTED_TYPE;
}
int tunnelingSupport = Util.SDK_INT >= 21 ? TUNNELING_SUPPORTED : TUNNELING_NOT_SUPPORTED;
- boolean supportsFormatDrm = supportsFormatDrm(drmSessionManager, format.drmInitData);
+ boolean supportsFormatDrm =
+ format.drmInitData == null
+ || FrameworkMediaCrypto.class.equals(format.exoMediaCryptoType)
+ || (format.exoMediaCryptoType == null
+ && supportsFormatDrm(drmSessionManager, format.drmInitData));
if (supportsFormatDrm
&& allowPassthrough(format.channelCount, mimeType)
&& mediaCodecSelector.getPassthroughDecoderInfo() != null) {
@@ -336,7 +378,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
* @return Whether passthrough playback is supported.
*/
protected boolean allowPassthrough(int channelCount, String mimeType) {
- return audioSink.supportsOutput(channelCount, MimeTypes.getEncoding(mimeType));
+ return getPassthroughEncoding(channelCount, mimeType) != C.ENCODING_INVALID;
}
@Override
@@ -350,7 +392,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
codecNeedsDiscardChannelsWorkaround = codecNeedsDiscardChannelsWorkaround(codecInfo.name);
codecNeedsEosBufferTimestampWorkaround = codecNeedsEosBufferTimestampWorkaround(codecInfo.name);
passthroughEnabled = codecInfo.passthrough;
- String codecMimeType = passthroughEnabled ? MimeTypes.AUDIO_RAW : codecInfo.mimeType;
+ String codecMimeType = passthroughEnabled ? MimeTypes.AUDIO_RAW : codecInfo.codecMimeType;
MediaFormat mediaFormat =
getMediaFormat(format, codecMimeType, codecMaxInputSize, codecOperatingRate);
codec.configure(mediaFormat, /* surface= */ null, crypto, /* flags= */ 0);
@@ -433,11 +475,14 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
@C.Encoding int encoding;
MediaFormat format;
if (passthroughMediaFormat != null) {
- encoding = MimeTypes.getEncoding(passthroughMediaFormat.getString(MediaFormat.KEY_MIME));
format = passthroughMediaFormat;
+ encoding =
+ getPassthroughEncoding(
+ format.getInteger(MediaFormat.KEY_CHANNEL_COUNT),
+ format.getString(MediaFormat.KEY_MIME));
} else {
- encoding = pcmEncoding;
format = outputFormat;
+ encoding = pcmEncoding;
}
int channelCount = format.getInteger(MediaFormat.KEY_CHANNEL_COUNT);
int sampleRate = format.getInteger(MediaFormat.KEY_SAMPLE_RATE);
@@ -459,6 +504,28 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
}
}
+ /**
+ * Returns the {@link C.Encoding} constant to use for passthrough of the given format, or {@link
+ * C#ENCODING_INVALID} if passthrough is not possible.
+ */
+ @C.Encoding
+ protected int getPassthroughEncoding(int channelCount, String mimeType) {
+ if (MimeTypes.AUDIO_E_AC3_JOC.equals(mimeType)) {
+ if (audioSink.supportsOutput(channelCount, C.ENCODING_E_AC3_JOC)) {
+ return MimeTypes.getEncoding(MimeTypes.AUDIO_E_AC3_JOC);
+ }
+ // E-AC3 receivers can decode JOC streams, but in 2-D rather than 3-D, so try to fall back.
+ mimeType = MimeTypes.AUDIO_E_AC3;
+ }
+
+ @C.Encoding int encoding = MimeTypes.getEncoding(mimeType);
+ if (audioSink.supportsOutput(channelCount, encoding)) {
+ return encoding;
+ } else {
+ return C.ENCODING_INVALID;
+ }
+ }
+
/**
* Called when the audio session id becomes known. The default implementation is a no-op. One
* reason for overriding this method would be to instantiate and enable a {@link Virtualizer} in
@@ -581,8 +648,8 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
}
@Override
- public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
- return audioSink.setPlaybackParameters(playbackParameters);
+ public void setPlaybackParameters(PlaybackParameters playbackParameters) {
+ audioSink.setPlaybackParameters(playbackParameters);
}
@Override
@@ -628,7 +695,8 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
int bufferIndex,
int bufferFlags,
long bufferPresentationTimeUs,
- boolean shouldSkip,
+ boolean isDecodeOnlyBuffer,
+ boolean isLastBuffer,
Format format)
throws ExoPlaybackException {
if (codecNeedsEosBufferTimestampWorkaround
@@ -644,7 +712,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
return true;
}
- if (shouldSkip) {
+ if (isDecodeOnlyBuffer) {
codec.releaseOutputBuffer(bufferIndex, false);
decoderCounters.skippedOutputBufferCount++;
audioSink.handleDiscontinuity();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
index 553dfb1187..e4691db7c0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
@@ -246,7 +246,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
* @return The extent to which the renderer supports the format itself.
*/
protected abstract int supportsFormatInternal(
- DrmSessionManager drmSessionManager, Format format);
+ @Nullable DrmSessionManager drmSessionManager, Format format);
/**
* Returns whether the sink supports the audio format.
@@ -274,7 +274,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
flagsOnlyBuffer.clear();
int result = readSource(formatHolder, flagsOnlyBuffer, true);
if (result == C.RESULT_FORMAT_READ) {
- onInputFormatChanged(formatHolder.format);
+ onInputFormatChanged(formatHolder);
} else if (result == C.RESULT_BUFFER_READ) {
// End of stream read having not read a format.
Assertions.checkState(flagsOnlyBuffer.isEndOfStream());
@@ -341,9 +341,10 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
* @return The decoder.
* @throws AudioDecoderException If an error occurred creating a suitable decoder.
*/
- protected abstract SimpleDecoder createDecoder(Format format, ExoMediaCrypto mediaCrypto)
- throws AudioDecoderException;
+ protected abstract SimpleDecoder<
+ DecoderInputBuffer, ? extends SimpleOutputBuffer, ? extends AudioDecoderException>
+ createDecoder(Format format, @Nullable ExoMediaCrypto mediaCrypto)
+ throws AudioDecoderException;
/**
* Returns the format of audio buffers output by the decoder. Will not be called until the first
@@ -438,7 +439,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
return false;
}
if (result == C.RESULT_FORMAT_READ) {
- onInputFormatChanged(formatHolder.format);
+ onInputFormatChanged(formatHolder);
return true;
}
if (inputBuffer.isEndOfStream()) {
@@ -517,8 +518,8 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
}
@Override
- public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
- return audioSink.setPlaybackParameters(playbackParameters);
+ public void setPlaybackParameters(PlaybackParameters playbackParameters) {
+ audioSink.setPlaybackParameters(playbackParameters);
}
@Override
@@ -646,43 +647,39 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
}
private void setSourceDrmSession(@Nullable DrmSession session) {
- DrmSession previous = sourceDrmSession;
+ DrmSession.replaceSessionReferences(sourceDrmSession, session);
sourceDrmSession = session;
- releaseDrmSessionIfUnused(previous);
}
private void setDecoderDrmSession(@Nullable DrmSession session) {
- DrmSession previous = decoderDrmSession;
+ DrmSession.replaceSessionReferences(decoderDrmSession, session);
decoderDrmSession = session;
- releaseDrmSessionIfUnused(previous);
}
- private void releaseDrmSessionIfUnused(@Nullable DrmSession session) {
- if (session != null && session != decoderDrmSession && session != sourceDrmSession) {
- drmSessionManager.releaseSession(session);
- }
- }
-
- private void onInputFormatChanged(Format newFormat) throws ExoPlaybackException {
+ @SuppressWarnings("unchecked")
+ private void onInputFormatChanged(FormatHolder formatHolder) throws ExoPlaybackException {
Format oldFormat = inputFormat;
- inputFormat = newFormat;
+ inputFormat = formatHolder.format;
boolean drmInitDataChanged = !Util.areEqual(inputFormat.drmInitData, oldFormat == null ? null
: oldFormat.drmInitData);
if (drmInitDataChanged) {
if (inputFormat.drmInitData != null) {
- if (drmSessionManager == null) {
- throw ExoPlaybackException.createForRenderer(
- new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
+
+ if (formatHolder.includesDrmSession) {
+ setSourceDrmSession((DrmSession) formatHolder.drmSession);
+ } else {
+ if (drmSessionManager == null) {
+ throw ExoPlaybackException.createForRenderer(
+ new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
+ }
+ DrmSession session =
+ drmSessionManager.acquireSession(Looper.myLooper(), inputFormat.drmInitData);
+ if (sourceDrmSession != null) {
+ sourceDrmSession.releaseReference();
+ }
+ sourceDrmSession = session;
}
- DrmSession session =
- drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData);
- if (session == decoderDrmSession || session == sourceDrmSession) {
- // We already had this session. The manager must be reference counting, so release it once
- // to get the count attributed to this renderer back down to 1.
- drmSessionManager.releaseSession(session);
- }
- setSourceDrmSession(session);
} else {
setSourceDrmSession(null);
}
@@ -698,10 +695,10 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
audioTrackNeedsConfigure = true;
}
- encoderDelay = newFormat.encoderDelay;
- encoderPadding = newFormat.encoderPadding;
+ encoderDelay = inputFormat.encoderDelay;
+ encoderPadding = inputFormat.encoderPadding;
- eventDispatcher.inputFormatChanged(newFormat);
+ eventDispatcher.inputFormatChanged(inputFormat);
}
private void onQueueInputBuffer(DecoderInputBuffer buffer) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
index 0bf6baa4d0..6cd46bb705 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
@@ -30,6 +30,7 @@ import java.util.Arrays;
private static final int MINIMUM_PITCH = 65;
private static final int MAXIMUM_PITCH = 400;
private static final int AMDF_FREQUENCY = 4000;
+ private static final int BYTES_PER_SAMPLE = 2;
private final int inputSampleRateHz;
private final int channelCount;
@@ -157,9 +158,9 @@ import java.util.Arrays;
maxDiff = 0;
}
- /** Returns the number of output frames that can be read with {@link #getOutput(ShortBuffer)}. */
- public int getFramesAvailable() {
- return outputFrameCount;
+ /** Returns the size of output that can be read with {@link #getOutput(ShortBuffer)}, in bytes. */
+ public int getOutputSize() {
+ return outputFrameCount * channelCount * BYTES_PER_SAMPLE;
}
// Internal methods.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
index 0d938d33f4..bd32e5ee6f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
@@ -210,7 +210,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
sonic.queueInput(shortBuffer);
inputBuffer.position(inputBuffer.position() + inputSize);
}
- int outputSize = sonic.getFramesAvailable() * channelCount * 2;
+ int outputSize = sonic.getOutputSize();
if (outputSize > 0) {
if (buffer.capacity() < outputSize) {
buffer = ByteBuffer.allocateDirect(outputSize).order(ByteOrder.nativeOrder());
@@ -243,7 +243,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
@Override
public boolean isEnded() {
- return inputEnded && (sonic == null || sonic.getFramesAvailable() == 0);
+ return inputEnded && (sonic == null || sonic.getOutputSize() == 0);
}
@Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java
index 473a91fedf..f5cabf7c30 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java
@@ -23,13 +23,13 @@ import com.google.android.exoplayer2.util.Util;
public final class WavUtil {
/** Four character code for "RIFF". */
- public static final int RIFF_FOURCC = Util.getIntegerCodeForString("RIFF");
+ public static final int RIFF_FOURCC = 0x52494646;
/** Four character code for "WAVE". */
- public static final int WAVE_FOURCC = Util.getIntegerCodeForString("WAVE");
+ public static final int WAVE_FOURCC = 0x57415645;
/** Four character code for "fmt ". */
- public static final int FMT_FOURCC = Util.getIntegerCodeForString("fmt ");
+ public static final int FMT_FOURCC = 0x666d7420;
/** Four character code for "data". */
- public static final int DATA_FOURCC = Util.getIntegerCodeForString("data");
+ public static final int DATA_FOURCC = 0x64617461;
/** WAVE type value for integer PCM audio data. */
private static final int TYPE_PCM = 0x0001;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
index f8204f6be3..b5650860e9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
@@ -301,5 +301,6 @@ public abstract class SimpleDecoder<
* @param reset Whether the decoder must be reset before decoding.
* @return A decoder exception if an error occurred, or null if decoding was successful.
*/
- protected abstract @Nullable E decode(I inputBuffer, O outputBuffer, boolean reset);
+ @Nullable
+ protected abstract E decode(I inputBuffer, O outputBuffer, boolean reset);
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java
deleted file mode 100644
index dbe5c93172..0000000000
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.drm;
-
-/**
- * A reference-counted resource used in the decryption of media samples.
- *
- * @param The reference type with which to make {@link Owner#onLastReferenceReleased} calls.
- * Subclasses are expected to pass themselves.
- */
-public abstract class DecryptionResource> {
-
- /**
- * Implemented by the class in charge of managing a {@link DecryptionResource resource's}
- * lifecycle.
- */
- public interface Owner> {
-
- /**
- * Called when the last reference to a {@link DecryptionResource} is {@link #releaseReference()
- * released}.
- */
- void onLastReferenceReleased(T resource);
- }
-
- // TODO: Consider adding a handler on which the owner should be called.
- private final DecryptionResource.Owner owner;
- private int referenceCount;
-
- /**
- * Creates a new instance with reference count zero.
- *
- * @param owner The owner of this instance.
- */
- public DecryptionResource(Owner owner) {
- this.owner = owner;
- referenceCount = 0;
- }
-
- /** Increases by one the reference count for this resource. */
- public void acquireReference() {
- referenceCount++;
- }
-
- /**
- * Decreases by one the reference count for this resource, and notifies the owner if said count
- * reached zero as a result of this operation.
- *
- * Must only be called as releasing counter-part of {@link #acquireReference()}.
- */
- @SuppressWarnings("unchecked")
- public void releaseReference() {
- if (--referenceCount == 0) {
- owner.onLastReferenceReleased((T) this);
- } else if (referenceCount < 0) {
- throw new IllegalStateException("Illegal release of resource.");
- }
- }
-}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
index 215a48fc50..c83214c8d5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
@@ -38,13 +38,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/** A {@link DrmSession} that supports playbacks using {@link ExoMediaDrm}. */
@TargetApi(18)
-/* package */ class DefaultDrmSession implements DrmSession {
+public class DefaultDrmSession implements DrmSession {
/** Manages provisioning requests. */
public interface ProvisioningManager {
@@ -74,7 +75,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
public interface ReleaseCallback {
/**
- * Called when the session is released.
+ * Called immediately after releasing session resources.
*
* @param session The session.
*/
@@ -85,16 +86,16 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
private static final int MSG_PROVISION = 0;
private static final int MSG_KEYS = 1;
- private static final int MAX_LICENSE_DURATION_TO_RENEW = 60;
+ private static final int MAX_LICENSE_DURATION_TO_RENEW_SECONDS = 60;
/** The DRM scheme datas, or null if this session uses offline keys. */
- public final @Nullable List schemeDatas;
+ @Nullable public final List schemeDatas;
private final ExoMediaDrm mediaDrm;
private final ProvisioningManager provisioningManager;
private final ReleaseCallback releaseCallback;
private final @DefaultDrmSessionManager.Mode int mode;
- private final @Nullable HashMap optionalKeyRequestParameters;
+ @Nullable private final HashMap optionalKeyRequestParameters;
private final EventDispatcher eventDispatcher;
private final int initialDrmRequestRetryCount;
@@ -103,16 +104,16 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/* package */ final PostResponseHandler postResponseHandler;
private @DrmSession.State int state;
- private int openCount;
- private HandlerThread requestHandlerThread;
- private PostRequestHandler postRequestHandler;
- private @Nullable T mediaCrypto;
- private @Nullable DrmSessionException lastException;
- private byte @MonotonicNonNull [] sessionId;
+ private int referenceCount;
+ @Nullable private HandlerThread requestHandlerThread;
+ @Nullable private PostRequestHandler postRequestHandler;
+ @Nullable private T mediaCrypto;
+ @Nullable private DrmSessionException lastException;
+ private byte @NullableType [] sessionId;
private byte @MonotonicNonNull [] offlineLicenseKeySetId;
- private @Nullable KeyRequest currentKeyRequest;
- private @Nullable ProvisionRequest currentProvisionRequest;
+ @Nullable private KeyRequest currentKeyRequest;
+ @Nullable private ProvisionRequest currentProvisionRequest;
/**
* Instantiates a new DRM session.
@@ -166,47 +167,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
this.initialDrmRequestRetryCount = initialDrmRequestRetryCount;
this.eventDispatcher = eventDispatcher;
state = STATE_OPENING;
-
postResponseHandler = new PostResponseHandler(playbackLooper);
- requestHandlerThread = new HandlerThread("DrmRequestHandler");
- requestHandlerThread.start();
- postRequestHandler = new PostRequestHandler(requestHandlerThread.getLooper());
- }
-
- // Life cycle.
-
- public void acquire() {
- if (++openCount == 1) {
- if (state == STATE_ERROR) {
- return;
- }
- if (openInternal(true)) {
- doLicense(true);
- }
- }
- }
-
- // Assigning null to various non-null variables for clean-up. Class won't be used after release.
- @SuppressWarnings("assignment.type.incompatible")
- public void release() {
- if (--openCount == 0) {
- state = STATE_RELEASED;
- postResponseHandler.removeCallbacksAndMessages(null);
- postRequestHandler.removeCallbacksAndMessages(null);
- postRequestHandler = null;
- requestHandlerThread.quit();
- requestHandlerThread = null;
- mediaCrypto = null;
- lastException = null;
- currentKeyRequest = null;
- currentProvisionRequest = null;
- if (sessionId != null) {
- mediaDrm.closeSession(sessionId);
- sessionId = null;
- eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmSessionReleased);
- }
- releaseCallback.onSessionReleased(this);
- }
}
public boolean hasSessionId(byte[] sessionId) {
@@ -227,7 +188,11 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
public void provision() {
currentProvisionRequest = mediaDrm.getProvisionRequest();
- postRequestHandler.post(MSG_PROVISION, currentProvisionRequest, /* allowRetry= */ true);
+ Util.castNonNull(postRequestHandler)
+ .post(
+ MSG_PROVISION,
+ Assertions.checkNotNull(currentProvisionRequest),
+ /* allowRetry= */ true);
}
public void onProvisionCompleted() {
@@ -259,15 +224,53 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
}
@Override
- public @Nullable Map queryKeyStatus() {
+ @Nullable
+ public Map queryKeyStatus() {
return sessionId == null ? null : mediaDrm.queryKeyStatus(sessionId);
}
@Override
- public @Nullable byte[] getOfflineLicenseKeySetId() {
+ @Nullable
+ public byte[] getOfflineLicenseKeySetId() {
return offlineLicenseKeySetId;
}
+ @Override
+ public void acquireReference() {
+ if (++referenceCount == 1) {
+ Assertions.checkState(state == STATE_OPENING);
+ requestHandlerThread = new HandlerThread("DrmRequestHandler");
+ requestHandlerThread.start();
+ postRequestHandler = new PostRequestHandler(requestHandlerThread.getLooper());
+ if (openInternal(true)) {
+ doLicense(true);
+ }
+ }
+ }
+
+ @Override
+ public void releaseReference() {
+ if (--referenceCount == 0) {
+ // Assigning null to various non-null variables for clean-up.
+ state = STATE_RELEASED;
+ Util.castNonNull(postResponseHandler).removeCallbacksAndMessages(null);
+ Util.castNonNull(postRequestHandler).removeCallbacksAndMessages(null);
+ postRequestHandler = null;
+ Util.castNonNull(requestHandlerThread).quit();
+ requestHandlerThread = null;
+ mediaCrypto = null;
+ lastException = null;
+ currentKeyRequest = null;
+ currentProvisionRequest = null;
+ if (sessionId != null) {
+ mediaDrm.closeSession(sessionId);
+ sessionId = null;
+ eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmSessionReleased);
+ }
+ releaseCallback.onSessionReleased(this);
+ }
+ }
+
// Internal methods.
/**
@@ -286,9 +289,10 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
try {
sessionId = mediaDrm.openSession();
- eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmSessionAcquired);
mediaCrypto = mediaDrm.createMediaCrypto(sessionId);
+ eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmSessionAcquired);
state = STATE_OPENED;
+ Assertions.checkNotNull(sessionId);
return true;
} catch (NotProvisionedException e) {
if (allowProvisioning) {
@@ -327,6 +331,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
@RequiresNonNull("sessionId")
private void doLicense(boolean allowRetry) {
+ byte[] sessionId = Util.castNonNull(this.sessionId);
switch (mode) {
case DefaultDrmSessionManager.MODE_PLAYBACK:
case DefaultDrmSessionManager.MODE_QUERY:
@@ -335,7 +340,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
} else if (state == STATE_OPENED_WITH_KEYS || restoreKeys()) {
long licenseDurationRemainingSec = getLicenseDurationRemainingSec();
if (mode == DefaultDrmSessionManager.MODE_PLAYBACK
- && licenseDurationRemainingSec <= MAX_LICENSE_DURATION_TO_RENEW) {
+ && licenseDurationRemainingSec <= MAX_LICENSE_DURATION_TO_RENEW_SECONDS) {
Log.d(
TAG,
"Offline license has expired or will expire soon. "
@@ -362,6 +367,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
break;
case DefaultDrmSessionManager.MODE_RELEASE:
Assertions.checkNotNull(offlineLicenseKeySetId);
+ Assertions.checkNotNull(this.sessionId);
// It's not necessary to restore the key (and open a session to do that) before releasing it
// but this serves as a good sanity/fast-failure check.
if (restoreKeys()) {
@@ -398,7 +404,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
try {
currentKeyRequest =
mediaDrm.getKeyRequest(scope, schemeDatas, type, optionalKeyRequestParameters);
- postRequestHandler.post(MSG_KEYS, currentKeyRequest, allowRetry);
+ Util.castNonNull(postRequestHandler)
+ .post(MSG_KEYS, Assertions.checkNotNull(currentKeyRequest), allowRetry);
} catch (Exception e) {
onKeysError(e);
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index f27fefa055..34fd223c64 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -88,7 +88,7 @@ public class DefaultDrmSessionManager
private final UUID uuid;
private final ExoMediaDrm mediaDrm;
private final MediaDrmCallback callback;
- private final @Nullable HashMap optionalKeyRequestParameters;
+ @Nullable private final HashMap optionalKeyRequestParameters;
private final EventDispatcher eventDispatcher;
private final boolean multiSession;
private final int initialDrmRequestRetryCount;
@@ -96,9 +96,9 @@ public class DefaultDrmSessionManager
private final List> sessions;
private final List> provisioningSessions;
- private @Nullable Looper playbackLooper;
+ @Nullable private Looper playbackLooper;
private int mode;
- private @Nullable byte[] offlineLicenseKeySetId;
+ @Nullable private byte[] offlineLicenseKeySetId;
/* package */ volatile @Nullable MediaDrmHandler mediaDrmHandler;
@@ -432,17 +432,14 @@ public class DefaultDrmSessionManager
initialDrmRequestRetryCount);
sessions.add(session);
}
- session.acquire();
+ session.acquireReference();
return session;
}
@Override
- public void releaseSession(DrmSession session) {
- if (session instanceof ErrorStateDrmSession) {
- // Do nothing.
- return;
- }
- ((DefaultDrmSession) session).release();
+ @Nullable
+ public Class getExoMediaCryptoType(DrmInitData drmInitData) {
+ return canAcquireSession(drmInitData) ? mediaDrm.getExoMediaCryptoType() : null;
}
// ProvisioningManager implementation.
@@ -542,7 +539,7 @@ public class DefaultDrmSessionManager
@Override
public void onEvent(
ExoMediaDrm md,
- byte[] sessionId,
+ @Nullable byte[] sessionId,
int event,
int extra,
@Nullable byte[] data) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
index 3b05bd1e41..7cc2231e0f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
@@ -87,7 +87,7 @@ public final class DrmInitData implements Comparator, Parcelable {
private int hashCode;
/** The protection scheme type, or null if not applicable or unknown. */
- public final @Nullable String schemeType;
+ @Nullable public final String schemeType;
/**
* Number of {@link SchemeData}s.
@@ -152,7 +152,8 @@ public final class DrmInitData implements Comparator, Parcelable {
* @return The initialization data for the scheme, or null if the scheme is not supported.
*/
@Deprecated
- public @Nullable SchemeData get(UUID uuid) {
+ @Nullable
+ public SchemeData get(UUID uuid) {
for (SchemeData schemeData : schemeDatas) {
if (schemeData.matches(uuid)) {
return schemeData;
@@ -286,11 +287,11 @@ public final class DrmInitData implements Comparator, Parcelable {
*/
private final UUID uuid;
/** The URL of the server to which license requests should be made. May be null if unknown. */
- public final @Nullable String licenseServerUrl;
+ @Nullable public final String licenseServerUrl;
/** The mimeType of {@link #data}. */
public final String mimeType;
/** The initialization data. May be null for scheme support checks only. */
- public final @Nullable byte[] data;
+ @Nullable public final byte[] data;
/**
* @param uuid The {@link UUID} of the DRM scheme, or {@link C#UUID_NIL} if the data is
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
index 392b0734b1..722ab946f0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.drm;
import android.media.MediaDrm;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
+import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -29,9 +30,26 @@ import java.util.Map;
public interface DrmSession {
/**
- * Wraps the throwable which is the cause of the error state.
+ * Invokes {@code newSession's} {@link #acquireReference()} and {@code previousSession's} {@link
+ * #releaseReference()} in that order. Null arguments are ignored. Does nothing if {@code
+ * previousSession} and {@code newSession} are the same session.
*/
- class DrmSessionException extends Exception {
+ static void replaceSessionReferences(
+ @Nullable DrmSession previousSession, @Nullable DrmSession newSession) {
+ if (previousSession == newSession) {
+ // Do nothing.
+ return;
+ }
+ if (newSession != null) {
+ newSession.acquireReference();
+ }
+ if (previousSession != null) {
+ previousSession.releaseReference();
+ }
+ }
+
+ /** Wraps the throwable which is the cause of the error state. */
+ class DrmSessionException extends IOException {
public DrmSessionException(Throwable cause) {
super(cause);
@@ -110,4 +128,18 @@ public interface DrmSession {
*/
@Nullable
byte[] getOfflineLicenseKeySetId();
+
+ /**
+ * Increments the reference count for this session. A non-zero reference count session will keep
+ * any acquired resources.
+ */
+ void acquireReference();
+
+ /**
+ * Decreases by one the reference count for this session. A session that reaches a zero reference
+ * count will release any resources it holds.
+ *
+ * The session must not be used after its reference count has been reduced to 0.
+ */
+ void releaseReference();
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
index d8093507a4..9211cec144 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
@@ -16,13 +16,68 @@
package com.google.android.exoplayer2.drm;
import android.os.Looper;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
/**
* Manages a DRM session.
*/
public interface DrmSessionManager {
+ /** Returns {@link #DUMMY}. */
+ @SuppressWarnings("unchecked")
+ static DrmSessionManager getDummyDrmSessionManager() {
+ return (DrmSessionManager) DUMMY;
+ }
+
+ /** {@link DrmSessionManager} that supports no DRM schemes. */
+ DrmSessionManager DUMMY =
+ new DrmSessionManager() {
+
+ @Override
+ public boolean canAcquireSession(DrmInitData drmInitData) {
+ return false;
+ }
+
+ @Override
+ public DrmSession acquireSession(
+ Looper playbackLooper, DrmInitData drmInitData) {
+ return new ErrorStateDrmSession<>(
+ new DrmSession.DrmSessionException(
+ new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME)));
+ }
+
+ @Override
+ @Nullable
+ public Class getExoMediaCryptoType(DrmInitData drmInitData) {
+ return null;
+ }
+ };
+
+ /** Flags that control the handling of DRM protected content. */
+ @Documented
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(
+ flag = true,
+ value = {FLAG_PLAY_CLEAR_SAMPLES_WITHOUT_KEYS})
+ @interface Flags {}
+
+ /**
+ * When this flag is set, clear samples of an encrypted region may be rendered when no keys are
+ * available.
+ *
+ * Encrypted media may contain clear (un-encrypted) regions. For example a media file may start
+ * with a short clear region so as to allow playback to begin in parallel with key acquisition.
+ * When this flag is set, consumers of sample data are permitted to access the clear regions of
+ * encrypted media files when the associated {@link DrmSession} has not yet obtained the keys
+ * necessary for the encrypted regions of the media.
+ */
+ int FLAG_PLAY_CLEAR_SAMPLES_WITHOUT_KEYS = 1;
+
/**
* Returns whether the manager is capable of acquiring a session for the given
* {@link DrmInitData}.
@@ -34,8 +89,10 @@ public interface DrmSessionManager {
boolean canAcquireSession(DrmInitData drmInitData);
/**
- * Acquires a {@link DrmSession} for the specified {@link DrmInitData}. The {@link DrmSession}
- * must be returned to {@link #releaseSession(DrmSession)} when it is no longer required.
+ * Returns a {@link DrmSession} with an acquired reference for the specified {@link DrmInitData}.
+ *
+ * The caller must call {@link DrmSession#releaseReference} to decrement the session's
+ * reference count when the session is no longer required.
*
* @param playbackLooper The looper associated with the media playback thread.
* @param drmInitData DRM initialization data. All contained {@link SchemeData}s must contain
@@ -44,9 +101,16 @@ public interface DrmSessionManager {
*/
DrmSession acquireSession(Looper playbackLooper, DrmInitData drmInitData);
- /**
- * Releases a {@link DrmSession}.
- */
- void releaseSession(DrmSession drmSession);
+ /** Returns flags that control the handling of DRM protected content. */
+ @Flags
+ default int getFlags() {
+ return 0;
+ }
+ /**
+ * Returns the {@link ExoMediaCrypto} type returned by sessions acquired using the given {@link
+ * DrmInitData}, or null if a session cannot be acquired with the given {@link DrmInitData}.
+ */
+ @Nullable
+ Class getExoMediaCryptoType(DrmInitData drmInitData);
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
index 82fd9a5549..d40cf60906 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
@@ -34,23 +34,36 @@ public final class ErrorStateDrmSession implements Drm
}
@Override
- public @Nullable DrmSessionException getError() {
+ @Nullable
+ public DrmSessionException getError() {
return error;
}
@Override
- public @Nullable T getMediaCrypto() {
+ @Nullable
+ public T getMediaCrypto() {
return null;
}
@Override
- public @Nullable Map queryKeyStatus() {
+ @Nullable
+ public Map queryKeyStatus() {
return null;
}
@Override
- public @Nullable byte[] getOfflineLicenseKeySetId() {
+ @Nullable
+ public byte[] getOfflineLicenseKeySetId() {
return null;
}
+ @Override
+ public void acquireReference() {
+ // Do nothing.
+ }
+
+ @Override
+ public void releaseReference() {
+ // Do nothing.
+ }
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
index 49915f3af5..ca776267aa 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
@@ -80,7 +80,7 @@ public interface ExoMediaDrm {
*/
void onEvent(
ExoMediaDrm mediaDrm,
- byte[] sessionId,
+ @Nullable byte[] sessionId,
int event,
int extra,
@Nullable byte[] data);
@@ -215,6 +215,7 @@ public interface ExoMediaDrm {
throws NotProvisionedException;
/** @see MediaDrm#provideKeyResponse(byte[], byte[]) */
+ @Nullable
byte[] provideKeyResponse(byte[] scope, byte[] response)
throws NotProvisionedException, DeniedByServerException;
@@ -270,4 +271,7 @@ public interface ExoMediaDrm {
* @throws MediaCryptoException If the instance can't be created.
*/
T createMediaCrypto(byte[] sessionId) throws MediaCryptoException;
+
+ /** Returns the {@link ExoMediaCrypto} type created by {@link #createMediaCrypto(byte[])}. */
+ Class getExoMediaCryptoType();
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
index 848d9e146a..e77504c91c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
@@ -84,8 +84,6 @@ public final class FrameworkMediaDrm implements ExoMediaDrm listener) {
@@ -160,8 +158,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm getExoMediaCryptoType() {
+ return FrameworkMediaCrypto.class;
+ }
+
private static SchemeData getSchemeData(UUID uuid, List schemeDatas) {
if (!C.WIDEVINE_UUID.equals(uuid)) {
// For non-Widevine CDMs always use the first scheme data.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
index a3e602e404..23b2300dfa 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
@@ -111,7 +111,7 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
public byte[] executeProvisionRequest(UUID uuid, ProvisionRequest request) throws IOException {
String url =
request.getDefaultUrl() + "&signedRequest=" + Util.fromUtf8Bytes(request.getData());
- return executePost(dataSourceFactory, url, Util.EMPTY_BYTE_ARRAY, null);
+ return executePost(dataSourceFactory, url, /* httpBody= */ null, /* requestProperties= */ null);
}
@Override
@@ -139,7 +139,7 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
private static byte[] executePost(
HttpDataSource.Factory dataSourceFactory,
String url,
- byte[] data,
+ @Nullable byte[] httpBody,
@Nullable Map requestProperties)
throws IOException {
HttpDataSource dataSource = dataSourceFactory.createDataSource();
@@ -154,7 +154,8 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
DataSpec dataSpec =
new DataSpec(
Uri.parse(url),
- data,
+ DataSpec.HTTP_METHOD_POST,
+ httpBody,
/* absoluteStreamPosition= */ 0,
/* position= */ 0,
/* length= */ C.LENGTH_UNSET,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
index 55a7a901ac..05dab7e42d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
@@ -235,7 +235,7 @@ public final class OfflineLicenseHelper {
DrmSessionException error = drmSession.getError();
Pair licenseDurationRemainingSec =
WidevineUtil.getLicenseDurationRemainingSec(drmSession);
- drmSessionManager.releaseSession(drmSession);
+ drmSession.releaseReference();
if (error != null) {
if (error.getCause() instanceof KeysExpiredException) {
return Pair.create(0L, 0L);
@@ -259,7 +259,7 @@ public final class OfflineLicenseHelper {
drmInitData);
DrmSessionException error = drmSession.getError();
byte[] keySetId = drmSession.getOfflineLicenseKeySetId();
- drmSessionManager.releaseSession(drmSession);
+ drmSession.releaseReference();
if (error != null) {
throw error;
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
index 54c78eb33d..02c676dfdf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
@@ -108,7 +108,7 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
/**
* Sets flags for {@link AdtsExtractor} instances created by the factory.
*
- * @see AdtsExtractor#AdtsExtractor(long, int)
+ * @see AdtsExtractor#AdtsExtractor(int)
* @param flags The flags to use.
* @return The factory, for convenience.
*/
@@ -220,7 +220,6 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
: 0));
extractors[4] =
new AdtsExtractor(
- /* firstStreamSampleTimestampUs= */ 0,
adtsFlags
| (constantBitrateSeekingEnabled
? AdtsExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java
index 255799c026..60386dcc3c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java
@@ -53,7 +53,7 @@ public final class Id3Peeker {
Metadata metadata = null;
while (true) {
try {
- input.peekFully(scratch.data, 0, Id3Decoder.ID3_HEADER_LENGTH);
+ input.peekFully(scratch.data, /* offset= */ 0, Id3Decoder.ID3_HEADER_LENGTH);
} catch (EOFException e) {
// If input has less than ID3_HEADER_LENGTH, ignore the rest.
break;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java
index 87bb992082..e454bd51c8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java
@@ -186,10 +186,6 @@ public final class MpegAudioHeader {
}
}
- // Calculate the bitrate in the same way Mp3Extractor calculates sample timestamps so that
- // seeking to a given timestamp and playing from the start up to that timestamp give the same
- // results for CBR streams. See also [internal: b/120390268].
- bitrate = 8 * frameSize * sampleRate / samplesPerFrame;
String mimeType = MIME_TYPE_BY_LAYER[3 - layer];
int channels = ((headerData >> 6) & 3) == 3 ? 1 : 2;
header.setValues(version, mimeType, frameSize, sampleRate, channels, bitrate, samplesPerFrame);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
index d7a1c75302..0d5a168197 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
@@ -119,7 +119,7 @@ public interface TrackOutput {
* Called to write sample data to the output.
*
* @param data A {@link ParsableByteArray} from which to read the sample data.
- * @param length The number of bytes to read.
+ * @param length The number of bytes to read, starting from {@code data.getPosition()}.
*/
void sampleData(ParsableByteArray data, int length);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
index caf12948ad..f6b64245fc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
@@ -140,7 +140,7 @@ public final class AmrExtractor implements Extractor {
private ExtractorOutput extractorOutput;
private TrackOutput trackOutput;
- private @Nullable SeekMap seekMap;
+ @Nullable private SeekMap seekMap;
private boolean hasOutputFormat;
public AmrExtractor() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java
index ec5ad88aeb..b10f2bf80b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java
@@ -86,11 +86,12 @@ import java.util.Collections;
}
@Override
- protected void parsePayload(ParsableByteArray data, long timeUs) throws ParserException {
+ protected boolean parsePayload(ParsableByteArray data, long timeUs) throws ParserException {
if (audioFormat == AUDIO_FORMAT_MP3) {
int sampleSize = data.bytesLeft();
output.sampleData(data, sampleSize);
output.sampleMetadata(timeUs, C.BUFFER_FLAG_KEY_FRAME, sampleSize, 0, null);
+ return true;
} else {
int packetType = data.readUnsignedByte();
if (packetType == AAC_PACKET_TYPE_SEQUENCE_HEADER && !hasOutputFormat) {
@@ -104,12 +105,15 @@ import java.util.Collections;
Collections.singletonList(audioSpecificConfig), null, 0, null);
output.format(format);
hasOutputFormat = true;
+ return false;
} else if (audioFormat != AUDIO_FORMAT_AAC || packetType == AAC_PACKET_TYPE_AAC_RAW) {
int sampleSize = data.bytesLeft();
output.sampleData(data, sampleSize);
output.sampleMetadata(timeUs, C.BUFFER_FLAG_KEY_FRAME, sampleSize, 0, null);
+ return true;
+ } else {
+ return false;
}
}
}
-
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
index 0a2c0c46f6..f6835558f2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
@@ -24,7 +24,6 @@ import com.google.android.exoplayer2.extractor.ExtractorsFactory;
import com.google.android.exoplayer2.extractor.PositionHolder;
import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.util.ParsableByteArray;
-import com.google.android.exoplayer2.util.Util;
import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
@@ -64,7 +63,7 @@ public final class FlvExtractor implements Extractor {
private static final int TAG_TYPE_SCRIPT_DATA = 18;
// FLV container identifier.
- private static final int FLV_TAG = Util.getIntegerCodeForString("FLV");
+ private static final int FLV_TAG = 0x00464c56;
private final ParsableByteArray scratch;
private final ParsableByteArray headerBuffer;
@@ -74,6 +73,7 @@ public final class FlvExtractor implements Extractor {
private ExtractorOutput extractorOutput;
private @States int state;
+ private boolean outputFirstSample;
private long mediaTagTimestampOffsetUs;
private int bytesToNextTagHeader;
private int tagType;
@@ -90,7 +90,6 @@ public final class FlvExtractor implements Extractor {
tagData = new ParsableByteArray();
metadataReader = new ScriptTagPayloadReader();
state = STATE_READING_FLV_HEADER;
- mediaTagTimestampOffsetUs = C.TIME_UNSET;
}
@Override
@@ -132,7 +131,7 @@ public final class FlvExtractor implements Extractor {
@Override
public void seek(long position, long timeUs) {
state = STATE_READING_FLV_HEADER;
- mediaTagTimestampOffsetUs = C.TIME_UNSET;
+ outputFirstSample = false;
bytesToNextTagHeader = 0;
}
@@ -253,14 +252,16 @@ public final class FlvExtractor implements Extractor {
*/
private boolean readTagData(ExtractorInput input) throws IOException, InterruptedException {
boolean wasConsumed = true;
+ boolean wasSampleOutput = false;
+ long timestampUs = getCurrentTimestampUs();
if (tagType == TAG_TYPE_AUDIO && audioReader != null) {
ensureReadyForMediaOutput();
- audioReader.consume(prepareTagData(input), mediaTagTimestampOffsetUs + tagTimestampUs);
+ wasSampleOutput = audioReader.consume(prepareTagData(input), timestampUs);
} else if (tagType == TAG_TYPE_VIDEO && videoReader != null) {
ensureReadyForMediaOutput();
- videoReader.consume(prepareTagData(input), mediaTagTimestampOffsetUs + tagTimestampUs);
+ wasSampleOutput = videoReader.consume(prepareTagData(input), timestampUs);
} else if (tagType == TAG_TYPE_SCRIPT_DATA && !outputSeekMap) {
- metadataReader.consume(prepareTagData(input), tagTimestampUs);
+ wasSampleOutput = metadataReader.consume(prepareTagData(input), timestampUs);
long durationUs = metadataReader.getDurationUs();
if (durationUs != C.TIME_UNSET) {
extractorOutput.seekMap(new SeekMap.Unseekable(durationUs));
@@ -270,6 +271,11 @@ public final class FlvExtractor implements Extractor {
input.skipFully(tagDataSize);
wasConsumed = false;
}
+ if (!outputFirstSample && wasSampleOutput) {
+ outputFirstSample = true;
+ mediaTagTimestampOffsetUs =
+ metadataReader.getDurationUs() == C.TIME_UNSET ? -tagTimestampUs : 0;
+ }
bytesToNextTagHeader = 4; // There's a 4 byte previous tag size before the next header.
state = STATE_SKIPPING_TO_TAG_HEADER;
return wasConsumed;
@@ -292,10 +298,11 @@ public final class FlvExtractor implements Extractor {
extractorOutput.seekMap(new SeekMap.Unseekable(C.TIME_UNSET));
outputSeekMap = true;
}
- if (mediaTagTimestampOffsetUs == C.TIME_UNSET) {
- mediaTagTimestampOffsetUs =
- metadataReader.getDurationUs() == C.TIME_UNSET ? -tagTimestampUs : 0;
- }
}
+ private long getCurrentTimestampUs() {
+ return outputFirstSample
+ ? (mediaTagTimestampOffsetUs + tagTimestampUs)
+ : (metadataReader.getDurationUs() == C.TIME_UNSET ? 0 : tagTimestampUs);
+ }
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java
index 2dec85ffcc..806cc9fad4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java
@@ -15,8 +15,10 @@
*/
package com.google.android.exoplayer2.extractor.flv;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.extractor.DummyTrackOutput;
import com.google.android.exoplayer2.util.ParsableByteArray;
import java.util.ArrayList;
import java.util.Date;
@@ -44,7 +46,7 @@ import java.util.Map;
private long durationUs;
public ScriptTagPayloadReader() {
- super(null);
+ super(new DummyTrackOutput());
durationUs = C.TIME_UNSET;
}
@@ -63,7 +65,7 @@ import java.util.Map;
}
@Override
- protected void parsePayload(ParsableByteArray data, long timeUs) throws ParserException {
+ protected boolean parsePayload(ParsableByteArray data, long timeUs) throws ParserException {
int nameType = readAmfType(data);
if (nameType != AMF_TYPE_STRING) {
// Should never happen.
@@ -72,12 +74,12 @@ import java.util.Map;
String name = readAmfString(data);
if (!NAME_METADATA.equals(name)) {
// We're only interested in metadata.
- return;
+ return false;
}
int type = readAmfType(data);
if (type != AMF_TYPE_ECMA_ARRAY) {
// We're not interested in this metadata.
- return;
+ return false;
}
// Set the duration to the value contained in the metadata, if present.
Map