-
+
+
diff --git a/extensions/cast/README.md b/extensions/cast/README.md
index cc72c5f9bc..1c0d7ac56f 100644
--- a/extensions/cast/README.md
+++ b/extensions/cast/README.md
@@ -5,7 +5,7 @@
The cast extension is a [Player][] implementation that controls playback on a
Cast receiver app.
-[Player]: https://google.github.io/ExoPlayer/doc/reference/index.html?com/google/android/exoplayer2/Player.html
+[Player]: https://exoplayer.dev/doc/reference/index.html?com/google/android/exoplayer2/Player.html
## Getting the extension ##
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index 0baa074d4a..4dc463ff81 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -24,32 +23,21 @@ android {
}
defaultConfig {
- minSdkVersion 14
+ minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
- consumerProguardFiles 'proguard-rules.txt'
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
api 'com.google.android.gms:play-services-cast-framework:16.1.2'
- compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
- compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
+ implementation 'androidx.annotation:annotation:1.0.2'
implementation project(modulePrefix + 'library-core')
implementation project(modulePrefix + 'library-ui')
- testImplementation project(modulePrefix + 'testutils')
- testImplementation 'junit:junit:' + junitVersion
- testImplementation 'org.mockito:mockito-core:' + mockitoVersion
- testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+ compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
+ compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
testImplementation project(modulePrefix + 'testutils-robolectric')
- // These dependencies are necessary to force the supportLibraryVersion of
- // com.android.support:support-v4, com.android.support:appcompat-v7 and
- // com.android.support:mediarouter-v7 to be used. Else older versions are
- // used, for example via:
- // com.google.android.gms:play-services-cast-framework:15.0.1
- // |-- com.android.support:mediarouter-v7:26.1.0
- api 'com.android.support:support-v4:' + supportLibraryVersion
- api 'com.android.support:mediarouter-v7:' + supportLibraryVersion
- api 'com.android.support:recyclerview-v7:' + supportLibraryVersion
}
ext {
diff --git a/extensions/cast/proguard-rules.txt b/extensions/cast/proguard-rules.txt
deleted file mode 100644
index bc94b33c1c..0000000000
--- a/extensions/cast/proguard-rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Proguard rules specific to the Cast extension.
-
-# DefaultCastOptionsProvider is commonly referred to only by the app's manifest.
--keep class com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index 71322de87e..14bb433d2b 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -16,8 +16,8 @@
package com.google.android.exoplayer2.ext.cast;
import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.BasePlayer;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException;
@@ -52,35 +52,18 @@ import java.util.concurrent.CopyOnWriteArraySet;
* {@link Player} implementation that communicates with a Cast receiver app.
*
* The behavior of this class depends on the underlying Cast session, which is obtained from the
- * Cast context passed to {@link #CastPlayer}. To keep track of the session,
- * {@link #isCastSessionAvailable()} can be queried and {@link SessionAvailabilityListener} can be
- * implemented and attached to the player.
+ * Cast context passed to {@link #CastPlayer}. To keep track of the session, {@link
+ * #isCastSessionAvailable()} can be queried and {@link SessionAvailabilityListener} can be
+ * implemented and attached to the player.
*
- * If no session is available, the player state will remain unchanged and calls to methods that
+ *
If no session is available, the player state will remain unchanged and calls to methods that
* alter it will be ignored. Querying the player state is possible even when no session is
- * available, in which case, the last observed receiver app state is reported.
+ * available, in which case, the last observed receiver app state is reported.
*
- * Methods should be called on the application's main thread.
+ * Methods should be called on the application's main thread.
*/
public final class CastPlayer extends BasePlayer {
- /**
- * Listener of changes in the cast session availability.
- */
- public interface SessionAvailabilityListener {
-
- /**
- * Called when a cast session becomes available to the player.
- */
- void onCastSessionAvailable();
-
- /**
- * Called when the cast session becomes unavailable.
- */
- void onCastSessionUnavailable();
-
- }
-
private static final String TAG = "CastPlayer";
private static final int RENDERER_COUNT = 3;
@@ -591,7 +574,9 @@ public final class CastPlayer extends BasePlayer {
CastTimeline oldTimeline = currentTimeline;
MediaStatus status = getMediaStatus();
currentTimeline =
- status != null ? timelineTracker.getCastTimeline(status) : CastTimeline.EMPTY_CAST_TIMELINE;
+ status != null
+ ? timelineTracker.getCastTimeline(remoteMediaClient)
+ : CastTimeline.EMPTY_CAST_TIMELINE;
return !oldTimeline.equals(currentTimeline);
}
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 4939e62a2b..800c19047b 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
@@ -15,24 +15,66 @@
*/
package com.google.android.exoplayer2.ext.cast;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
+import android.util.SparseArray;
import android.util.SparseIntArray;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Timeline;
-import com.google.android.gms.cast.MediaInfo;
-import com.google.android.gms.cast.MediaQueueItem;
import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
/**
* A {@link Timeline} for Cast media queues.
*/
/* package */ final class CastTimeline extends Timeline {
+ /** Holds {@link Timeline} related data for a Cast media item. */
+ public static final class ItemData {
+
+ /** Holds no media information. */
+ public static final ItemData EMPTY = new ItemData();
+
+ /** The duration of the item in microseconds, or {@link C#TIME_UNSET} if unknown. */
+ public final long durationUs;
+ /**
+ * The default start position of the item in microseconds, or {@link C#TIME_UNSET} if unknown.
+ */
+ public final long defaultPositionUs;
+
+ private ItemData() {
+ this(/* durationUs= */ C.TIME_UNSET, /* defaultPositionUs */ C.TIME_UNSET);
+ }
+
+ /**
+ * Creates an instance.
+ *
+ * @param durationUs See {@link #durationsUs}.
+ * @param defaultPositionUs See {@link #defaultPositionUs}.
+ */
+ public ItemData(long durationUs, long defaultPositionUs) {
+ this.durationUs = durationUs;
+ this.defaultPositionUs = defaultPositionUs;
+ }
+
+ /** Returns an instance with the given {@link #durationsUs}. */
+ public ItemData copyWithDurationUs(long durationUs) {
+ if (durationUs == this.durationUs) {
+ return this;
+ }
+ return new ItemData(durationUs, defaultPositionUs);
+ }
+
+ /** Returns an instance with the given {@link #defaultPositionsUs}. */
+ public ItemData copyWithDefaultPositionUs(long defaultPositionUs) {
+ if (defaultPositionUs == this.defaultPositionUs) {
+ return this;
+ }
+ return new ItemData(durationUs, defaultPositionUs);
+ }
+ }
+
+ /** {@link Timeline} for a cast queue that has no items. */
public static final CastTimeline EMPTY_CAST_TIMELINE =
- new CastTimeline(Collections.emptyList(), Collections.emptyMap());
+ new CastTimeline(new int[0], new SparseArray<>());
private final SparseIntArray idsToIndex;
private final int[] ids;
@@ -40,28 +82,23 @@ import java.util.Map;
private final long[] defaultPositionsUs;
/**
- * @param items A list of cast media queue items to represent.
- * @param contentIdToDurationUsMap A map of content id to duration in microseconds.
+ * Creates a Cast timeline from the given data.
+ *
+ * @param itemIds The ids of the items in the timeline.
+ * @param itemIdToData Maps item ids to {@link ItemData}.
*/
- public CastTimeline(List items, Map contentIdToDurationUsMap) {
- int itemCount = items.size();
- int index = 0;
+ public CastTimeline(int[] itemIds, SparseArray itemIdToData) {
+ int itemCount = itemIds.length;
idsToIndex = new SparseIntArray(itemCount);
- ids = new int[itemCount];
+ ids = Arrays.copyOf(itemIds, itemCount);
durationsUs = new long[itemCount];
defaultPositionsUs = new long[itemCount];
- for (MediaQueueItem item : items) {
- int itemId = item.getItemId();
- ids[index] = itemId;
- idsToIndex.put(itemId, index);
- MediaInfo mediaInfo = item.getMedia();
- String contentId = mediaInfo.getContentId();
- durationsUs[index] =
- contentIdToDurationUsMap.containsKey(contentId)
- ? contentIdToDurationUsMap.get(contentId)
- : CastUtils.getStreamDurationUs(mediaInfo);
- defaultPositionsUs[index] = (long) (item.getStartTime() * C.MICROS_PER_SECOND);
- index++;
+ for (int i = 0; i < ids.length; i++) {
+ int id = ids[i];
+ idsToIndex.put(id, i);
+ ItemData data = itemIdToData.get(id, ItemData.EMPTY);
+ durationsUs[i] = data.durationUs;
+ defaultPositionsUs[i] = data.defaultPositionUs;
}
}
@@ -108,7 +145,7 @@ import java.util.Map;
}
@Override
- public Object getUidOfPeriod(int periodIndex) {
+ public Integer getUidOfPeriod(int periodIndex) {
return ids[periodIndex];
}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java
index 412bfb476d..40c93a115a 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java
@@ -15,53 +15,84 @@
*/
package com.google.android.exoplayer2.ext.cast;
-import com.google.android.gms.cast.MediaInfo;
+import android.util.SparseArray;
+import com.google.android.exoplayer2.C;
import com.google.android.gms.cast.MediaQueueItem;
import com.google.android.gms.cast.MediaStatus;
-import java.util.HashMap;
+import com.google.android.gms.cast.framework.media.RemoteMediaClient;
import java.util.HashSet;
-import java.util.List;
/**
- * Creates {@link CastTimeline}s from cast receiver app media status.
+ * Creates {@link CastTimeline CastTimelines} from cast receiver app status updates.
*
* This class keeps track of the duration reported by the current item to fill any missing
* durations in the media queue items [See internal: b/65152553].
*/
/* package */ final class CastTimelineTracker {
- private final HashMap contentIdToDurationUsMap;
- private final HashSet scratchContentIdSet;
+ private final SparseArray itemIdToData;
public CastTimelineTracker() {
- contentIdToDurationUsMap = new HashMap<>();
- scratchContentIdSet = new HashSet<>();
+ itemIdToData = new SparseArray<>();
}
/**
- * Returns a {@link CastTimeline} that represent the given {@code status}.
+ * Returns a {@link CastTimeline} that represents the state of the given {@code
+ * remoteMediaClient}.
*
- * @param status The Cast media status.
- * @return A {@link CastTimeline} that represent the given {@code status}.
+ * Returned timelines may contain values obtained from {@code remoteMediaClient} in previous
+ * invocations of this method.
+ *
+ * @param remoteMediaClient The Cast media client.
+ * @return A {@link CastTimeline} that represents the given {@code remoteMediaClient} status.
*/
- public CastTimeline getCastTimeline(MediaStatus status) {
- MediaInfo mediaInfo = status.getMediaInfo();
- List items = status.getQueueItems();
- removeUnusedDurationEntries(items);
-
- if (mediaInfo != null) {
- String contentId = mediaInfo.getContentId();
- long durationUs = CastUtils.getStreamDurationUs(mediaInfo);
- contentIdToDurationUsMap.put(contentId, durationUs);
+ public CastTimeline getCastTimeline(RemoteMediaClient remoteMediaClient) {
+ int[] itemIds = remoteMediaClient.getMediaQueue().getItemIds();
+ if (itemIds.length > 0) {
+ // Only remove unused items when there is something in the queue to avoid removing all entries
+ // if the remote media client clears the queue temporarily. See [Internal ref: b/128825216].
+ removeUnusedItemDataEntries(itemIds);
}
- return new CastTimeline(items, contentIdToDurationUsMap);
+
+ // TODO: Reset state when the app instance changes [Internal ref: b/129672468].
+ MediaStatus mediaStatus = remoteMediaClient.getMediaStatus();
+ if (mediaStatus == null) {
+ return CastTimeline.EMPTY_CAST_TIMELINE;
+ }
+
+ int currentItemId = mediaStatus.getCurrentItemId();
+ long durationUs = CastUtils.getStreamDurationUs(mediaStatus.getMediaInfo());
+ itemIdToData.put(
+ currentItemId,
+ itemIdToData
+ .get(currentItemId, CastTimeline.ItemData.EMPTY)
+ .copyWithDurationUs(durationUs));
+
+ for (MediaQueueItem item : mediaStatus.getQueueItems()) {
+ int itemId = item.getItemId();
+ itemIdToData.put(
+ itemId,
+ itemIdToData
+ .get(itemId, CastTimeline.ItemData.EMPTY)
+ .copyWithDefaultPositionUs((long) (item.getStartTime() * C.MICROS_PER_SECOND)));
+ }
+
+ return new CastTimeline(itemIds, itemIdToData);
}
- private void removeUnusedDurationEntries(List items) {
- scratchContentIdSet.clear();
- for (MediaQueueItem item : items) {
- scratchContentIdSet.add(item.getMedia().getContentId());
+ private void removeUnusedItemDataEntries(int[] itemIds) {
+ HashSet scratchItemIds = new HashSet<>(/* initialCapacity= */ itemIds.length * 2);
+ for (int id : itemIds) {
+ scratchItemIds.add(id);
+ }
+
+ int index = 0;
+ while (index < itemIdToData.size()) {
+ if (!scratchItemIds.contains(itemIdToData.keyAt(index))) {
+ itemIdToData.removeAt(index);
+ } else {
+ index++;
+ }
}
- contentIdToDurationUsMap.keySet().retainAll(scratchContentIdSet);
}
}
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 997857f6b5..d1660c3306 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
@@ -31,11 +31,13 @@ import com.google.android.gms.cast.MediaTrack;
* unknown or not applicable.
*
* @param mediaInfo The media info to get the duration from.
- * @return The duration in microseconds.
+ * @return The duration in microseconds, or {@link C#TIME_UNSET} if unknown or not applicable.
*/
public static long getStreamDurationUs(MediaInfo mediaInfo) {
- long durationMs =
- mediaInfo != null ? mediaInfo.getStreamDuration() : MediaInfo.UNKNOWN_DURATION;
+ if (mediaInfo == null) {
+ return C.TIME_UNSET;
+ }
+ long durationMs = mediaInfo.getStreamDuration();
return durationMs != MediaInfo.UNKNOWN_DURATION ? C.msToUs(durationMs) : C.TIME_UNSET;
}
@@ -109,6 +111,7 @@ import com.google.android.gms.cast.MediaTrack;
/* codecs= */ null,
/* bitrate= */ Format.NO_VALUE,
/* selectionFlags= */ 0,
+ /* roleFlags= */ 0,
mediaTrack.getLanguage());
}
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
new file mode 100644
index 0000000000..adb8e59070
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
@@ -0,0 +1,368 @@
+/*
+ * 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;
+
+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. */
+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;
+
+ /** Creates an builder with default field values. */
+ public Builder() {
+ clearInternal();
+ }
+
+ /** See {@link MediaItem#uuid}. */
+ public Builder setUuid(UUID uuid) {
+ this.uuid = uuid;
+ return this;
+ }
+
+ /** See {@link MediaItem#title}. */
+ public Builder setTitle(String title) {
+ this.title = title;
+ 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();
+ return this;
+ }
+
+ /**
+ * Returns a new {@link MediaItem} instance with the current builder values. This method also
+ * clears any values passed to {@link #setUuid(UUID)}.
+ */
+ 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 = "";
+ }
+ }
+
+ /** 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 {
+
+ /** 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.
+ */
+ @Nullable public final UriBundle licenseServer;
+
+ /**
+ * Creates an instance.
+ *
+ * @param uuid See {@link #uuid}.
+ * @param licenseServer See {@link #licenseServer}.
+ */
+ public DrmScheme(UUID uuid, @Nullable UriBundle licenseServer) {
+ this.uuid = uuid;
+ this.licenseServer = licenseServer;
+ }
+
+ @Override
+ public boolean equals(@Nullable Object other) {
+ if (this == other) {
+ return true;
+ }
+ if (other == null || getClass() != other.getClass()) {
+ return false;
+ }
+
+ DrmScheme drmScheme = (DrmScheme) other;
+ return uuid.equals(drmScheme.uuid) && Util.areEqual(licenseServer, drmScheme.licenseServer);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = uuid.hashCode();
+ result = 31 * result + (licenseServer != null ? licenseServer.hashCode() : 0);
+ 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 title of the item. The default value is an empty string. */
+ public final String title;
+
+ /** A description for the item. The default value is an empty string. */
+ public final String description;
+
+ /**
+ * A {@link UriBundle} to fetch the media content. The default value is {@link UriBundle#EMPTY}.
+ */
+ public final UriBundle media;
+
+ /**
+ * 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.
+
+ @Override
+ public boolean equals(@Nullable Object other) {
+ if (this == other) {
+ return true;
+ }
+ if (other == null || getClass() != other.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);
+ }
+
+ @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();
+ 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/MediaItemQueue.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemQueue.java
new file mode 100644
index 0000000000..184e347e1c
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemQueue.java
@@ -0,0 +1,85 @@
+/*
+ * 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/SessionAvailabilityListener.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java
new file mode 100644
index 0000000000..c686c496c6
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java
@@ -0,0 +1,26 @@
+/*
+ * 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;
+
+/** Listener of changes in the cast session availability. */
+public interface SessionAvailabilityListener {
+
+ /** Called when a cast session becomes available to the player. */
+ void onCastSessionAvailable();
+
+ /** Called when the cast session becomes unavailable. */
+ void onCastSessionUnavailable();
+}
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
index 4c60e7c0b3..69b25e4456 100644
--- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
+++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
@@ -15,23 +15,23 @@
*/
package com.google.android.exoplayer2.ext.cast;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.TimelineAsserts;
import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.gms.cast.MediaInfo;
-import com.google.android.gms.cast.MediaQueueItem;
import com.google.android.gms.cast.MediaStatus;
-import java.util.ArrayList;
+import com.google.android.gms.cast.framework.media.MediaQueue;
+import com.google.android.gms.cast.framework.media.RemoteMediaClient;
+import java.util.Collections;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
-import org.robolectric.RobolectricTestRunner;
/** Tests for {@link CastTimelineTracker}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
public class CastTimelineTrackerTest {
- private static final long DURATION_1_MS = 1000;
private static final long DURATION_2_MS = 2000;
private static final long DURATION_3_MS = 3000;
private static final long DURATION_4_MS = 4000;
@@ -39,91 +39,89 @@ public class CastTimelineTrackerTest {
/** Tests that duration of the current media info is correctly propagated to the timeline. */
@Test
- public void testGetCastTimeline() {
- MediaInfo mediaInfo;
- MediaStatus status =
- mockMediaStatus(
- new int[] {1, 2, 3},
- new String[] {"contentId1", "contentId2", "contentId3"},
- new long[] {DURATION_1_MS, MediaInfo.UNKNOWN_DURATION, MediaInfo.UNKNOWN_DURATION});
-
+ public void testGetCastTimelinePersistsDuration() {
CastTimelineTracker tracker = new CastTimelineTracker();
- mediaInfo = getMediaInfo("contentId1", DURATION_1_MS);
- Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
- TimelineAsserts.assertPeriodDurations(
- tracker.getCastTimeline(status), C.msToUs(DURATION_1_MS), C.TIME_UNSET, C.TIME_UNSET);
- mediaInfo = getMediaInfo("contentId3", DURATION_3_MS);
- Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
+ RemoteMediaClient remoteMediaClient =
+ mockRemoteMediaClient(
+ /* itemIds= */ new int[] {1, 2, 3, 4, 5},
+ /* currentItemId= */ 2,
+ /* currentDurationMs= */ DURATION_2_MS);
TimelineAsserts.assertPeriodDurations(
- tracker.getCastTimeline(status),
- C.msToUs(DURATION_1_MS),
+ tracker.getCastTimeline(remoteMediaClient),
C.TIME_UNSET,
- C.msToUs(DURATION_3_MS));
+ C.msToUs(DURATION_2_MS),
+ C.TIME_UNSET,
+ C.TIME_UNSET,
+ C.TIME_UNSET);
- mediaInfo = getMediaInfo("contentId2", DURATION_2_MS);
- Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
+ remoteMediaClient =
+ mockRemoteMediaClient(
+ /* itemIds= */ new int[] {1, 2, 3},
+ /* currentItemId= */ 3,
+ /* currentDurationMs= */ DURATION_3_MS);
TimelineAsserts.assertPeriodDurations(
- tracker.getCastTimeline(status),
- C.msToUs(DURATION_1_MS),
+ tracker.getCastTimeline(remoteMediaClient),
+ C.TIME_UNSET,
C.msToUs(DURATION_2_MS),
C.msToUs(DURATION_3_MS));
- MediaStatus newStatus =
- mockMediaStatus(
- new int[] {4, 1, 5, 3},
- new String[] {"contentId4", "contentId1", "contentId5", "contentId3"},
- new long[] {
- MediaInfo.UNKNOWN_DURATION,
- MediaInfo.UNKNOWN_DURATION,
- DURATION_5_MS,
- MediaInfo.UNKNOWN_DURATION
- });
- mediaInfo = getMediaInfo("contentId5", DURATION_5_MS);
- Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
+ remoteMediaClient =
+ mockRemoteMediaClient(
+ /* itemIds= */ new int[] {1, 3},
+ /* currentItemId= */ 3,
+ /* currentDurationMs= */ DURATION_3_MS);
TimelineAsserts.assertPeriodDurations(
- tracker.getCastTimeline(newStatus),
- C.TIME_UNSET,
- C.msToUs(DURATION_1_MS),
- C.msToUs(DURATION_5_MS),
- C.msToUs(DURATION_3_MS));
+ tracker.getCastTimeline(remoteMediaClient), C.TIME_UNSET, C.msToUs(DURATION_3_MS));
- mediaInfo = getMediaInfo("contentId3", DURATION_3_MS);
- Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
+ remoteMediaClient =
+ mockRemoteMediaClient(
+ /* itemIds= */ new int[] {1, 2, 3, 4, 5},
+ /* currentItemId= */ 4,
+ /* currentDurationMs= */ DURATION_4_MS);
TimelineAsserts.assertPeriodDurations(
- tracker.getCastTimeline(newStatus),
+ tracker.getCastTimeline(remoteMediaClient),
C.TIME_UNSET,
- C.msToUs(DURATION_1_MS),
- C.msToUs(DURATION_5_MS),
- C.msToUs(DURATION_3_MS));
-
- mediaInfo = getMediaInfo("contentId4", DURATION_4_MS);
- Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
- TimelineAsserts.assertPeriodDurations(
- tracker.getCastTimeline(newStatus),
+ C.TIME_UNSET,
+ C.msToUs(DURATION_3_MS),
C.msToUs(DURATION_4_MS),
- C.msToUs(DURATION_1_MS),
- C.msToUs(DURATION_5_MS),
- C.msToUs(DURATION_3_MS));
+ C.TIME_UNSET);
+
+ remoteMediaClient =
+ mockRemoteMediaClient(
+ /* itemIds= */ new int[] {1, 2, 3, 4, 5},
+ /* currentItemId= */ 5,
+ /* currentDurationMs= */ DURATION_5_MS);
+ TimelineAsserts.assertPeriodDurations(
+ tracker.getCastTimeline(remoteMediaClient),
+ C.TIME_UNSET,
+ C.TIME_UNSET,
+ C.msToUs(DURATION_3_MS),
+ C.msToUs(DURATION_4_MS),
+ C.msToUs(DURATION_5_MS));
}
- private static MediaStatus mockMediaStatus(
- int[] itemIds, String[] contentIds, long[] durationsMs) {
- ArrayList items = new ArrayList<>();
- for (int i = 0; i < contentIds.length; i++) {
- MediaInfo mediaInfo = getMediaInfo(contentIds[i], durationsMs[i]);
- MediaQueueItem item = Mockito.mock(MediaQueueItem.class);
- Mockito.when(item.getMedia()).thenReturn(mediaInfo);
- Mockito.when(item.getItemId()).thenReturn(itemIds[i]);
- items.add(item);
- }
+ private static RemoteMediaClient mockRemoteMediaClient(
+ int[] itemIds, int currentItemId, long currentDurationMs) {
+ RemoteMediaClient remoteMediaClient = Mockito.mock(RemoteMediaClient.class);
MediaStatus status = Mockito.mock(MediaStatus.class);
- Mockito.when(status.getQueueItems()).thenReturn(items);
- return status;
+ Mockito.when(status.getQueueItems()).thenReturn(Collections.emptyList());
+ Mockito.when(remoteMediaClient.getMediaStatus()).thenReturn(status);
+ Mockito.when(status.getMediaInfo()).thenReturn(getMediaInfo(currentDurationMs));
+ Mockito.when(status.getCurrentItemId()).thenReturn(currentItemId);
+ MediaQueue mediaQueue = mockMediaQueue(itemIds);
+ Mockito.when(remoteMediaClient.getMediaQueue()).thenReturn(mediaQueue);
+ return remoteMediaClient;
}
- private static MediaInfo getMediaInfo(String contentId, long durationMs) {
- return new MediaInfo.Builder(contentId)
+ private static MediaQueue mockMediaQueue(int[] itemIds) {
+ MediaQueue mediaQueue = Mockito.mock(MediaQueue.class);
+ Mockito.when(mediaQueue.getItemIds()).thenReturn(itemIds);
+ return mediaQueue;
+ }
+
+ private static MediaInfo getMediaInfo(long durationMs) {
+ return new MediaInfo.Builder(/*contentId= */ "")
.setStreamDuration(durationMs)
.setContentType(MimeTypes.APPLICATION_MP4)
.setStreamType(MediaInfo.STREAM_TYPE_NONE)
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
new file mode 100644
index 0000000000..9cdc073b06
--- /dev/null
+++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
@@ -0,0 +1,144 @@
+/*
+ * 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;
+
+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.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;
+
+/** Test for {@link MediaItem}. */
+@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")
+ .setTitle("title")
+ .setMimeType(MimeTypes.AUDIO_MP4)
+ .setStartPositionUs(3)
+ .setEndPositionUs(4)
+ .build();
+ MediaItem item2 = builder.setUuid(new UUID(0, 1)).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 mediaItem1 =
+ builder
+ .setUuid(new UUID(0, 1))
+ .setMedia("www.google.com")
+ .setDrmSchemes(createDummyDrmSchemes(1))
+ .buildAndClear();
+ MediaItem mediaItem2 =
+ builder
+ .setUuid(new UUID(0, 1))
+ .setMedia("www.google.com")
+ .setDrmSchemes(createDummyDrmSchemes(1))
+ .buildAndClear();
+ assertThat(mediaItem1).isEqualTo(mediaItem2);
+ }
+
+ @Test
+ public void equals_withDifferentDrmRequestHeaders_returnsFalse() {
+ MediaItem.Builder builder = new MediaItem.Builder();
+ MediaItem mediaItem1 =
+ builder
+ .setUuid(new UUID(0, 1))
+ .setMedia("www.google.com")
+ .setDrmSchemes(createDummyDrmSchemes(1))
+ .buildAndClear();
+ MediaItem mediaItem2 =
+ builder
+ .setUuid(new UUID(0, 1))
+ .setMedia("www.google.com")
+ .setDrmSchemes(createDummyDrmSchemes(2))
+ .buildAndClear();
+ 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);
+ }
+}
diff --git a/extensions/cast/src/test/resources/robolectric.properties b/extensions/cast/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/cast/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/extensions/cronet/README.md b/extensions/cronet/README.md
index f1f6d68c81..dc64b862b6 100644
--- a/extensions/cronet/README.md
+++ b/extensions/cronet/README.md
@@ -2,7 +2,7 @@
The Cronet extension is an [HttpDataSource][] implementation using [Cronet][].
-[HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
+[HttpDataSource]: https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
[Cronet]: https://chromium.googlesource.com/chromium/src/+/master/components/cronet?autodive=0%2F%2F
## Getting the extension ##
@@ -52,4 +52,4 @@ respectively.
* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.cronet.*`
belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index 520edfe1d1..76972a3530 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -16,10 +16,9 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
defaultConfig {
- minSdkVersion 16
+ minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
}
@@ -27,12 +26,14 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
- api 'org.chromium.net:cronet-embedded:71.3578.98'
+ api 'org.chromium.net:cronet-embedded:73.3683.76'
implementation project(modulePrefix + 'library-core')
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+ implementation 'androidx.annotation:annotation:1.0.2'
testImplementation project(modulePrefix + 'library')
testImplementation project(modulePrefix + 'testutils-robolectric')
}
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 ab10f41d8f..a9995af0e4 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
@@ -16,10 +16,11 @@
package com.google.android.exoplayer2.ext.cronet;
import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
+import com.google.android.exoplayer2.metadata.icy.IcyHeaders;
import com.google.android.exoplayer2.upstream.BaseDataSource;
import com.google.android.exoplayer2.upstream.DataSourceException;
import com.google.android.exoplayer2.upstream.DataSpec;
@@ -493,6 +494,11 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
if (dataSpec.httpBody != null && !isContentTypeHeaderSet) {
throw new IOException("HTTP request with non-empty body must set Content-Type");
}
+ if (dataSpec.isFlagSet(DataSpec.FLAG_ALLOW_ICY_METADATA)) {
+ requestBuilder.addHeader(
+ IcyHeaders.REQUEST_HEADER_ENABLE_METADATA_NAME,
+ IcyHeaders.REQUEST_HEADER_ENABLE_METADATA_VALUE);
+ }
// Set the Range header.
if (dataSpec.position != 0 || dataSpec.length != C.LENGTH_UNSET) {
StringBuilder rangeValue = new StringBuilder();
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 d832e4625d..93edb4e893 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2.ext.cronet;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
import com.google.android.exoplayer2.upstream.HttpDataSource;
import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory;
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 829b53f863..270c1f6323 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
@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.ext.cronet;
import android.content.Context;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
diff --git a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
index 117518a1eb..244ba9083b 100644
--- a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
+++ b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Arrays;
@@ -28,10 +29,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
/** Tests for {@link ByteArrayUploadDataProvider}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
public final class ByteArrayUploadDataProviderTest {
private static final byte[] TEST_DATA = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
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 7d47b0da64..7c4c03dd87 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
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
import android.net.Uri;
import android.os.ConditionVariable;
import android.os.SystemClock;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.HttpDataSource;
@@ -62,10 +63,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
/** Tests for {@link CronetDataSource}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
public final class CronetDataSourceTest {
private static final int TEST_CONNECT_TIMEOUT_MS = 100;
diff --git a/extensions/cronet/src/test/resources/robolectric.properties b/extensions/cronet/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/cronet/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md
index 52dacf8166..5b68f1e352 100644
--- a/extensions/ffmpeg/README.md
+++ b/extensions/ffmpeg/README.md
@@ -147,11 +147,11 @@ then implement your own logic to use the renderer for a given track.
[top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
[Android NDK]: https://developer.android.com/tools/sdk/ndk/index.html
[#2781]: https://github.com/google/ExoPlayer/issues/2781
-[Supported formats]: https://google.github.io/ExoPlayer/supported-formats.html#ffmpeg-extension
+[Supported formats]: https://exoplayer.dev/supported-formats.html#ffmpeg-extension
## Links ##
* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.ffmpeg.*`
belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle
index 1630b6f775..ffecdcd16f 100644
--- a/extensions/ffmpeg/build.gradle
+++ b/extensions/ffmpeg/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -33,12 +32,15 @@ android {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
implementation project(modulePrefix + 'library-core')
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+ implementation 'androidx.annotation:annotation:1.0.2'
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
+ testImplementation project(modulePrefix + 'testutils-robolectric')
}
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 f0b30baa8a..c5d80aa32b 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
@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.ext.ffmpeg;
import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.Format;
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 c5b76002fa..7c5864420a 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2.ext.ffmpeg;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
index e5018a49b3..58109c1666 100644
--- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
@@ -15,10 +15,11 @@
*/
package com.google.android.exoplayer2.ext.ffmpeg;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
import com.google.android.exoplayer2.util.LibraryLoader;
+import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.MimeTypes;
/**
@@ -30,6 +31,8 @@ public final class FfmpegLibrary {
ExoPlayerLibraryInfo.registerModule("goog.exo.ffmpeg");
}
+ private static final String TAG = "FfmpegLibrary";
+
private static final LibraryLoader LOADER =
new LibraryLoader("avutil", "avresample", "avcodec", "ffmpeg");
@@ -69,7 +72,14 @@ public final class FfmpegLibrary {
return false;
}
String codecName = getCodecName(mimeType, encoding);
- return codecName != null && ffmpegHasDecoder(codecName);
+ if (codecName == null) {
+ return false;
+ }
+ if (!ffmpegHasDecoder(codecName)) {
+ Log.w(TAG, "No " + codecName + " decoder available. Check the FFmpeg build configuration.");
+ return false;
+ }
+ return true;
}
/**
diff --git a/extensions/ffmpeg/src/test/AndroidManifest.xml b/extensions/ffmpeg/src/test/AndroidManifest.xml
new file mode 100644
index 0000000000..d53bca4ca2
--- /dev/null
+++ b/extensions/ffmpeg/src/test/AndroidManifest.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java b/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
new file mode 100644
index 0000000000..a52d1b1d7a
--- /dev/null
+++ b/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.ffmpeg;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit test for {@link DefaultRenderersFactoryTest} with {@link FfmpegAudioRenderer}. */
+@RunWith(AndroidJUnit4.class)
+public final class DefaultRenderersFactoryTest {
+
+ @Test
+ public void createRenderers_instantiatesVpxRenderer() {
+ DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
+ FfmpegAudioRenderer.class, C.TRACK_TYPE_AUDIO);
+ }
+}
diff --git a/extensions/flac/README.md b/extensions/flac/README.md
index 54701eea1d..78035f4d87 100644
--- a/extensions/flac/README.md
+++ b/extensions/flac/README.md
@@ -95,4 +95,4 @@ player, then implement your own logic to use the renderer for a given track.
* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.flac.*`
belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
index e5261902c6..06a5888404 100644
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -34,13 +33,15 @@ android {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
implementation project(modulePrefix + 'library-core')
- androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
+ implementation 'androidx.annotation:annotation:1.0.2'
androidTestImplementation project(modulePrefix + 'testutils')
+ androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
testImplementation project(modulePrefix + 'testutils-robolectric')
}
diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml
index cfc90117ac..39b92aa217 100644
--- a/extensions/flac/src/androidTest/AndroidManifest.xml
+++ b/extensions/flac/src/androidTest/AndroidManifest.xml
@@ -18,6 +18,9 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.google.android.exoplayer2.ext.flac.test">
+
+
+
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 f8e61a0609..435279fc45 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
@@ -16,22 +16,26 @@
package com.google.android.exoplayer2.ext.flac;
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
-import android.test.InstrumentationTestCase;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.testutil.FakeExtractorInput;
import com.google.android.exoplayer2.testutil.TestUtil;
import java.io.IOException;
+import org.junit.Before;
+import org.junit.runner.RunWith;
/** Unit test for {@link FlacBinarySearchSeeker}. */
-public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase {
+@RunWith(AndroidJUnit4.class)
+public final class FlacBinarySearchSeekerTest {
private static final String NOSEEKTABLE_FLAC = "bear_no_seek.flac";
private static final int DURATION_US = 2_741_000;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() {
if (!FlacLibrary.isAvailable()) {
fail("Flac library not available.");
}
@@ -39,7 +43,8 @@ public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase {
public void testGetSeekMap_returnsSeekMapWithCorrectDuration()
throws IOException, FlacDecoderException, InterruptedException {
- byte[] data = TestUtil.getByteArray(getInstrumentation().getContext(), NOSEEKTABLE_FLAC);
+ byte[] data =
+ TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), NOSEEKTABLE_FLAC);
FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
FlacDecoderJni decoderJni = new FlacDecoderJni();
@@ -57,7 +62,8 @@ public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase {
public void testSetSeekTargetUs_returnsSeekPending()
throws IOException, FlacDecoderException, InterruptedException {
- byte[] data = TestUtil.getByteArray(getInstrumentation().getContext(), NOSEEKTABLE_FLAC);
+ byte[] data =
+ TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), NOSEEKTABLE_FLAC);
FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
FlacDecoderJni decoderJni = new FlacDecoderJni();
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 58ab260277..6008d99448 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
@@ -16,11 +16,13 @@
package com.google.android.exoplayer2.ext.flac;
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
import android.content.Context;
import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.test.InstrumentationTestCase;
+import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
import com.google.android.exoplayer2.extractor.Extractor;
@@ -38,9 +40,12 @@ import com.google.android.exoplayer2.util.Util;
import java.io.IOException;
import java.util.List;
import java.util.Random;
+import org.junit.Before;
+import org.junit.runner.RunWith;
/** Seeking tests for {@link FlacExtractor} when the FLAC stream does not have a SEEKTABLE. */
-public final class FlacExtractorSeekTest extends InstrumentationTestCase {
+@RunWith(AndroidJUnit4.class)
+public final class FlacExtractorSeekTest {
private static final String NO_SEEKTABLE_FLAC = "bear_no_seek.flac";
private static final int DURATION_US = 2_741_000;
@@ -54,18 +59,18 @@ public final class FlacExtractorSeekTest extends InstrumentationTestCase {
private PositionHolder positionHolder;
private long totalInputLength;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
if (!FlacLibrary.isAvailable()) {
fail("Flac library not available.");
}
expectedOutput = new FakeExtractorOutput();
- extractAllSamplesFromFileToExpectedOutput(getInstrumentation().getContext(), NO_SEEKTABLE_FLAC);
+ extractAllSamplesFromFileToExpectedOutput(
+ ApplicationProvider.getApplicationContext(), NO_SEEKTABLE_FLAC);
expectedTrackOutput = expectedOutput.trackOutputs.get(0);
dataSource =
- new DefaultDataSourceFactory(getInstrumentation().getContext(), "UserAgent")
+ new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
.createDataSource();
totalInputLength = readInputLength();
positionHolder = new PositionHolder();
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 29a597daa4..d9cbac6ad5 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
@@ -15,17 +15,20 @@
*/
package com.google.android.exoplayer2.ext.flac;
-import android.test.InstrumentationTestCase;
+import static org.junit.Assert.fail;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
+import org.junit.Before;
+import org.junit.runner.RunWith;
-/**
- * Unit test for {@link FlacExtractor}.
- */
-public class FlacExtractorTest extends InstrumentationTestCase {
+/** Unit test for {@link FlacExtractor}. */
+@RunWith(AndroidJUnit4.class)
+public class FlacExtractorTest {
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
if (!FlacLibrary.isAvailable()) {
fail("Flac library not available.");
}
@@ -33,11 +36,11 @@ public class FlacExtractorTest extends InstrumentationTestCase {
public void testExtractFlacSample() throws Exception {
ExtractorAsserts.assertBehavior(
- FlacExtractor::new, "bear.flac", getInstrumentation().getContext());
+ FlacExtractor::new, "bear.flac", ApplicationProvider.getApplicationContext());
}
public void testExtractFlacSampleWithId3Header() throws Exception {
ExtractorAsserts.assertBehavior(
- FlacExtractor::new, "bear_with_id3.flac", getInstrumentation().getContext());
+ FlacExtractor::new, "bear_with_id3.flac", ApplicationProvider.getApplicationContext());
}
}
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 99ddba55c4..1cd9483178 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
@@ -15,21 +15,21 @@
*/
package com.google.android.exoplayer2.ext.flac;
-import static androidx.test.InstrumentationRegistry.getContext;
import static org.junit.Assert.fail;
import android.content.Context;
import android.net.Uri;
import android.os.Looper;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.ExoPlayerFactory;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import org.junit.Before;
@@ -56,7 +56,7 @@ public class FlacPlaybackTest {
private void playUri(String uri) throws Exception {
TestPlaybackRunnable testPlaybackRunnable =
- new TestPlaybackRunnable(Uri.parse(uri), getContext());
+ new TestPlaybackRunnable(Uri.parse(uri), ApplicationProvider.getApplicationContext());
Thread thread = new Thread(testPlaybackRunnable);
thread.start();
thread.join();
@@ -83,12 +83,12 @@ public class FlacPlaybackTest {
Looper.prepare();
LibflacAudioRenderer audioRenderer = new LibflacAudioRenderer();
DefaultTrackSelector trackSelector = new DefaultTrackSelector();
- player = ExoPlayerFactory.newInstance(new Renderer[] {audioRenderer}, trackSelector);
+ player = ExoPlayerFactory.newInstance(context, new Renderer[] {audioRenderer}, trackSelector);
player.addListener(this);
MediaSource mediaSource =
- new ExtractorMediaSource.Factory(
- new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"))
- .setExtractorsFactory(MatroskaExtractor.FACTORY)
+ new ProgressiveMediaSource.Factory(
+ new DefaultDataSourceFactory(context, "ExoPlayerExtFlacTest"),
+ MatroskaExtractor.FACTORY)
.createMediaSource(uri);
player.prepare(mediaSource);
player.setPlayWhenReady(true);
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 8f5dcef16b..bb72e114fe 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
@@ -17,8 +17,8 @@ package com.google.android.exoplayer2.ext.flac;
import static com.google.android.exoplayer2.util.Util.getPcmEncoding;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+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;
@@ -94,7 +94,7 @@ public final class FlacExtractor implements Extractor {
/** Constructs an instance with flags = 0. */
public FlacExtractor() {
- this(0);
+ this(/* flags= */ 0);
}
/**
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 424fcbb285..ac7646cc4b 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
@@ -42,7 +42,9 @@ public class LibflacAudioRenderer extends SimpleDecoderAudioRenderer {
* @param eventListener A listener of events. May be null if delivery of events is not required.
* @param audioProcessors Optional {@link AudioProcessor}s that will process audio before output.
*/
- public LibflacAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
+ public LibflacAudioRenderer(
+ Handler eventHandler,
+ AudioRendererEventListener eventListener,
AudioProcessor... audioProcessors) {
super(eventHandler, eventListener, audioProcessors);
}
diff --git a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultExtractorsFactoryTest.java b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultExtractorsFactoryTest.java
index 79c4452928..611197bbe5 100644
--- a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultExtractorsFactoryTest.java
+++ b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultExtractorsFactoryTest.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.ext.flac;
import static com.google.common.truth.Truth.assertThat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.amr.AmrExtractor;
@@ -27,6 +28,7 @@ import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor;
import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
import com.google.android.exoplayer2.extractor.ogg.OggExtractor;
import com.google.android.exoplayer2.extractor.ts.Ac3Extractor;
+import com.google.android.exoplayer2.extractor.ts.Ac4Extractor;
import com.google.android.exoplayer2.extractor.ts.AdtsExtractor;
import com.google.android.exoplayer2.extractor.ts.PsExtractor;
import com.google.android.exoplayer2.extractor.ts.TsExtractor;
@@ -35,10 +37,9 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link DefaultExtractorsFactory}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
public final class DefaultExtractorsFactoryTest {
@Test
@@ -59,6 +60,7 @@ public final class DefaultExtractorsFactoryTest {
Mp3Extractor.class,
AdtsExtractor.class,
Ac3Extractor.class,
+ Ac4Extractor.class,
TsExtractor.class,
FlvExtractor.class,
OggExtractor.class,
diff --git a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
new file mode 100644
index 0000000000..fb20ff1114
--- /dev/null
+++ b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.flac;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */
+@RunWith(AndroidJUnit4.class)
+public final class DefaultRenderersFactoryTest {
+
+ @Test
+ public void createRenderers_instantiatesVpxRenderer() {
+ DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
+ LibflacAudioRenderer.class, C.TRACK_TYPE_AUDIO);
+ }
+}
diff --git a/extensions/flac/src/test/resources/robolectric.properties b/extensions/flac/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/flac/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/extensions/gvr/README.md b/extensions/gvr/README.md
index 5dab885436..1874ff77d7 100644
--- a/extensions/gvr/README.md
+++ b/extensions/gvr/README.md
@@ -37,4 +37,4 @@ locally. Instructions for doing this can be found in ExoPlayer's
* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.gvr.*`
belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle
index 234f551896..50acd6c040 100644
--- a/extensions/gvr/build.gradle
+++ b/extensions/gvr/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -27,11 +26,14 @@ android {
minSdkVersion 19
targetSdkVersion project.ext.targetSdkVersion
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
implementation project(modulePrefix + 'library-core')
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+ implementation project(modulePrefix + 'library-ui')
+ implementation 'androidx.annotation:annotation:1.0.2'
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/GvrAudioProcessor.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
index eca31c98e4..02e4328ec7 100644
--- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2.ext.gvr;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
import com.google.android.exoplayer2.Format;
@@ -38,9 +38,11 @@ public final class GvrAudioProcessor implements AudioProcessor {
private static final int FRAMES_PER_OUTPUT_BUFFER = 1024;
private static final int OUTPUT_CHANNEL_COUNT = 2;
private static final int OUTPUT_FRAME_SIZE = OUTPUT_CHANNEL_COUNT * 2; // 16-bit stereo output.
+ private static final int NO_SURROUND_FORMAT = GvrAudioSurround.SurroundFormat.INVALID;
private int sampleRateHz;
private int channelCount;
+ private int pendingGvrAudioSurroundFormat;
@Nullable private GvrAudioSurround gvrAudioSurround;
private ByteBuffer buffer;
private boolean inputEnded;
@@ -57,6 +59,7 @@ public final class GvrAudioProcessor implements AudioProcessor {
sampleRateHz = Format.NO_VALUE;
channelCount = Format.NO_VALUE;
buffer = EMPTY_BUFFER;
+ pendingGvrAudioSurroundFormat = NO_SURROUND_FORMAT;
}
/**
@@ -92,33 +95,28 @@ public final class GvrAudioProcessor implements AudioProcessor {
}
this.sampleRateHz = sampleRateHz;
this.channelCount = channelCount;
- maybeReleaseGvrAudioSurround();
- int surroundFormat;
switch (channelCount) {
case 1:
- surroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_MONO;
+ pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_MONO;
break;
case 2:
- surroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_STEREO;
+ pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_STEREO;
break;
case 4:
- surroundFormat = GvrAudioSurround.SurroundFormat.FIRST_ORDER_AMBISONICS;
+ pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.FIRST_ORDER_AMBISONICS;
break;
case 6:
- surroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_FIVE_DOT_ONE;
+ pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.SURROUND_FIVE_DOT_ONE;
break;
case 9:
- surroundFormat = GvrAudioSurround.SurroundFormat.SECOND_ORDER_AMBISONICS;
+ pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.SECOND_ORDER_AMBISONICS;
break;
case 16:
- surroundFormat = GvrAudioSurround.SurroundFormat.THIRD_ORDER_AMBISONICS;
+ pendingGvrAudioSurroundFormat = GvrAudioSurround.SurroundFormat.THIRD_ORDER_AMBISONICS;
break;
default:
throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
}
- gvrAudioSurround = new GvrAudioSurround(surroundFormat, sampleRateHz, channelCount,
- FRAMES_PER_OUTPUT_BUFFER);
- gvrAudioSurround.updateNativeOrientation(w, x, y, z);
if (buffer == EMPTY_BUFFER) {
buffer = ByteBuffer.allocateDirect(FRAMES_PER_OUTPUT_BUFFER * OUTPUT_FRAME_SIZE)
.order(ByteOrder.nativeOrder());
@@ -128,7 +126,7 @@ public final class GvrAudioProcessor implements AudioProcessor {
@Override
public boolean isActive() {
- return gvrAudioSurround != null;
+ return pendingGvrAudioSurroundFormat != NO_SURROUND_FORMAT || gvrAudioSurround != null;
}
@Override
@@ -156,14 +154,17 @@ public final class GvrAudioProcessor implements AudioProcessor {
@Override
public void queueEndOfStream() {
- Assertions.checkNotNull(gvrAudioSurround);
+ if (gvrAudioSurround != null) {
+ gvrAudioSurround.triggerProcessing();
+ }
inputEnded = true;
- gvrAudioSurround.triggerProcessing();
}
@Override
public ByteBuffer getOutput() {
- Assertions.checkNotNull(gvrAudioSurround);
+ if (gvrAudioSurround == null) {
+ return EMPTY_BUFFER;
+ }
int writtenBytes = gvrAudioSurround.getOutput(buffer, 0, buffer.capacity());
buffer.position(0).limit(writtenBytes);
return buffer;
@@ -171,13 +172,20 @@ public final class GvrAudioProcessor implements AudioProcessor {
@Override
public boolean isEnded() {
- Assertions.checkNotNull(gvrAudioSurround);
- return inputEnded && gvrAudioSurround.getAvailableOutputSize() == 0;
+ return inputEnded
+ && (gvrAudioSurround == null || gvrAudioSurround.getAvailableOutputSize() == 0);
}
@Override
public void flush() {
- if (gvrAudioSurround != null) {
+ if (pendingGvrAudioSurroundFormat != NO_SURROUND_FORMAT) {
+ maybeReleaseGvrAudioSurround();
+ gvrAudioSurround =
+ new GvrAudioSurround(
+ pendingGvrAudioSurroundFormat, sampleRateHz, channelCount, FRAMES_PER_OUTPUT_BUFFER);
+ gvrAudioSurround.updateNativeOrientation(w, x, y, z);
+ pendingGvrAudioSurroundFormat = NO_SURROUND_FORMAT;
+ } else if (gvrAudioSurround != null) {
gvrAudioSurround.flush();
}
inputEnded = false;
@@ -191,13 +199,13 @@ public final class GvrAudioProcessor implements AudioProcessor {
sampleRateHz = Format.NO_VALUE;
channelCount = Format.NO_VALUE;
buffer = EMPTY_BUFFER;
+ pendingGvrAudioSurroundFormat = NO_SURROUND_FORMAT;
}
private void maybeReleaseGvrAudioSurround() {
- if (this.gvrAudioSurround != null) {
- GvrAudioSurround gvrAudioSurround = this.gvrAudioSurround;
- this.gvrAudioSurround = null;
+ if (gvrAudioSurround != null) {
gvrAudioSurround.release();
+ gvrAudioSurround = null;
}
}
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
new file mode 100644
index 0000000000..2c912c17f2
--- /dev/null
+++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
@@ -0,0 +1,355 @@
+/*
+ * 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.gvr;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.SurfaceTexture;
+import android.opengl.Matrix;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import androidx.annotation.BinderThread;
+import androidx.annotation.CallSuper;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import android.view.ContextThemeWrapper;
+import android.view.MotionEvent;
+import android.view.Surface;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.ui.PlayerControlView;
+import com.google.android.exoplayer2.ui.spherical.GlViewGroup;
+import com.google.android.exoplayer2.ui.spherical.PointerRenderer;
+import com.google.android.exoplayer2.ui.spherical.SceneRenderer;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
+import com.google.vr.ndk.base.DaydreamApi;
+import com.google.vr.sdk.base.AndroidCompat;
+import com.google.vr.sdk.base.Eye;
+import com.google.vr.sdk.base.GvrActivity;
+import com.google.vr.sdk.base.GvrView;
+import com.google.vr.sdk.base.HeadTransform;
+import com.google.vr.sdk.base.Viewport;
+import com.google.vr.sdk.controller.Controller;
+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. */
+public abstract class GvrPlayerActivity extends GvrActivity {
+
+ private static final int EXIT_FROM_VR_REQUEST_CODE = 42;
+
+ 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;
+
+ public GvrPlayerActivity() {
+ mainHandler = new Handler(Looper.getMainLooper());
+ }
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setScreenAlwaysOn(true);
+
+ GvrView gvrView = new GvrView(this);
+ // Since videos typically have fewer pixels per degree than the phones, reducing the render
+ // target scaling factor reduces the work required to render the scene.
+ gvrView.setRenderTargetScale(.5f);
+
+ // If a custom theme isn't specified, the Context's theme is used. For VR Activities, this is
+ // the old Android default theme rather than a modern theme. Override this with a custom theme.
+ Context theme = new ContextThemeWrapper(this, R.style.VrTheme);
+ glView = new GlViewGroup(theme, R.layout.vr_ui);
+
+ playerControl = Assertions.checkNotNull(glView.findViewById(R.id.controller));
+ playerControl.setShowVrButton(true);
+ playerControl.setVrButtonListener(v -> exit());
+
+ PointerRenderer pointerRenderer = new PointerRenderer();
+ scene = new SceneRenderer();
+ Renderer renderer = new Renderer(scene, glView, pointerRenderer);
+
+ // Attach glView to gvrView in order to properly handle UI events.
+ gvrView.addView(glView, 0);
+
+ // Standard GvrView configuration
+ gvrView.setEGLConfigChooser(
+ 8, 8, 8, 8, // RGBA bits.
+ 16, // Depth bits.
+ 0); // Stencil bits.
+ gvrView.setRenderer(renderer);
+ setContentView(gvrView);
+
+ // Most Daydream phones can render a 4k video at 60fps in sustained performance mode. These
+ // options can be tweaked along with the render target scale.
+ if (gvrView.setAsyncReprojectionEnabled(true)) {
+ AndroidCompat.setSustainedPerformanceMode(this, true);
+ }
+
+ // Handle the user clicking on the 'X' in the top left corner. Since this is done when the user
+ // has taken the headset out of VR, it should launch the app's exit flow directly rather than
+ // using the transition flow.
+ gvrView.setOnCloseButtonListener(this::finish);
+
+ ControllerManager.EventListener listener =
+ new ControllerManager.EventListener() {
+ @Override
+ public void onApiStatusChanged(int status) {
+ // Do nothing.
+ }
+
+ @Override
+ public void onRecentered() {
+ // TODO if in cardboard mode call gvrView.recenterHeadTracker();
+ glView.post(() -> Util.castNonNull(playerControl).show());
+ }
+ };
+ controllerManager = new ControllerManager(this, listener);
+
+ Controller controller = controllerManager.getController();
+ ControllerEventListener controllerEventListener =
+ new ControllerEventListener(controller, pointerRenderer, glView);
+ controller.setEventListener(controllerEventListener);
+ }
+
+ /**
+ * Sets the {@link Player} to use.
+ *
+ * @param newPlayer The {@link Player} to use, or {@code null} to detach the current player.
+ */
+ protected void setPlayer(@Nullable Player newPlayer) {
+ Assertions.checkNotNull(scene);
+ if (player == newPlayer) {
+ return;
+ }
+ if (player != null) {
+ Player.VideoComponent videoComponent = player.getVideoComponent();
+ if (videoComponent != null) {
+ if (surface != null) {
+ videoComponent.clearVideoSurface(surface);
+ }
+ videoComponent.clearVideoFrameMetadataListener(scene);
+ videoComponent.clearCameraMotionListener(scene);
+ }
+ }
+ player = newPlayer;
+ if (player != null) {
+ Player.VideoComponent videoComponent = player.getVideoComponent();
+ if (videoComponent != null) {
+ videoComponent.setVideoFrameMetadataListener(scene);
+ videoComponent.setCameraMotionListener(scene);
+ videoComponent.setVideoSurface(surface);
+ }
+ }
+ Assertions.checkNotNull(playerControl).setPlayer(player);
+ }
+
+ /**
+ * Sets the default stereo mode. If the played video doesn't contain a stereo mode the default one
+ * is used.
+ *
+ * @param stereoMode A {@link C.StereoMode} value.
+ */
+ protected void setDefaultStereoMode(@C.StereoMode int stereoMode) {
+ Assertions.checkNotNull(scene).setDefaultStereoMode(stereoMode);
+ }
+
+ @CallSuper
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent unused) {
+ if (requestCode == EXIT_FROM_VR_REQUEST_CODE && resultCode == RESULT_OK) {
+ finish();
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ Util.castNonNull(controllerManager).start();
+ }
+
+ @Override
+ protected void onPause() {
+ Util.castNonNull(controllerManager).stop();
+ super.onPause();
+ }
+
+ @Override
+ protected void onDestroy() {
+ setPlayer(null);
+ releaseSurface(surfaceTexture, surface);
+ super.onDestroy();
+ }
+
+ /** Tries to exit gracefully from VR using a VR transition dialog. */
+ @SuppressWarnings("nullness:argument.type.incompatible")
+ protected void exit() {
+ // This needs to use GVR's exit transition to avoid disorienting the user.
+ DaydreamApi api = DaydreamApi.create(this);
+ if (api != null) {
+ api.exitFromVr(this, EXIT_FROM_VR_REQUEST_CODE, null);
+ // Eventually, the Activity's onActivityResult will be called.
+ api.close();
+ } else {
+ finish();
+ }
+ }
+
+ /** Toggles PlayerControl visibility. */
+ @UiThread
+ protected void togglePlayerControlVisibility() {
+ if (Assertions.checkNotNull(playerControl).isVisible()) {
+ playerControl.hide();
+ } else {
+ playerControl.show();
+ }
+ }
+
+ // Called on GL thread.
+ private void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture) {
+ mainHandler.post(
+ () -> {
+ SurfaceTexture oldSurfaceTexture = this.surfaceTexture;
+ Surface oldSurface = this.surface;
+ this.surfaceTexture = surfaceTexture;
+ this.surface = new Surface(surfaceTexture);
+ if (player != null) {
+ Player.VideoComponent videoComponent = player.getVideoComponent();
+ if (videoComponent != null) {
+ videoComponent.setVideoSurface(surface);
+ }
+ }
+ releaseSurface(oldSurfaceTexture, oldSurface);
+ });
+ }
+
+ private static void releaseSurface(
+ @Nullable SurfaceTexture oldSurfaceTexture, @Nullable Surface oldSurface) {
+ if (oldSurfaceTexture != null) {
+ oldSurfaceTexture.release();
+ }
+ if (oldSurface != null) {
+ oldSurface.release();
+ }
+ }
+
+ private class Renderer implements GvrView.StereoRenderer {
+ private static final float Z_NEAR = .1f;
+ private static final float Z_FAR = 100;
+
+ private final float[] viewProjectionMatrix = new float[16];
+ private final SceneRenderer scene;
+ private final GlViewGroup glView;
+ private final PointerRenderer pointerRenderer;
+
+ public Renderer(SceneRenderer scene, GlViewGroup glView, PointerRenderer pointerRenderer) {
+ this.scene = scene;
+ this.glView = glView;
+ this.pointerRenderer = pointerRenderer;
+ }
+
+ @Override
+ public void onNewFrame(HeadTransform headTransform) {}
+
+ @Override
+ public void onDrawEye(Eye eye) {
+ Matrix.multiplyMM(
+ viewProjectionMatrix, 0, eye.getPerspective(Z_NEAR, Z_FAR), 0, eye.getEyeView(), 0);
+ scene.drawFrame(viewProjectionMatrix, eye.getType() == Eye.Type.RIGHT);
+ if (glView.isVisible()) {
+ glView.getRenderer().draw(viewProjectionMatrix);
+ pointerRenderer.draw(viewProjectionMatrix);
+ }
+ }
+
+ @Override
+ public void onFinishFrame(Viewport viewport) {}
+
+ @Override
+ public void onSurfaceCreated(EGLConfig config) {
+ onSurfaceTextureAvailable(scene.init());
+ glView.getRenderer().init();
+ pointerRenderer.init();
+ }
+
+ @Override
+ public void onSurfaceChanged(int width, int height) {}
+
+ @Override
+ public void onRendererShutdown() {
+ glView.getRenderer().shutdown();
+ pointerRenderer.shutdown();
+ scene.shutdown();
+ }
+ }
+
+ private class ControllerEventListener extends Controller.EventListener {
+
+ private final Controller controller;
+ private final PointerRenderer pointerRenderer;
+ private final GlViewGroup glView;
+ private final float[] controllerOrientationMatrix;
+ private boolean clickButtonDown;
+ private boolean appButtonDown;
+
+ public ControllerEventListener(
+ Controller controller, PointerRenderer pointerRenderer, GlViewGroup glView) {
+ this.controller = controller;
+ this.pointerRenderer = pointerRenderer;
+ this.glView = glView;
+ controllerOrientationMatrix = new float[16];
+ }
+
+ @Override
+ @BinderThread
+ public void onUpdate() {
+ controller.update();
+ controller.orientation.toRotationMatrix(controllerOrientationMatrix);
+ pointerRenderer.setControllerOrientation(controllerOrientationMatrix);
+
+ if (clickButtonDown || controller.clickButtonState) {
+ int action;
+ if (clickButtonDown != controller.clickButtonState) {
+ clickButtonDown = controller.clickButtonState;
+ action = clickButtonDown ? MotionEvent.ACTION_DOWN : MotionEvent.ACTION_UP;
+ } else {
+ action = MotionEvent.ACTION_MOVE;
+ }
+ glView.post(
+ () -> {
+ float[] angles = controller.orientation.toYawPitchRollRadians(new float[3]);
+ boolean clickedOnView = glView.simulateClick(action, angles[0], angles[1]);
+ if (action == MotionEvent.ACTION_DOWN && !clickedOnView) {
+ togglePlayerControlVisibility();
+ }
+ });
+ } else if (!appButtonDown && controller.appButtonState) {
+ glView.post(GvrPlayerActivity.this::togglePlayerControlVisibility);
+ }
+ appButtonDown = controller.appButtonState;
+ }
+ }
+}
diff --git a/extensions/gvr/src/main/res/layout/vr_ui.xml b/extensions/gvr/src/main/res/layout/vr_ui.xml
new file mode 100644
index 0000000000..e84ee31fe6
--- /dev/null
+++ b/extensions/gvr/src/main/res/layout/vr_ui.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
diff --git a/demos/main/src/main/res/layout/start_download_dialog.xml b/extensions/gvr/src/main/res/values-v21/styles.xml
similarity index 77%
rename from demos/main/src/main/res/layout/start_download_dialog.xml
rename to extensions/gvr/src/main/res/values-v21/styles.xml
index acb9af5d97..276db1b42d 100644
--- a/demos/main/src/main/res/layout/start_download_dialog.xml
+++ b/extensions/gvr/src/main/res/values-v21/styles.xml
@@ -13,7 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
+
+
diff --git a/extensions/gvr/src/main/res/values/styles.xml b/extensions/gvr/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..ab5fde106a
--- /dev/null
+++ b/extensions/gvr/src/main/res/values/styles.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/extensions/ima/README.md b/extensions/ima/README.md
index e13cd85590..4ed6a5428a 100644
--- a/extensions/ima/README.md
+++ b/extensions/ima/README.md
@@ -5,7 +5,7 @@ The IMA extension is an [AdsLoader][] implementation wrapping the
alongside content.
[IMA]: https://developers.google.com/interactive-media-ads/docs/sdks/android/
-[AdsLoader]: https://google.github.io/ExoPlayer/doc/reference/index.html?com/google/android/exoplayer2/source/ads/AdsLoader.html
+[AdsLoader]: https://exoplayer.dev/doc/reference/index.html?com/google/android/exoplayer2/source/ads/AdsLoader.html
## Getting the extension ##
@@ -61,4 +61,4 @@ playback.
* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.ima.*`
belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index 4d6302c898..a91bbbd981 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -28,23 +27,14 @@ android {
targetSdkVersion project.ext.targetSdkVersion
consumerProguardFiles 'proguard-rules.txt'
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
- api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.6'
+ api 'com.google.ads.interactivemedia.v3:interactivemedia:3.11.2'
implementation project(modulePrefix + 'library-core')
- implementation 'com.google.android.gms:play-services-ads:17.1.2'
- // These dependencies are necessary to force the supportLibraryVersion of
- // com.android.support:support-v4 and com.android.support:customtabs to be
- // used. Else older versions are used, for example via:
- // com.google.android.gms:play-services-ads:17.1.2
- // |-- com.android.support:customtabs:26.1.0
- implementation 'com.android.support:support-v4:' + supportLibraryVersion
- implementation 'com.android.support:customtabs:' + supportLibraryVersion
- testImplementation 'com.google.truth:truth:' + truthVersion
- testImplementation 'junit:junit:' + junitVersion
- testImplementation 'org.mockito:mockito-core:' + mockitoVersion
- testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+ implementation 'com.google.android.gms:play-services-ads-identifier:16.0.0'
testImplementation project(modulePrefix + 'testutils-robolectric')
}
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 3aeefb5441..465ad51ac5 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
@@ -19,8 +19,9 @@ import android.content.Context;
import android.net.Uri;
import android.os.Looper;
import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import android.view.View;
import android.view.ViewGroup;
import com.google.ads.interactivemedia.v3.api.Ad;
@@ -216,7 +217,7 @@ public final class ImaAdsLoader
return this;
}
- // @VisibleForTesting
+ @VisibleForTesting
/* package */ Builder setImaFactory(ImaFactory imaFactory) {
this.imaFactory = Assertions.checkNotNull(imaFactory);
return this;
@@ -755,7 +756,8 @@ public final class ImaAdsLoader
// until MAXIMUM_PRELOAD_DURATION_MS before the ad so that an ad group load error delivered
// just after an ad group isn't incorrectly attributed to the next ad group.
int nextAdGroupIndex =
- adPlaybackState.getAdGroupIndexAfterPositionUs(C.msToUs(contentPositionMs));
+ adPlaybackState.getAdGroupIndexAfterPositionUs(
+ C.msToUs(contentPositionMs), C.msToUs(contentDurationMs));
if (nextAdGroupIndex != expectedAdGroupIndex && nextAdGroupIndex != C.INDEX_UNSET) {
long nextAdGroupTimeMs = C.usToMs(adPlaybackState.adGroupTimesUs[nextAdGroupIndex]);
if (nextAdGroupTimeMs == C.TIME_END_OF_SOURCE) {
@@ -1389,7 +1391,7 @@ public final class ImaAdsLoader
}
/** Factory for objects provided by the IMA SDK. */
- // @VisibleForTesting
+ @VisibleForTesting
/* package */ interface ImaFactory {
/** @see ImaSdkSettings */
ImaSdkSettings createImaSdkSettings();
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 dabae2de4b..1e1935c63a 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
@@ -22,10 +22,12 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.ads.interactivemedia.v3.api.Ad;
import com.google.ads.interactivemedia.v3.api.AdDisplayContainer;
import com.google.ads.interactivemedia.v3.api.AdEvent;
@@ -54,11 +56,9 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
/** Test for {@link ImaAdsLoader}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
public class ImaAdsLoaderTest {
private static final long CONTENT_DURATION_US = 10 * C.MICROS_PER_SECOND;
@@ -95,8 +95,8 @@ public class ImaAdsLoaderTest {
adDisplayContainer,
fakeAdsRequest,
fakeAdsLoader);
- adViewGroup = new FrameLayout(RuntimeEnvironment.application);
- adOverlayView = new View(RuntimeEnvironment.application);
+ adViewGroup = new FrameLayout(ApplicationProvider.getApplicationContext());
+ adOverlayView = new View(ApplicationProvider.getApplicationContext());
adViewProvider =
new AdsLoader.AdViewProvider() {
@Override
@@ -237,7 +237,7 @@ public class ImaAdsLoaderTest {
adsLoaderListener = new TestAdsLoaderListener(fakeExoPlayer, contentTimeline, adDurationsUs);
when(adsManager.getAdCuePoints()).thenReturn(Arrays.asList(cuePoints));
imaAdsLoader =
- new ImaAdsLoader.Builder(RuntimeEnvironment.application)
+ new ImaAdsLoader.Builder(ApplicationProvider.getApplicationContext())
.setImaFactory(testImaFactory)
.setImaSdkSettings(imaSdkSettings)
.buildForAdTag(TEST_URI);
diff --git a/extensions/ima/src/test/resources/robolectric.properties b/extensions/ima/src/test/resources/robolectric.properties
deleted file mode 100644
index 2f3210368e..0000000000
--- a/extensions/ima/src/test/resources/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-manifest=src/test/AndroidManifest.xml
diff --git a/extensions/jobdispatcher/build.gradle b/extensions/jobdispatcher/build.gradle
index a0e3f8e0c8..d7f19d2545 100644
--- a/extensions/jobdispatcher/build.gradle
+++ b/extensions/jobdispatcher/build.gradle
@@ -18,7 +18,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -29,6 +28,8 @@ android {
minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
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 b7818546f9..d79dead0d7 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
@@ -57,6 +57,7 @@ import com.google.android.exoplayer2.util.Util;
*/
public final class JobDispatcherScheduler implements Scheduler {
+ private static final boolean DEBUG = false;
private static final String TAG = "JobDispatcherScheduler";
private static final String KEY_SERVICE_ACTION = "service_action";
private static final String KEY_SERVICE_PACKAGE = "service_package";
@@ -78,8 +79,8 @@ public final class JobDispatcherScheduler implements Scheduler {
}
@Override
- public boolean schedule(Requirements requirements, String serviceAction, String servicePackage) {
- Job job = buildJob(jobDispatcher, requirements, jobTag, serviceAction, servicePackage);
+ public boolean schedule(Requirements requirements, String servicePackage, String serviceAction) {
+ Job job = buildJob(jobDispatcher, requirements, jobTag, servicePackage, serviceAction);
int result = jobDispatcher.schedule(job);
logd("Scheduling job: " + jobTag + " result: " + result);
return result == FirebaseJobDispatcher.SCHEDULE_RESULT_SUCCESS;
@@ -96,26 +97,18 @@ public final class JobDispatcherScheduler implements Scheduler {
FirebaseJobDispatcher dispatcher,
Requirements requirements,
String tag,
- String serviceAction,
- String servicePackage) {
+ String servicePackage,
+ String serviceAction) {
Job.Builder builder =
dispatcher
.newJobBuilder()
.setService(JobDispatcherSchedulerService.class) // the JobService that will be called
.setTag(tag);
- switch (requirements.getRequiredNetworkType()) {
- case Requirements.NETWORK_TYPE_NONE:
- // do nothing.
- break;
- case Requirements.NETWORK_TYPE_ANY:
- builder.addConstraint(Constraint.ON_ANY_NETWORK);
- break;
- case Requirements.NETWORK_TYPE_UNMETERED:
- builder.addConstraint(Constraint.ON_UNMETERED_NETWORK);
- break;
- default:
- throw new UnsupportedOperationException();
+ if (requirements.isUnmeteredNetworkRequired()) {
+ builder.addConstraint(Constraint.ON_UNMETERED_NETWORK);
+ } else if (requirements.isNetworkRequired()) {
+ builder.addConstraint(Constraint.ON_ANY_NETWORK);
}
if (requirements.isIdleRequired()) {
@@ -129,7 +122,7 @@ public final class JobDispatcherScheduler implements Scheduler {
Bundle extras = new Bundle();
extras.putString(KEY_SERVICE_ACTION, serviceAction);
extras.putString(KEY_SERVICE_PACKAGE, servicePackage);
- extras.putInt(KEY_REQUIREMENTS, requirements.getRequirementsData());
+ extras.putInt(KEY_REQUIREMENTS, requirements.getRequirements());
builder.setExtras(extras);
return builder.build();
diff --git a/extensions/leanback/README.md b/extensions/leanback/README.md
index 4eba6552e1..b6eb085247 100644
--- a/extensions/leanback/README.md
+++ b/extensions/leanback/README.md
@@ -28,4 +28,4 @@ locally. Instructions for doing this can be found in ExoPlayer's
* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.leanback.*`
belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
index 10bfef8e7c..c6f5a216ce 100644
--- a/extensions/leanback/build.gradle
+++ b/extensions/leanback/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -27,11 +26,14 @@ android {
minSdkVersion 17
targetSdkVersion project.ext.targetSdkVersion
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
implementation project(modulePrefix + 'library-core')
- implementation('com.android.support:leanback-v17:' + supportLibraryVersion)
+ implementation 'androidx.annotation:annotation:1.0.2'
+ implementation 'androidx.leanback:leanback:1.0.0'
}
ext {
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 0c9491bb1a..3f4c5d6229 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
@@ -17,11 +17,11 @@ package com.google.android.exoplayer2.ext.leanback;
import android.content.Context;
import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v17.leanback.R;
-import android.support.v17.leanback.media.PlaybackGlueHost;
-import android.support.v17.leanback.media.PlayerAdapter;
-import android.support.v17.leanback.media.SurfaceHolderGlueHost;
+import androidx.annotation.Nullable;
+import androidx.leanback.R;
+import androidx.leanback.media.PlaybackGlueHost;
+import androidx.leanback.media.PlayerAdapter;
+import androidx.leanback.media.SurfaceHolderGlueHost;
import android.util.Pair;
import android.view.Surface;
import android.view.SurfaceHolder;
diff --git a/extensions/mediasession/README.md b/extensions/mediasession/README.md
index bd6b59c0c1..64b55a8036 100644
--- a/extensions/mediasession/README.md
+++ b/extensions/mediasession/README.md
@@ -29,4 +29,4 @@ locally. Instructions for doing this can be found in ExoPlayer's
* [Javadoc][]: Classes matching
`com.google.android.exoplayer2.ext.mediasession.*` belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle
index 5fb25c6382..6c6ddf4ce4 100644
--- a/extensions/mediasession/build.gradle
+++ b/extensions/mediasession/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -27,11 +26,13 @@ android {
minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
implementation project(modulePrefix + 'library-core')
- api 'com.android.support:support-media-compat:' + supportLibraryVersion
+ api 'androidx.media:media:1.0.1'
}
ext {
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java
deleted file mode 100644
index 7d983e14e9..0000000000
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2017 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.mediasession;
-
-import android.os.Bundle;
-import android.os.ResultReceiver;
-import android.support.v4.media.session.PlaybackStateCompat;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.util.RepeatModeUtil;
-
-/**
- * A default implementation of {@link MediaSessionConnector.PlaybackController}.
- *
- * Methods can be safely overridden by subclasses to intercept calls for given actions.
- */
-public class DefaultPlaybackController implements MediaSessionConnector.PlaybackController {
-
- /**
- * The default fast forward increment, in milliseconds.
- */
- public static final int DEFAULT_FAST_FORWARD_MS = 15000;
- /**
- * The default rewind increment, in milliseconds.
- */
- public static final int DEFAULT_REWIND_MS = 5000;
-
- private static final long BASE_ACTIONS = PlaybackStateCompat.ACTION_PLAY_PAUSE
- | PlaybackStateCompat.ACTION_PLAY | PlaybackStateCompat.ACTION_PAUSE
- | PlaybackStateCompat.ACTION_STOP | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE
- | PlaybackStateCompat.ACTION_SET_REPEAT_MODE;
-
- protected final long rewindIncrementMs;
- protected final long fastForwardIncrementMs;
- protected final int repeatToggleModes;
-
- /**
- * Creates a new instance.
- *
- * Equivalent to {@code DefaultPlaybackController(DefaultPlaybackController.DEFAULT_REWIND_MS,
- * DefaultPlaybackController.DEFAULT_FAST_FORWARD_MS,
- * MediaSessionConnector.DEFAULT_REPEAT_TOGGLE_MODES)}.
- */
- public DefaultPlaybackController() {
- this(DEFAULT_REWIND_MS, DEFAULT_FAST_FORWARD_MS,
- MediaSessionConnector.DEFAULT_REPEAT_TOGGLE_MODES);
- }
-
- /**
- * Creates a new instance with the given fast forward and rewind increments.
- * @param rewindIncrementMs The rewind increment in milliseconds. A zero or negative value will
- * cause the rewind action to be disabled.
- * @param fastForwardIncrementMs The fast forward increment in milliseconds. A zero or negative
- * @param repeatToggleModes The available repeatToggleModes.
- */
- public DefaultPlaybackController(long rewindIncrementMs, long fastForwardIncrementMs,
- @RepeatModeUtil.RepeatToggleModes int repeatToggleModes) {
- this.rewindIncrementMs = rewindIncrementMs;
- this.fastForwardIncrementMs = fastForwardIncrementMs;
- this.repeatToggleModes = repeatToggleModes;
- }
-
- @Override
- public long getSupportedPlaybackActions(Player player) {
- if (player == null || player.getCurrentTimeline().isEmpty()) {
- return 0;
- } else if (!player.isCurrentWindowSeekable()) {
- return BASE_ACTIONS;
- }
- long actions = BASE_ACTIONS | PlaybackStateCompat.ACTION_SEEK_TO;
- if (fastForwardIncrementMs > 0) {
- actions |= PlaybackStateCompat.ACTION_FAST_FORWARD;
- }
- if (rewindIncrementMs > 0) {
- actions |= PlaybackStateCompat.ACTION_REWIND;
- }
- return actions;
- }
-
- @Override
- public void onPlay(Player player) {
- player.setPlayWhenReady(true);
- }
-
- @Override
- public void onPause(Player player) {
- player.setPlayWhenReady(false);
- }
-
- @Override
- public void onSeekTo(Player player, long position) {
- long duration = player.getDuration();
- if (duration != C.TIME_UNSET) {
- position = Math.min(position, duration);
- }
- player.seekTo(Math.max(position, 0));
- }
-
- @Override
- public void onFastForward(Player player) {
- if (fastForwardIncrementMs <= 0) {
- return;
- }
- onSeekTo(player, player.getCurrentPosition() + fastForwardIncrementMs);
- }
-
- @Override
- public void onRewind(Player player) {
- if (rewindIncrementMs <= 0) {
- return;
- }
- onSeekTo(player, player.getCurrentPosition() - rewindIncrementMs);
- }
-
- @Override
- public void onStop(Player player) {
- player.stop(true);
- }
-
- @Override
- public void onSetShuffleMode(Player player, int shuffleMode) {
- player.setShuffleModeEnabled(shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL
- || shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_GROUP);
- }
-
- @Override
- public void onSetRepeatMode(Player player, int repeatMode) {
- int selectedExoPlayerRepeatMode = player.getRepeatMode();
- switch (repeatMode) {
- case PlaybackStateCompat.REPEAT_MODE_ALL:
- case PlaybackStateCompat.REPEAT_MODE_GROUP:
- if ((repeatToggleModes & RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL) != 0) {
- selectedExoPlayerRepeatMode = Player.REPEAT_MODE_ALL;
- }
- break;
- case PlaybackStateCompat.REPEAT_MODE_ONE:
- if ((repeatToggleModes & RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE) != 0) {
- selectedExoPlayerRepeatMode = Player.REPEAT_MODE_ONE;
- }
- break;
- default:
- selectedExoPlayerRepeatMode = Player.REPEAT_MODE_OFF;
- break;
- }
- player.setRepeatMode(selectedExoPlayerRepeatMode);
- }
-
- // CommandReceiver implementation.
-
- @Override
- public String[] getCommands() {
- return null;
- }
-
- @Override
- public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
- // Do nothing.
- }
-
-}
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 9323723601..9c80fabc50 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
@@ -15,6 +15,7 @@
*/
package com.google.android.exoplayer2.ext.mediasession;
+import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Bundle;
@@ -22,8 +23,9 @@ import android.os.Handler;
import android.os.Looper;
import android.os.ResultReceiver;
import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.LongDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.RatingCompat;
@@ -32,6 +34,8 @@ import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import android.util.Pair;
import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ControlDispatcher;
+import com.google.android.exoplayer2.DefaultControlDispatcher;
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
import com.google.android.exoplayer2.PlaybackParameters;
@@ -41,6 +45,9 @@ import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.ErrorMessageProvider;
import com.google.android.exoplayer2.util.RepeatModeUtil;
import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -61,18 +68,24 @@ import java.util.Map;
*
*
* - Actions to initiate media playback ({@code PlaybackStateCompat#ACTION_PREPARE_*} and {@code
- * PlaybackStateCompat#ACTION_PLAY_*}) can be handled by a {@link PlaybackPreparer} passed
- * when calling {@link #setPlayer(Player, PlaybackPreparer, CustomActionProvider...)}. Custom
- * actions can be handled by passing one or more {@link CustomActionProvider}s in a similar
- * way.
+ * PlaybackStateCompat#ACTION_PLAY_*}) can be handled by a {@link PlaybackPreparer} passed to
+ * {@link #setPlaybackPreparer(PlaybackPreparer)}.
+ *
- Custom actions can be handled by passing one or more {@link CustomActionProvider}s to
+ * {@link #setCustomActionProviders(CustomActionProvider...)}.
*
- To enable a media queue and navigation within it, you can set a {@link QueueNavigator} by
* calling {@link #setQueueNavigator(QueueNavigator)}. Use of {@link TimelineQueueNavigator}
* is recommended for most use cases.
*
- To enable editing of the media queue, you can set a {@link QueueEditor} by calling {@link
* #setQueueEditor(QueueEditor)}.
+ *
- A {@link MediaButtonEventHandler} can be set by calling {@link
+ * #setMediaButtonEventHandler(MediaButtonEventHandler)}. By default media button events are
+ * handled by {@link MediaSessionCompat.Callback#onMediaButtonEvent(Intent)}.
*
- An {@link ErrorMessageProvider} for providing human readable error messages and
* corresponding error codes can be set by calling {@link
* #setErrorMessageProvider(ErrorMessageProvider)}.
+ *
- A {@link MediaMetadataProvider} can be set by calling {@link
+ * #setMediaMetadataProvider(MediaMetadataProvider)}. By default the {@link
+ * DefaultMediaMetadataProvider} is used.
*
*/
public final class MediaSessionConnector {
@@ -81,28 +94,82 @@ public final class MediaSessionConnector {
ExoPlayerLibraryInfo.registerModule("goog.exo.mediasession");
}
- /**
- * The default repeat toggle modes which is the bitmask of {@link
- * RepeatModeUtil#REPEAT_TOGGLE_MODE_ONE} and {@link RepeatModeUtil#REPEAT_TOGGLE_MODE_ALL}.
- */
- public static final @RepeatModeUtil.RepeatToggleModes int DEFAULT_REPEAT_TOGGLE_MODES =
- RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE | RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL;
+ /** Playback actions supported by the connector. */
+ @LongDef(
+ flag = true,
+ value = {
+ PlaybackStateCompat.ACTION_PLAY_PAUSE,
+ PlaybackStateCompat.ACTION_PLAY,
+ PlaybackStateCompat.ACTION_PAUSE,
+ PlaybackStateCompat.ACTION_SEEK_TO,
+ PlaybackStateCompat.ACTION_FAST_FORWARD,
+ PlaybackStateCompat.ACTION_REWIND,
+ PlaybackStateCompat.ACTION_STOP,
+ PlaybackStateCompat.ACTION_SET_REPEAT_MODE,
+ PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface PlaybackActions {}
+
+ @PlaybackActions
+ public static final long ALL_PLAYBACK_ACTIONS =
+ PlaybackStateCompat.ACTION_PLAY_PAUSE
+ | PlaybackStateCompat.ACTION_PLAY
+ | PlaybackStateCompat.ACTION_PAUSE
+ | PlaybackStateCompat.ACTION_SEEK_TO
+ | PlaybackStateCompat.ACTION_FAST_FORWARD
+ | PlaybackStateCompat.ACTION_REWIND
+ | PlaybackStateCompat.ACTION_STOP
+ | PlaybackStateCompat.ACTION_SET_REPEAT_MODE
+ | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE;
+
+ /** The default playback actions. */
+ @PlaybackActions public static final long DEFAULT_PLAYBACK_ACTIONS = ALL_PLAYBACK_ACTIONS;
+
+ /** The default fast forward increment, in milliseconds. */
+ public static final int DEFAULT_FAST_FORWARD_MS = 15000;
+ /** The default rewind increment, in milliseconds. */
+ public static final int DEFAULT_REWIND_MS = 5000;
public static final String EXTRAS_PITCH = "EXO_PITCH";
+
+ private static final long BASE_PLAYBACK_ACTIONS =
+ PlaybackStateCompat.ACTION_PLAY_PAUSE
+ | PlaybackStateCompat.ACTION_PLAY
+ | PlaybackStateCompat.ACTION_PAUSE
+ | PlaybackStateCompat.ACTION_STOP
+ | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE
+ | PlaybackStateCompat.ACTION_SET_REPEAT_MODE;
private static final int BASE_MEDIA_SESSION_FLAGS =
MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
| MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS;
private static final int EDITOR_MEDIA_SESSION_FLAGS =
BASE_MEDIA_SESSION_FLAGS | MediaSessionCompat.FLAG_HANDLES_QUEUE_COMMANDS;
+ private static final MediaMetadataCompat METADATA_EMPTY =
+ new MediaMetadataCompat.Builder().build();
+
/** Receiver of media commands sent by a media controller. */
public interface CommandReceiver {
/**
- * Returns the commands the receiver handles, or {@code null} if no commands need to be handled.
+ * See {@link MediaSessionCompat.Callback#onCommand(String, Bundle, ResultReceiver)}. The
+ * receiver may handle the command, but is not required to do so. Changes to the player should
+ * be made via the {@link ControlDispatcher}.
+ *
+ * @param player The player connected to the media session.
+ * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+ * changes to the player.
+ * @param command The command name.
+ * @param extras Optional parameters for the command, may be null.
+ * @param cb A result receiver to which a result may be sent by the command, may be null.
+ * @return Whether the receiver handled the command.
*/
- String[] getCommands();
- /** See {@link MediaSessionCompat.Callback#onCommand(String, Bundle, ResultReceiver)}. */
- void onCommand(Player player, String command, Bundle extras, ResultReceiver cb);
+ boolean onCommand(
+ Player player,
+ ControlDispatcher controlDispatcher,
+ String command,
+ Bundle extras,
+ ResultReceiver cb);
}
/** Interface to which playback preparation actions are delegated. */
@@ -140,51 +207,6 @@ public final class MediaSessionConnector {
void onPrepareFromUri(Uri uri, Bundle extras);
}
- /** Interface to which playback actions are delegated. */
- public interface PlaybackController extends CommandReceiver {
-
- long ACTIONS =
- PlaybackStateCompat.ACTION_PLAY_PAUSE
- | PlaybackStateCompat.ACTION_PLAY
- | PlaybackStateCompat.ACTION_PAUSE
- | PlaybackStateCompat.ACTION_SEEK_TO
- | PlaybackStateCompat.ACTION_FAST_FORWARD
- | PlaybackStateCompat.ACTION_REWIND
- | PlaybackStateCompat.ACTION_STOP
- | PlaybackStateCompat.ACTION_SET_REPEAT_MODE
- | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE;
-
- /**
- * Returns the actions which are supported by the controller. The supported actions must be a
- * bitmask combined out of {@link PlaybackStateCompat#ACTION_PLAY_PAUSE}, {@link
- * PlaybackStateCompat#ACTION_PLAY}, {@link PlaybackStateCompat#ACTION_PAUSE}, {@link
- * PlaybackStateCompat#ACTION_SEEK_TO}, {@link PlaybackStateCompat#ACTION_FAST_FORWARD}, {@link
- * PlaybackStateCompat#ACTION_REWIND}, {@link PlaybackStateCompat#ACTION_STOP}, {@link
- * PlaybackStateCompat#ACTION_SET_REPEAT_MODE} and {@link
- * PlaybackStateCompat#ACTION_SET_SHUFFLE_MODE}.
- *
- * @param player The player.
- * @return The bitmask of the supported media actions.
- */
- long getSupportedPlaybackActions(@Nullable Player player);
- /** See {@link MediaSessionCompat.Callback#onPlay()}. */
- void onPlay(Player player);
- /** See {@link MediaSessionCompat.Callback#onPause()}. */
- void onPause(Player player);
- /** See {@link MediaSessionCompat.Callback#onSeekTo(long)}. */
- void onSeekTo(Player player, long position);
- /** See {@link MediaSessionCompat.Callback#onFastForward()}. */
- void onFastForward(Player player);
- /** See {@link MediaSessionCompat.Callback#onRewind()}. */
- void onRewind(Player player);
- /** See {@link MediaSessionCompat.Callback#onStop()}. */
- void onStop(Player player);
- /** See {@link MediaSessionCompat.Callback#onSetShuffleMode(int)}. */
- void onSetShuffleMode(Player player, int shuffleMode);
- /** See {@link MediaSessionCompat.Callback#onSetRepeatMode(int)}. */
- void onSetRepeatMode(Player player, int repeatMode);
- }
-
/**
* Handles queue navigation actions, and updates the media session queue by calling {@code
* MediaSessionCompat.setQueue()}.
@@ -202,20 +224,20 @@ public final class MediaSessionConnector {
* PlaybackStateCompat#ACTION_SKIP_TO_NEXT}, {@link
* PlaybackStateCompat#ACTION_SKIP_TO_PREVIOUS}.
*
- * @param player The {@link Player}.
+ * @param player The player connected to the media session.
* @return The bitmask of the supported media actions.
*/
- long getSupportedQueueNavigatorActions(@Nullable Player player);
+ long getSupportedQueueNavigatorActions(Player player);
/**
* Called when the timeline of the player has changed.
*
- * @param player The player of which the timeline has changed.
+ * @param player The player connected to the media session.
*/
void onTimelineChanged(Player player);
/**
* Called when the current window index changed.
*
- * @param player The player of which the current window index of the timeline has changed.
+ * @param player The player connected to the media session.
*/
void onCurrentWindowIndexChanged(Player player);
/**
@@ -230,12 +252,30 @@ public final class MediaSessionConnector {
* @return The id of the active queue item.
*/
long getActiveQueueItemId(@Nullable Player player);
- /** See {@link MediaSessionCompat.Callback#onSkipToPrevious()}. */
- void onSkipToPrevious(Player player);
- /** See {@link MediaSessionCompat.Callback#onSkipToQueueItem(long)}. */
- void onSkipToQueueItem(Player player, long id);
- /** See {@link MediaSessionCompat.Callback#onSkipToNext()}. */
- void onSkipToNext(Player player);
+ /**
+ * See {@link MediaSessionCompat.Callback#onSkipToPrevious()}.
+ *
+ * @param player The player connected to the media session.
+ * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+ * changes to the player.
+ */
+ void onSkipToPrevious(Player player, ControlDispatcher controlDispatcher);
+ /**
+ * See {@link MediaSessionCompat.Callback#onSkipToQueueItem(long)}.
+ *
+ * @param player The player connected to the media session.
+ * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+ * changes to the player.
+ */
+ void onSkipToQueueItem(Player player, ControlDispatcher controlDispatcher, long id);
+ /**
+ * See {@link MediaSessionCompat.Callback#onSkipToNext()}.
+ *
+ * @param player The player connected to the media session.
+ * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+ * changes to the player.
+ */
+ void onSkipToNext(Player player, ControlDispatcher controlDispatcher);
}
/** Handles media session queue edits. */
@@ -260,15 +300,28 @@ public final class MediaSessionConnector {
/** Callback receiving a user rating for the active media item. */
public interface RatingCallback extends CommandReceiver {
- long ACTIONS = PlaybackStateCompat.ACTION_SET_RATING;
-
/** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat)}. */
void onSetRating(Player player, RatingCompat rating);
-
+
/** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat, Bundle)}. */
void onSetRating(Player player, RatingCompat rating, Bundle extras);
}
+ /** Handles a media button event. */
+ public interface MediaButtonEventHandler {
+ /**
+ * See {@link MediaSessionCompat.Callback#onMediaButtonEvent(Intent)}.
+ *
+ * @param player The {@link Player}.
+ * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+ * changes to the player.
+ * @param mediaButtonEvent The {@link Intent}.
+ * @return True if the event was handled, false otherwise.
+ */
+ boolean onMediaButtonEvent(
+ Player player, ControlDispatcher controlDispatcher, Intent mediaButtonEvent);
+ }
+
/**
* Provides a {@link PlaybackStateCompat.CustomAction} to be published and handles the action when
* sent by a media controller.
@@ -277,19 +330,24 @@ public final class MediaSessionConnector {
/**
* Called when a custom action provided by this provider is sent to the media session.
*
+ * @param player The player connected to the media session.
+ * @param controlDispatcher A {@link ControlDispatcher} that should be used for dispatching
+ * changes to the player.
* @param action The name of the action which was sent by a media controller.
* @param extras Optional extras sent by a media controller.
*/
- void onCustomAction(String action, Bundle extras);
+ void onCustomAction(
+ Player player, ControlDispatcher controlDispatcher, String action, Bundle extras);
/**
* Returns a {@link PlaybackStateCompat.CustomAction} which will be published to the media
* session by the connector or {@code null} if this action should not be published at the given
* player state.
*
+ * @param player The player connected to the media session.
* @return The custom action to be included in the session playback state or {@code null}.
*/
- PlaybackStateCompat.CustomAction getCustomAction();
+ PlaybackStateCompat.CustomAction getCustomAction(Player player);
}
/** Provides a {@link MediaMetadataCompat} for a given player state. */
@@ -297,7 +355,7 @@ public final class MediaSessionConnector {
/**
* Gets the {@link MediaMetadataCompat} to be published to the session.
*
- * @param player The player for which to provide metadata.
+ * @param player The player connected to the media session.
* @return The {@link MediaMetadataCompat} to be published to the session.
*/
MediaMetadataCompat getMetadata(Player player);
@@ -306,143 +364,151 @@ public final class MediaSessionConnector {
/** The wrapped {@link MediaSessionCompat}. */
public final MediaSessionCompat mediaSession;
- private @Nullable final MediaMetadataProvider mediaMetadataProvider;
- private final ExoPlayerEventListener exoPlayerEventListener;
- private final MediaSessionCallback mediaSessionCallback;
- private final PlaybackController playbackController;
- private final Map commandMap;
+ private final Looper looper;
+ private final ComponentListener componentListener;
+ private final ArrayList commandReceivers;
+ private final ArrayList customCommandReceivers;
- private Player player;
+ private ControlDispatcher controlDispatcher;
private CustomActionProvider[] customActionProviders;
private Map customActionMap;
- private @Nullable ErrorMessageProvider errorMessageProvider;
- private @Nullable Pair customError;
- private PlaybackPreparer playbackPreparer;
- private QueueNavigator queueNavigator;
- private QueueEditor queueEditor;
- private RatingCallback ratingCallback;
+ @Nullable private MediaMetadataProvider mediaMetadataProvider;
+ @Nullable private Player player;
+ @Nullable private ErrorMessageProvider errorMessageProvider;
+ @Nullable private Pair customError;
+ @Nullable private Bundle customErrorExtras;
+ @Nullable private PlaybackPreparer playbackPreparer;
+ @Nullable private QueueNavigator queueNavigator;
+ @Nullable private QueueEditor queueEditor;
+ @Nullable private RatingCallback ratingCallback;
+ @Nullable private MediaButtonEventHandler mediaButtonEventHandler;
+
+ private long enabledPlaybackActions;
+ private int rewindMs;
+ private int fastForwardMs;
/**
* Creates an instance.
*
- * Equivalent to {@code MediaSessionConnector(mediaSession, new DefaultPlaybackController())}.
- *
* @param mediaSession The {@link MediaSessionCompat} to connect to.
*/
public MediaSessionConnector(MediaSessionCompat mediaSession) {
- this(mediaSession, null);
- }
-
- /**
- * Creates an instance.
- *
- *
Equivalent to {@code MediaSessionConnector(mediaSession, playbackController, new
- * DefaultMediaMetadataProvider(mediaSession.getController(), null))}.
- *
- * @param mediaSession The {@link MediaSessionCompat} to connect to.
- * @param playbackController A {@link PlaybackController} for handling playback actions.
- */
- public MediaSessionConnector(
- MediaSessionCompat mediaSession, PlaybackController playbackController) {
- this(
- mediaSession,
- playbackController,
- new DefaultMediaMetadataProvider(mediaSession.getController(), null));
- }
-
- /**
- * Creates an instance.
- *
- * @param mediaSession The {@link MediaSessionCompat} to connect to.
- * @param playbackController A {@link PlaybackController} for handling playback actions, or {@code
- * null} if the connector should handle playback actions directly.
- * @param doMaintainMetadata Whether the connector should maintain the metadata of the session.
- * @param metadataExtrasPrefix A string to prefix extra keys which are propagated from the active
- * queue item to the session metadata.
- * @deprecated Use {@link MediaSessionConnector#MediaSessionConnector(MediaSessionCompat,
- * PlaybackController, MediaMetadataProvider)}.
- */
- @Deprecated
- public MediaSessionConnector(
- MediaSessionCompat mediaSession,
- @Nullable PlaybackController playbackController,
- boolean doMaintainMetadata,
- @Nullable String metadataExtrasPrefix) {
- this(
- mediaSession,
- playbackController,
- doMaintainMetadata
- ? new DefaultMediaMetadataProvider(mediaSession.getController(), metadataExtrasPrefix)
- : null);
- }
-
- /**
- * Creates an instance.
- *
- * @param mediaSession The {@link MediaSessionCompat} to connect to.
- * @param playbackController A {@link PlaybackController} for handling playback actions, or {@code
- * null} if the connector should handle playback actions directly.
- * @param mediaMetadataProvider A {@link MediaMetadataProvider} for providing a custom metadata
- * object to be published to the media session, or {@code null} if metadata shouldn't be
- * published.
- */
- public MediaSessionConnector(
- MediaSessionCompat mediaSession,
- @Nullable PlaybackController playbackController,
- @Nullable MediaMetadataProvider mediaMetadataProvider) {
this.mediaSession = mediaSession;
- this.playbackController =
- playbackController != null ? playbackController : new DefaultPlaybackController();
- this.mediaMetadataProvider = mediaMetadataProvider;
- mediaSession.setFlags(BASE_MEDIA_SESSION_FLAGS);
- mediaSessionCallback = new MediaSessionCallback();
- exoPlayerEventListener = new ExoPlayerEventListener();
+ looper = Util.getLooper();
+ componentListener = new ComponentListener();
+ commandReceivers = new ArrayList<>();
+ customCommandReceivers = new ArrayList<>();
+ controlDispatcher = new DefaultControlDispatcher();
+ customActionProviders = new CustomActionProvider[0];
customActionMap = Collections.emptyMap();
- commandMap = new HashMap<>();
- registerCommandReceiver(playbackController);
+ mediaMetadataProvider =
+ new DefaultMediaMetadataProvider(
+ mediaSession.getController(), /* metadataExtrasPrefix= */ null);
+ enabledPlaybackActions = DEFAULT_PLAYBACK_ACTIONS;
+ rewindMs = DEFAULT_REWIND_MS;
+ fastForwardMs = DEFAULT_FAST_FORWARD_MS;
+ mediaSession.setFlags(BASE_MEDIA_SESSION_FLAGS);
+ mediaSession.setCallback(componentListener, new Handler(looper));
}
/**
* Sets the player to be connected to the media session. Must be called on the same thread that is
* used to access the player.
*
- *
The order in which any {@link CustomActionProvider}s are passed determines the order of the
- * actions published with the playback state of the session.
- *
* @param player The player to be connected to the {@code MediaSession}, or {@code null} to
* disconnect the current player.
- * @param playbackPreparer An optional {@link PlaybackPreparer} for preparing the player.
- * @param customActionProviders Optional {@link CustomActionProvider}s to publish and handle
- * custom actions.
*/
- public void setPlayer(
- @Nullable Player player,
- @Nullable PlaybackPreparer playbackPreparer,
- CustomActionProvider... customActionProviders) {
- Assertions.checkArgument(player == null || player.getApplicationLooper() == Looper.myLooper());
+ public void setPlayer(@Nullable Player player) {
+ Assertions.checkArgument(player == null || player.getApplicationLooper() == looper);
if (this.player != null) {
- this.player.removeListener(exoPlayerEventListener);
- mediaSession.setCallback(null);
+ this.player.removeListener(componentListener);
}
- unregisterCommandReceiver(this.playbackPreparer);
-
this.player = player;
- this.playbackPreparer = playbackPreparer;
- registerCommandReceiver(playbackPreparer);
-
- this.customActionProviders =
- (player != null && customActionProviders != null)
- ? customActionProviders
- : new CustomActionProvider[0];
if (player != null) {
- Handler handler = new Handler(Util.getLooper());
- mediaSession.setCallback(mediaSessionCallback, handler);
- player.addListener(exoPlayerEventListener);
+ player.addListener(componentListener);
}
invalidateMediaSessionPlaybackState();
invalidateMediaSessionMetadata();
}
+ /**
+ * Sets the {@link PlaybackPreparer}.
+ *
+ * @param playbackPreparer The {@link PlaybackPreparer}.
+ */
+ public void setPlaybackPreparer(@Nullable PlaybackPreparer playbackPreparer) {
+ if (this.playbackPreparer != playbackPreparer) {
+ unregisterCommandReceiver(this.playbackPreparer);
+ this.playbackPreparer = playbackPreparer;
+ registerCommandReceiver(playbackPreparer);
+ invalidateMediaSessionPlaybackState();
+ }
+ }
+
+ /**
+ * Sets the {@link ControlDispatcher}.
+ *
+ * @param controlDispatcher The {@link ControlDispatcher}, or null to use {@link
+ * DefaultControlDispatcher}.
+ */
+ public void setControlDispatcher(@Nullable ControlDispatcher controlDispatcher) {
+ if (this.controlDispatcher != controlDispatcher) {
+ this.controlDispatcher =
+ controlDispatcher == null ? new DefaultControlDispatcher() : controlDispatcher;
+ }
+ }
+
+ /**
+ * Sets the {@link MediaButtonEventHandler}. Pass {@code null} if the media button event should be
+ * handled by {@link MediaSessionCompat.Callback#onMediaButtonEvent(Intent)}.
+ *
+ * @param mediaButtonEventHandler The {@link MediaButtonEventHandler}, or null to let the event be
+ * handled by {@link MediaSessionCompat.Callback#onMediaButtonEvent(Intent)}.
+ */
+ public void setMediaButtonEventHandler(
+ @Nullable MediaButtonEventHandler mediaButtonEventHandler) {
+ this.mediaButtonEventHandler = mediaButtonEventHandler;
+ }
+
+ /**
+ * Sets the enabled playback actions.
+ *
+ * @param enabledPlaybackActions The enabled playback actions.
+ */
+ public void setEnabledPlaybackActions(@PlaybackActions long enabledPlaybackActions) {
+ enabledPlaybackActions &= ALL_PLAYBACK_ACTIONS;
+ if (this.enabledPlaybackActions != enabledPlaybackActions) {
+ this.enabledPlaybackActions = enabledPlaybackActions;
+ invalidateMediaSessionPlaybackState();
+ }
+ }
+
+ /**
+ * Sets the rewind increment in milliseconds.
+ *
+ * @param rewindMs The rewind increment in milliseconds. A non-positive value will cause the
+ * rewind button to be disabled.
+ */
+ public void setRewindIncrementMs(int rewindMs) {
+ if (this.rewindMs != rewindMs) {
+ this.rewindMs = rewindMs;
+ invalidateMediaSessionPlaybackState();
+ }
+ }
+
+ /**
+ * Sets the fast forward increment in milliseconds.
+ *
+ * @param fastForwardMs The fast forward increment in milliseconds. A non-positive value will
+ * cause the fast forward button to be disabled.
+ */
+ public void setFastForwardIncrementMs(int fastForwardMs) {
+ if (this.fastForwardMs != fastForwardMs) {
+ this.fastForwardMs = fastForwardMs;
+ invalidateMediaSessionPlaybackState();
+ }
+ }
+
/**
* Sets the optional {@link ErrorMessageProvider}.
*
@@ -519,20 +585,65 @@ public final class MediaSessionConnector {
* @param code The error code to report. Ignored when {@code message} is {@code null}.
*/
public void setCustomErrorMessage(@Nullable CharSequence message, int code) {
+ setCustomErrorMessage(message, code, /* extras= */ null);
+ }
+
+ /**
+ * Sets a custom error on the session.
+ *
+ * @param message The error string to report or {@code null} to clear the error.
+ * @param code The error code to report. Ignored when {@code message} is {@code null}.
+ * @param extras Extras to include in reported {@link PlaybackStateCompat}.
+ */
+ public void setCustomErrorMessage(
+ @Nullable CharSequence message, int code, @Nullable Bundle extras) {
customError = (message == null) ? null : new Pair<>(code, message);
+ customErrorExtras = (message == null) ? null : extras;
invalidateMediaSessionPlaybackState();
}
+ /**
+ * Sets custom action providers. The order of the {@link CustomActionProvider}s determines the
+ * order in which the actions are published.
+ *
+ * @param customActionProviders The custom action providers, or null to remove all existing custom
+ * action providers.
+ */
+ public void setCustomActionProviders(@Nullable CustomActionProvider... customActionProviders) {
+ this.customActionProviders =
+ customActionProviders == null ? new CustomActionProvider[0] : customActionProviders;
+ invalidateMediaSessionPlaybackState();
+ }
+
+ /**
+ * Sets a provider of metadata to be published to the media session. Pass {@code null} if no
+ * metadata should be published.
+ *
+ * @param mediaMetadataProvider The provider of metadata to publish, or {@code null} if no
+ * metadata should be published.
+ */
+ public void setMediaMetadataProvider(@Nullable MediaMetadataProvider mediaMetadataProvider) {
+ if (this.mediaMetadataProvider != mediaMetadataProvider) {
+ this.mediaMetadataProvider = mediaMetadataProvider;
+ invalidateMediaSessionMetadata();
+ }
+ }
+
/**
* Updates the metadata of the media session.
*
*
Apps normally only need to call this method when the backing data for a given media item has
* changed and the metadata should be updated immediately.
+ *
+ *
The {@link MediaMetadataCompat} which is published to the session is obtained by calling
+ * {@link MediaMetadataProvider#getMetadata(Player)}.
*/
public final void invalidateMediaSessionMetadata() {
- if (mediaMetadataProvider != null && player != null) {
- mediaSession.setMetadata(mediaMetadataProvider.getMetadata(player));
- }
+ MediaMetadataCompat metadata =
+ mediaMetadataProvider != null && player != null
+ ? mediaMetadataProvider.getMetadata(player)
+ : METADATA_EMPTY;
+ mediaSession.setMetadata(metadata != null ? metadata : METADATA_EMPTY);
}
/**
@@ -544,14 +655,14 @@ public final class MediaSessionConnector {
public final void invalidateMediaSessionPlaybackState() {
PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder();
if (player == null) {
- builder.setActions(buildPlaybackActions()).setState(PlaybackStateCompat.STATE_NONE, 0, 0, 0);
+ builder.setActions(buildPrepareActions()).setState(PlaybackStateCompat.STATE_NONE, 0, 0, 0);
mediaSession.setPlaybackState(builder.build());
return;
}
Map currentActions = new HashMap<>();
for (CustomActionProvider customActionProvider : customActionProviders) {
- PlaybackStateCompat.CustomAction customAction = customActionProvider.getCustomAction();
+ PlaybackStateCompat.CustomAction customAction = customActionProvider.getCustomAction(player);
if (customAction != null) {
currentActions.put(customAction.getAction(), customActionProvider);
builder.addCustomAction(customAction);
@@ -560,6 +671,7 @@ public final class MediaSessionConnector {
customActionMap = Collections.unmodifiableMap(currentActions);
int playbackState = player.getPlaybackState();
+ Bundle extras = new Bundle();
ExoPlaybackException playbackError =
playbackState == Player.STATE_IDLE ? player.getPlaybackError() : null;
boolean reportError = playbackError != null || customError != null;
@@ -569,6 +681,9 @@ public final class MediaSessionConnector {
: mapPlaybackState(player.getPlaybackState(), player.getPlayWhenReady());
if (customError != null) {
builder.setErrorMessage(customError.first, customError.second);
+ if (customErrorExtras != null) {
+ extras.putAll(customErrorExtras);
+ }
} else if (playbackError != null && errorMessageProvider != null) {
Pair message = errorMessageProvider.getErrorMessage(playbackError);
builder.setErrorMessage(message.first, message.second);
@@ -577,10 +692,9 @@ public final class MediaSessionConnector {
queueNavigator != null
? queueNavigator.getActiveQueueItemId(player)
: MediaSessionCompat.QueueItem.UNKNOWN_ID;
- Bundle extras = new Bundle();
extras.putFloat(EXTRAS_PITCH, player.getPlaybackParameters().pitch);
builder
- .setActions(buildPlaybackActions())
+ .setActions(buildPrepareActions() | buildPlaybackActions(player))
.setActiveQueueItemId(activeQueueItemId)
.setBufferedPosition(player.getBufferedPosition())
.setState(
@@ -605,34 +719,77 @@ public final class MediaSessionConnector {
}
}
+ /**
+ * Registers a custom command receiver for responding to commands delivered via {@link
+ * MediaSessionCompat.Callback#onCommand(String, Bundle, ResultReceiver)}.
+ *
+ * Commands are only dispatched to this receiver when a player is connected.
+ *
+ * @param commandReceiver The command receiver to register.
+ */
+ public void registerCustomCommandReceiver(CommandReceiver commandReceiver) {
+ if (!customCommandReceivers.contains(commandReceiver)) {
+ customCommandReceivers.add(commandReceiver);
+ }
+ }
+
+ /**
+ * Unregisters a previously registered custom command receiver.
+ *
+ * @param commandReceiver The command receiver to unregister.
+ */
+ public void unregisterCustomCommandReceiver(CommandReceiver commandReceiver) {
+ customCommandReceivers.remove(commandReceiver);
+ }
+
private void registerCommandReceiver(CommandReceiver commandReceiver) {
- if (commandReceiver != null && commandReceiver.getCommands() != null) {
- for (String command : commandReceiver.getCommands()) {
- commandMap.put(command, commandReceiver);
- }
+ if (!commandReceivers.contains(commandReceiver)) {
+ commandReceivers.add(commandReceiver);
}
}
private void unregisterCommandReceiver(CommandReceiver commandReceiver) {
- if (commandReceiver != null && commandReceiver.getCommands() != null) {
- for (String command : commandReceiver.getCommands()) {
- commandMap.remove(command);
- }
- }
+ commandReceivers.remove(commandReceiver);
}
- private long buildPlaybackActions() {
- long actions =
- (PlaybackController.ACTIONS & playbackController.getSupportedPlaybackActions(player));
- if (playbackPreparer != null) {
- actions |= (PlaybackPreparer.ACTIONS & playbackPreparer.getSupportedPrepareActions());
+ private long buildPrepareActions() {
+ return playbackPreparer == null
+ ? 0
+ : (PlaybackPreparer.ACTIONS & playbackPreparer.getSupportedPrepareActions());
+ }
+
+ private long buildPlaybackActions(Player player) {
+ boolean enableSeeking = false;
+ boolean enableRewind = false;
+ boolean enableFastForward = false;
+ boolean enableSetRating = false;
+ Timeline timeline = player.getCurrentTimeline();
+ if (!timeline.isEmpty() && !player.isPlayingAd()) {
+ enableSeeking = player.isCurrentWindowSeekable();
+ enableRewind = enableSeeking && rewindMs > 0;
+ enableFastForward = enableSeeking && fastForwardMs > 0;
+ enableSetRating = true;
}
+
+ long playbackActions = BASE_PLAYBACK_ACTIONS;
+ if (enableSeeking) {
+ playbackActions |= PlaybackStateCompat.ACTION_SEEK_TO;
+ }
+ if (enableFastForward) {
+ playbackActions |= PlaybackStateCompat.ACTION_FAST_FORWARD;
+ }
+ if (enableRewind) {
+ playbackActions |= PlaybackStateCompat.ACTION_REWIND;
+ }
+ playbackActions &= enabledPlaybackActions;
+
+ long actions = playbackActions;
if (queueNavigator != null) {
actions |=
(QueueNavigator.ACTIONS & queueNavigator.getSupportedQueueNavigatorActions(player));
}
- if (ratingCallback != null) {
- actions |= RatingCallback.ACTIONS;
+ if (ratingCallback != null && enableSetRating) {
+ actions |= PlaybackStateCompat.ACTION_SET_RATING;
}
return actions;
}
@@ -644,39 +801,74 @@ public final class MediaSessionConnector {
case Player.STATE_READY:
return playWhenReady ? PlaybackStateCompat.STATE_PLAYING : PlaybackStateCompat.STATE_PAUSED;
case Player.STATE_ENDED:
- return PlaybackStateCompat.STATE_PAUSED;
+ return PlaybackStateCompat.STATE_STOPPED;
default:
return PlaybackStateCompat.STATE_NONE;
}
}
+ private boolean canDispatchPlaybackAction(long action) {
+ return player != null && (enabledPlaybackActions & action) != 0;
+ }
+
private boolean canDispatchToPlaybackPreparer(long action) {
return playbackPreparer != null
- && (playbackPreparer.getSupportedPrepareActions() & PlaybackPreparer.ACTIONS & action) != 0;
- }
-
- private boolean canDispatchToRatingCallback(long action) {
- return ratingCallback != null && (RatingCallback.ACTIONS & action) != 0;
- }
-
- private boolean canDispatchToPlaybackController(long action) {
- return (playbackController.getSupportedPlaybackActions(player)
- & PlaybackController.ACTIONS
- & action)
- != 0;
+ && (playbackPreparer.getSupportedPrepareActions() & action) != 0;
}
private boolean canDispatchToQueueNavigator(long action) {
- return queueNavigator != null
- && (queueNavigator.getSupportedQueueNavigatorActions(player)
- & QueueNavigator.ACTIONS
- & action)
- != 0;
+ return player != null
+ && queueNavigator != null
+ && (queueNavigator.getSupportedQueueNavigatorActions(player) & action) != 0;
+ }
+
+ private boolean canDispatchSetRating() {
+ return player != null && ratingCallback != null;
+ }
+
+ private boolean canDispatchQueueEdit() {
+ return player != null && queueEditor != null;
+ }
+
+ private boolean canDispatchMediaButtonEvent() {
+ return player != null && mediaButtonEventHandler != null;
+ }
+
+ private void stopPlayerForPrepare(boolean playWhenReady) {
+ if (player != null) {
+ player.stop();
+ player.setPlayWhenReady(playWhenReady);
+ }
+ }
+
+ private void rewind(Player player) {
+ if (player.isCurrentWindowSeekable() && rewindMs > 0) {
+ seekTo(player, player.getCurrentPosition() - rewindMs);
+ }
+ }
+
+ private void fastForward(Player player) {
+ if (player.isCurrentWindowSeekable() && fastForwardMs > 0) {
+ seekTo(player, player.getCurrentPosition() + fastForwardMs);
+ }
+ }
+
+ private void seekTo(Player player, long positionMs) {
+ seekTo(player, player.getCurrentWindowIndex(), positionMs);
+ }
+
+ private void seekTo(Player player, int windowIndex, long positionMs) {
+ long durationMs = player.getDuration();
+ if (durationMs != C.TIME_UNSET) {
+ positionMs = Math.min(positionMs, durationMs);
+ }
+ positionMs = Math.max(positionMs, 0);
+ controlDispatcher.dispatchSeekTo(player, windowIndex, positionMs);
}
/**
- * Provides a default {@link MediaMetadataCompat} with properties and extras propagated from the
- * active queue item to the session metadata.
+ * Provides a default {@link MediaMetadataCompat} with properties and extras taken from the {@link
+ * MediaDescriptionCompat} of the {@link MediaSessionCompat.QueueItem} of the active queue item.
*/
public static final class DefaultMediaMetadataProvider implements MediaMetadataProvider {
@@ -699,7 +891,7 @@ public final class MediaSessionConnector {
@Override
public MediaMetadataCompat getMetadata(Player player) {
if (player.getCurrentTimeline().isEmpty()) {
- return null;
+ return METADATA_EMPTY;
}
MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder();
if (player.isPlayingAd()) {
@@ -776,11 +968,14 @@ public final class MediaSessionConnector {
}
}
- private class ExoPlayerEventListener implements Player.EventListener {
+ private class ComponentListener extends MediaSessionCompat.Callback
+ implements Player.EventListener {
private int currentWindowIndex;
private int currentWindowCount;
+ // Player.EventListener implementation.
+
@Override
public void onTimelineChanged(
Timeline timeline, @Nullable Object manifest, @Player.TimelineChangeReason int reason) {
@@ -821,6 +1016,7 @@ public final class MediaSessionConnector {
? PlaybackStateCompat.SHUFFLE_MODE_ALL
: PlaybackStateCompat.SHUFFLE_MODE_NONE);
invalidateMediaSessionPlaybackState();
+ invalidateMediaSessionQueue();
}
@Override
@@ -843,109 +1039,150 @@ public final class MediaSessionConnector {
public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
invalidateMediaSessionPlaybackState();
}
- }
- private class MediaSessionCallback extends MediaSessionCompat.Callback {
+ // MediaSessionCompat.Callback implementation.
@Override
public void onPlay() {
- if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_PLAY)) {
- playbackController.onPlay(player);
+ if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_PLAY)) {
+ if (player.getPlaybackState() == Player.STATE_IDLE) {
+ if (playbackPreparer != null) {
+ playbackPreparer.onPrepare();
+ }
+ } else if (player.getPlaybackState() == Player.STATE_ENDED) {
+ controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
+ }
+ controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ true);
}
}
@Override
public void onPause() {
- if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_PAUSE)) {
- playbackController.onPause(player);
+ if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_PAUSE)) {
+ controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ false);
}
}
@Override
- public void onSeekTo(long position) {
- if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SEEK_TO)) {
- playbackController.onSeekTo(player, position);
+ public void onSeekTo(long positionMs) {
+ if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SEEK_TO)) {
+ seekTo(player, positionMs);
}
}
@Override
public void onFastForward() {
- if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_FAST_FORWARD)) {
- playbackController.onFastForward(player);
+ if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_FAST_FORWARD)) {
+ fastForward(player);
}
}
@Override
public void onRewind() {
- if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_REWIND)) {
- playbackController.onRewind(player);
+ if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_REWIND)) {
+ rewind(player);
}
}
@Override
public void onStop() {
- if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_STOP)) {
- playbackController.onStop(player);
+ if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_STOP)) {
+ controlDispatcher.dispatchStop(player, /* reset= */ true);
}
}
@Override
- public void onSetShuffleMode(int shuffleMode) {
- if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE)) {
- playbackController.onSetShuffleMode(player, shuffleMode);
+ public void onSetShuffleMode(@PlaybackStateCompat.ShuffleMode int shuffleMode) {
+ if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE)) {
+ boolean shuffleModeEnabled;
+ switch (shuffleMode) {
+ case PlaybackStateCompat.SHUFFLE_MODE_ALL:
+ case PlaybackStateCompat.SHUFFLE_MODE_GROUP:
+ shuffleModeEnabled = true;
+ break;
+ case PlaybackStateCompat.SHUFFLE_MODE_NONE:
+ case PlaybackStateCompat.SHUFFLE_MODE_INVALID:
+ default:
+ shuffleModeEnabled = false;
+ break;
+ }
+ controlDispatcher.dispatchSetShuffleModeEnabled(player, shuffleModeEnabled);
}
}
@Override
- public void onSetRepeatMode(int repeatMode) {
- if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_REPEAT_MODE)) {
- playbackController.onSetRepeatMode(player, repeatMode);
+ public void onSetRepeatMode(@PlaybackStateCompat.RepeatMode int mediaSessionRepeatMode) {
+ if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SET_REPEAT_MODE)) {
+ @RepeatModeUtil.RepeatToggleModes int repeatMode;
+ switch (mediaSessionRepeatMode) {
+ case PlaybackStateCompat.REPEAT_MODE_ALL:
+ case PlaybackStateCompat.REPEAT_MODE_GROUP:
+ repeatMode = Player.REPEAT_MODE_ALL;
+ break;
+ case PlaybackStateCompat.REPEAT_MODE_ONE:
+ repeatMode = Player.REPEAT_MODE_ONE;
+ break;
+ case PlaybackStateCompat.REPEAT_MODE_NONE:
+ case PlaybackStateCompat.REPEAT_MODE_INVALID:
+ default:
+ repeatMode = Player.REPEAT_MODE_OFF;
+ break;
+ }
+ controlDispatcher.dispatchSetRepeatMode(player, repeatMode);
}
}
@Override
public void onSkipToNext() {
if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SKIP_TO_NEXT)) {
- queueNavigator.onSkipToNext(player);
+ queueNavigator.onSkipToNext(player, controlDispatcher);
}
}
@Override
public void onSkipToPrevious() {
if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS)) {
- queueNavigator.onSkipToPrevious(player);
+ queueNavigator.onSkipToPrevious(player, controlDispatcher);
}
}
@Override
public void onSkipToQueueItem(long id) {
if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM)) {
- queueNavigator.onSkipToQueueItem(player, id);
+ queueNavigator.onSkipToQueueItem(player, controlDispatcher, id);
}
}
@Override
public void onCustomAction(@NonNull String action, @Nullable Bundle extras) {
- Map actionMap = customActionMap;
- if (actionMap.containsKey(action)) {
- actionMap.get(action).onCustomAction(action, extras);
+ if (player != null && customActionMap.containsKey(action)) {
+ customActionMap.get(action).onCustomAction(player, controlDispatcher, action, extras);
invalidateMediaSessionPlaybackState();
}
}
@Override
public void onCommand(String command, Bundle extras, ResultReceiver cb) {
- CommandReceiver commandReceiver = commandMap.get(command);
- if (commandReceiver != null) {
- commandReceiver.onCommand(player, command, extras, cb);
+ if (player != null) {
+ for (int i = 0; i < commandReceivers.size(); i++) {
+ if (commandReceivers.get(i).onCommand(player, controlDispatcher, command, extras, cb)) {
+ return;
+ }
+ }
+ for (int i = 0; i < customCommandReceivers.size(); i++) {
+ if (customCommandReceivers
+ .get(i)
+ .onCommand(player, controlDispatcher, command, extras, cb)) {
+ return;
+ }
+ }
}
}
@Override
public void onPrepare() {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE)) {
- player.stop();
- player.setPlayWhenReady(false);
+ stopPlayerForPrepare(/* playWhenReady= */ false);
playbackPreparer.onPrepare();
}
}
@@ -953,8 +1190,7 @@ public final class MediaSessionConnector {
@Override
public void onPrepareFromMediaId(String mediaId, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_MEDIA_ID)) {
- player.stop();
- player.setPlayWhenReady(false);
+ stopPlayerForPrepare(/* playWhenReady= */ false);
playbackPreparer.onPrepareFromMediaId(mediaId, extras);
}
}
@@ -962,8 +1198,7 @@ public final class MediaSessionConnector {
@Override
public void onPrepareFromSearch(String query, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_SEARCH)) {
- player.stop();
- player.setPlayWhenReady(false);
+ stopPlayerForPrepare(/* playWhenReady= */ false);
playbackPreparer.onPrepareFromSearch(query, extras);
}
}
@@ -971,8 +1206,7 @@ public final class MediaSessionConnector {
@Override
public void onPrepareFromUri(Uri uri, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_URI)) {
- player.stop();
- player.setPlayWhenReady(false);
+ stopPlayerForPrepare(/* playWhenReady= */ false);
playbackPreparer.onPrepareFromUri(uri, extras);
}
}
@@ -980,8 +1214,7 @@ public final class MediaSessionConnector {
@Override
public void onPlayFromMediaId(String mediaId, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID)) {
- player.stop();
- player.setPlayWhenReady(true);
+ stopPlayerForPrepare(/* playWhenReady= */ true);
playbackPreparer.onPrepareFromMediaId(mediaId, extras);
}
}
@@ -989,8 +1222,7 @@ public final class MediaSessionConnector {
@Override
public void onPlayFromSearch(String query, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_SEARCH)) {
- player.stop();
- player.setPlayWhenReady(true);
+ stopPlayerForPrepare(/* playWhenReady= */ true);
playbackPreparer.onPrepareFromSearch(query, extras);
}
}
@@ -998,45 +1230,53 @@ public final class MediaSessionConnector {
@Override
public void onPlayFromUri(Uri uri, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_URI)) {
- player.stop();
- player.setPlayWhenReady(true);
+ stopPlayerForPrepare(/* playWhenReady= */ true);
playbackPreparer.onPrepareFromUri(uri, extras);
}
}
@Override
public void onSetRating(RatingCompat rating) {
- if (canDispatchToRatingCallback(PlaybackStateCompat.ACTION_SET_RATING)) {
+ if (canDispatchSetRating()) {
ratingCallback.onSetRating(player, rating);
}
}
-
+
@Override
public void onSetRating(RatingCompat rating, Bundle extras) {
- if (canDispatchToRatingCallback(PlaybackStateCompat.ACTION_SET_RATING)) {
+ if (canDispatchSetRating()) {
ratingCallback.onSetRating(player, rating, extras);
}
}
@Override
public void onAddQueueItem(MediaDescriptionCompat description) {
- if (queueEditor != null) {
+ if (canDispatchQueueEdit()) {
queueEditor.onAddQueueItem(player, description);
}
}
@Override
public void onAddQueueItem(MediaDescriptionCompat description, int index) {
- if (queueEditor != null) {
+ if (canDispatchQueueEdit()) {
queueEditor.onAddQueueItem(player, description, index);
}
}
@Override
public void onRemoveQueueItem(MediaDescriptionCompat description) {
- if (queueEditor != null) {
+ if (canDispatchQueueEdit()) {
queueEditor.onRemoveQueueItem(player, description);
}
}
+
+ @Override
+ public boolean onMediaButtonEvent(Intent mediaButtonEvent) {
+ boolean isHandled =
+ canDispatchMediaButtonEvent()
+ && mediaButtonEventHandler.onMediaButtonEvent(
+ player, controlDispatcher, mediaButtonEvent);
+ return isHandled || super.onMediaButtonEvent(mediaButtonEvent);
+ }
}
}
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 057f59f62c..617b8781f4 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
@@ -18,17 +18,20 @@ package com.google.android.exoplayer2.ext.mediasession;
import android.content.Context;
import android.os.Bundle;
import android.support.v4.media.session.PlaybackStateCompat;
+import com.google.android.exoplayer2.ControlDispatcher;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.util.RepeatModeUtil;
-/**
- * Provides a custom action for toggling repeat modes.
- */
+/** Provides a custom action for toggling repeat modes. */
public final class RepeatModeActionProvider implements MediaSessionConnector.CustomActionProvider {
+ /** The default repeat toggle modes. */
+ @RepeatModeUtil.RepeatToggleModes
+ public static final int DEFAULT_REPEAT_TOGGLE_MODES =
+ RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE | RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL;
+
private static final String ACTION_REPEAT_MODE = "ACTION_EXO_REPEAT_MODE";
- private final Player player;
@RepeatModeUtil.RepeatToggleModes
private final int repeatToggleModes;
private final CharSequence repeatAllDescription;
@@ -37,27 +40,23 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
/**
* Creates a new instance.
- *
- * Equivalent to {@code RepeatModeActionProvider(context, player,
- * MediaSessionConnector.DEFAULT_REPEAT_TOGGLE_MODES)}.
+ *
+ *
Equivalent to {@code RepeatModeActionProvider(context, DEFAULT_REPEAT_TOGGLE_MODES)}.
*
* @param context The context.
- * @param player The player on which to toggle the repeat mode.
*/
- public RepeatModeActionProvider(Context context, Player player) {
- this(context, player, MediaSessionConnector.DEFAULT_REPEAT_TOGGLE_MODES);
+ public RepeatModeActionProvider(Context context) {
+ this(context, DEFAULT_REPEAT_TOGGLE_MODES);
}
/**
* Creates a new instance enabling the given repeat toggle modes.
*
* @param context The context.
- * @param player The player on which to toggle the repeat mode.
* @param repeatToggleModes The toggle modes to enable.
*/
- public RepeatModeActionProvider(Context context, Player player,
- @RepeatModeUtil.RepeatToggleModes int repeatToggleModes) {
- this.player = player;
+ public RepeatModeActionProvider(
+ Context context, @RepeatModeUtil.RepeatToggleModes int repeatToggleModes) {
this.repeatToggleModes = repeatToggleModes;
repeatAllDescription = context.getString(R.string.exo_media_action_repeat_all_description);
repeatOneDescription = context.getString(R.string.exo_media_action_repeat_one_description);
@@ -65,16 +64,17 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
}
@Override
- public void onCustomAction(String action, Bundle extras) {
+ public void onCustomAction(
+ Player player, ControlDispatcher controlDispatcher, String action, Bundle extras) {
int mode = player.getRepeatMode();
int proposedMode = RepeatModeUtil.getNextRepeatMode(mode, repeatToggleModes);
if (mode != proposedMode) {
- player.setRepeatMode(proposedMode);
+ controlDispatcher.dispatchSetRepeatMode(player, proposedMode);
}
}
@Override
- public PlaybackStateCompat.CustomAction getCustomAction() {
+ public PlaybackStateCompat.CustomAction getCustomAction(Player player) {
CharSequence actionLabel;
int iconResourceId;
switch (player.getRepeatMode()) {
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 7c00fcdf17..d076404bb4 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
@@ -17,12 +17,13 @@ package com.google.android.exoplayer2.ext.mediasession;
import android.os.Bundle;
import android.os.ResultReceiver;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ControlDispatcher;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
import com.google.android.exoplayer2.source.MediaSource;
@@ -186,20 +187,23 @@ public final class TimelineQueueEditor
// CommandReceiver implementation.
- @NonNull
@Override
- public String[] getCommands() {
- return new String[] {COMMAND_MOVE_QUEUE_ITEM};
- }
-
- @Override
- public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
+ public boolean onCommand(
+ Player player,
+ ControlDispatcher controlDispatcher,
+ String command,
+ Bundle extras,
+ ResultReceiver cb) {
+ if (!COMMAND_MOVE_QUEUE_ITEM.equals(command)) {
+ return false;
+ }
int from = extras.getInt(EXTRA_FROM_INDEX, C.INDEX_UNSET);
int to = extras.getInt(EXTRA_TO_INDEX, C.INDEX_UNSET);
if (from != C.INDEX_UNSET && to != C.INDEX_UNSET) {
queueDataAdapter.move(from, to);
queueMediaSource.moveMediaSource(from, to);
}
+ return true;
}
}
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index d55f8e04f0..6e61ad2fe2 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -17,17 +17,18 @@ package com.google.android.exoplayer2.ext.mediasession;
import android.os.Bundle;
import android.os.ResultReceiver;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ControlDispatcher;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.util.Assertions;
+import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.List;
/**
* An abstract implementation of the {@link MediaSessionConnector.QueueNavigator} that maps the
@@ -40,7 +41,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
private final MediaSessionCompat mediaSession;
private final Timeline.Window window;
- protected final int maxQueueSize;
+ private final int maxQueueSize;
private long activeQueueItemId;
@@ -66,6 +67,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
* @param maxQueueSize The maximum queue size.
*/
public TimelineQueueNavigator(MediaSessionCompat mediaSession, int maxQueueSize) {
+ Assertions.checkState(maxQueueSize > 0);
this.mediaSession = mediaSession;
this.maxQueueSize = maxQueueSize;
activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
@@ -75,6 +77,11 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
/**
* Gets the {@link MediaDescriptionCompat} for a given timeline window index.
*
+ *
Often artworks and icons need to be loaded asynchronously. In such a case, return a {@link
+ * MediaDescriptionCompat} without the images, load your images asynchronously off the main thread
+ * and then call {@link MediaSessionConnector#invalidateMediaSessionQueue()} to make the connector
+ * update the queue by calling {@link #getMediaDescription(Player, int)} again.
+ *
* @param player The current player.
* @param windowIndex The timeline window index for which to provide a description.
* @return A {@link MediaDescriptionCompat}.
@@ -83,21 +90,25 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
@Override
public long getSupportedQueueNavigatorActions(Player player) {
- if (player == null) {
- return 0;
- }
+ boolean enableSkipTo = false;
+ boolean enablePrevious = false;
+ boolean enableNext = false;
Timeline timeline = player.getCurrentTimeline();
- if (timeline.isEmpty() || player.isPlayingAd()) {
- return 0;
+ if (!timeline.isEmpty() && !player.isPlayingAd()) {
+ timeline.getWindow(player.getCurrentWindowIndex(), window);
+ enableSkipTo = timeline.getWindowCount() > 1;
+ enablePrevious = window.isSeekable || !window.isDynamic || player.hasPrevious();
+ enableNext = window.isDynamic || player.hasNext();
}
+
long actions = 0;
- if (timeline.getWindowCount() > 1) {
+ if (enableSkipTo) {
actions |= PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM;
}
- if (window.isSeekable || !window.isDynamic || player.hasPrevious()) {
+ if (enablePrevious) {
actions |= PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;
}
- if (window.isDynamic || player.hasNext()) {
+ if (enableNext) {
actions |= PlaybackStateCompat.ACTION_SKIP_TO_NEXT;
}
return actions;
@@ -124,7 +135,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
}
@Override
- public void onSkipToPrevious(Player player) {
+ public void onSkipToPrevious(Player player, ControlDispatcher controlDispatcher) {
Timeline timeline = player.getCurrentTimeline();
if (timeline.isEmpty() || player.isPlayingAd()) {
return;
@@ -135,26 +146,26 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
if (previousWindowIndex != C.INDEX_UNSET
&& (player.getCurrentPosition() <= MAX_POSITION_FOR_SEEK_TO_PREVIOUS
|| (window.isDynamic && !window.isSeekable))) {
- player.seekTo(previousWindowIndex, C.TIME_UNSET);
+ controlDispatcher.dispatchSeekTo(player, previousWindowIndex, C.TIME_UNSET);
} else {
- player.seekTo(0);
+ controlDispatcher.dispatchSeekTo(player, windowIndex, 0);
}
}
@Override
- public void onSkipToQueueItem(Player player, long id) {
+ public void onSkipToQueueItem(Player player, ControlDispatcher controlDispatcher, long id) {
Timeline timeline = player.getCurrentTimeline();
if (timeline.isEmpty() || player.isPlayingAd()) {
return;
}
int windowIndex = (int) id;
if (0 <= windowIndex && windowIndex < timeline.getWindowCount()) {
- player.seekTo(windowIndex, C.TIME_UNSET);
+ controlDispatcher.dispatchSeekTo(player, windowIndex, C.TIME_UNSET);
}
}
@Override
- public void onSkipToNext(Player player) {
+ public void onSkipToNext(Player player, ControlDispatcher controlDispatcher) {
Timeline timeline = player.getCurrentTimeline();
if (timeline.isEmpty() || player.isPlayingAd()) {
return;
@@ -162,42 +173,71 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
int windowIndex = player.getCurrentWindowIndex();
int nextWindowIndex = player.getNextWindowIndex();
if (nextWindowIndex != C.INDEX_UNSET) {
- player.seekTo(nextWindowIndex, C.TIME_UNSET);
+ controlDispatcher.dispatchSeekTo(player, nextWindowIndex, C.TIME_UNSET);
} else if (timeline.getWindow(windowIndex, window).isDynamic) {
- player.seekTo(windowIndex, C.TIME_UNSET);
+ controlDispatcher.dispatchSeekTo(player, windowIndex, C.TIME_UNSET);
}
}
// CommandReceiver implementation.
@Override
- public String[] getCommands() {
- return null;
+ public boolean onCommand(
+ Player player,
+ ControlDispatcher controlDispatcher,
+ String command,
+ Bundle extras,
+ ResultReceiver cb) {
+ return false;
}
- @Override
- public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
- // Do nothing.
- }
+ // Helper methods.
private void publishFloatingQueueWindow(Player player) {
- if (player.getCurrentTimeline().isEmpty()) {
+ Timeline timeline = player.getCurrentTimeline();
+ if (timeline.isEmpty()) {
mediaSession.setQueue(Collections.emptyList());
activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
return;
}
- int windowCount = player.getCurrentTimeline().getWindowCount();
+ ArrayDeque queue = new ArrayDeque<>();
+ int queueSize = Math.min(maxQueueSize, timeline.getWindowCount());
+
+ // Add the active queue item.
int currentWindowIndex = player.getCurrentWindowIndex();
- int queueSize = Math.min(maxQueueSize, windowCount);
- int startIndex = Util.constrainValue(currentWindowIndex - ((queueSize - 1) / 2), 0,
- windowCount - queueSize);
- List queue = new ArrayList<>();
- for (int i = startIndex; i < startIndex + queueSize; i++) {
- queue.add(new MediaSessionCompat.QueueItem(getMediaDescription(player, i), i));
+ queue.add(
+ new MediaSessionCompat.QueueItem(
+ getMediaDescription(player, currentWindowIndex), currentWindowIndex));
+
+ // Fill queue alternating with next and/or previous queue items.
+ int firstWindowIndex = currentWindowIndex;
+ int lastWindowIndex = currentWindowIndex;
+ boolean shuffleModeEnabled = player.getShuffleModeEnabled();
+ while ((firstWindowIndex != C.INDEX_UNSET || lastWindowIndex != C.INDEX_UNSET)
+ && queue.size() < queueSize) {
+ // Begin with next to have a longer tail than head if an even sized queue needs to be trimmed.
+ if (lastWindowIndex != C.INDEX_UNSET) {
+ lastWindowIndex =
+ timeline.getNextWindowIndex(
+ lastWindowIndex, Player.REPEAT_MODE_OFF, shuffleModeEnabled);
+ if (lastWindowIndex != C.INDEX_UNSET) {
+ queue.add(
+ new MediaSessionCompat.QueueItem(
+ getMediaDescription(player, lastWindowIndex), lastWindowIndex));
+ }
+ }
+ if (firstWindowIndex != C.INDEX_UNSET && queue.size() < queueSize) {
+ firstWindowIndex =
+ timeline.getPreviousWindowIndex(
+ firstWindowIndex, Player.REPEAT_MODE_OFF, shuffleModeEnabled);
+ if (firstWindowIndex != C.INDEX_UNSET) {
+ queue.addFirst(
+ new MediaSessionCompat.QueueItem(
+ getMediaDescription(player, firstWindowIndex), firstWindowIndex));
+ }
+ }
}
- mediaSession.setQueue(queue);
+ mediaSession.setQueue(new ArrayList<>(queue));
activeQueueItemId = currentWindowIndex;
}
-
}
-
diff --git a/extensions/okhttp/README.md b/extensions/okhttp/README.md
index 73297b54a9..2f9893fe3b 100644
--- a/extensions/okhttp/README.md
+++ b/extensions/okhttp/README.md
@@ -3,7 +3,7 @@
The OkHttp extension is an [HttpDataSource][] implementation using Square's
[OkHttp][].
-[HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
+[HttpDataSource]: https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
[OkHttp]: https://square.github.io/okhttp/
## License note ##
@@ -61,4 +61,4 @@ respectively.
* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.okhttp.*`
belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index 78825a6277..db2e073c8a 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -28,11 +27,13 @@ android {
targetSdkVersion project.ext.targetSdkVersion
consumerProguardFiles 'proguard-rules.txt'
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
implementation project(modulePrefix + 'library-core')
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+ implementation 'androidx.annotation:annotation:1.0.2'
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 778277fdbc..a749495184 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
@@ -18,9 +18,10 @@ package com.google.android.exoplayer2.ext.okhttp;
import static com.google.android.exoplayer2.util.Util.castNonNull;
import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
+import com.google.android.exoplayer2.metadata.icy.IcyHeaders;
import com.google.android.exoplayer2.upstream.BaseDataSource;
import com.google.android.exoplayer2.upstream.DataSourceException;
import com.google.android.exoplayer2.upstream.DataSpec;
@@ -263,7 +264,6 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
private Request makeRequest(DataSpec dataSpec) throws HttpDataSourceException {
long position = dataSpec.position;
long length = dataSpec.length;
- boolean allowGzip = dataSpec.isFlagSet(DataSpec.FLAG_ALLOW_GZIP);
HttpUrl url = HttpUrl.parse(dataSpec.uri.toString());
if (url == null) {
@@ -293,10 +293,14 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
if (userAgent != null) {
builder.addHeader("User-Agent", userAgent);
}
-
- if (!allowGzip) {
+ if (!dataSpec.isFlagSet(DataSpec.FLAG_ALLOW_GZIP)) {
builder.addHeader("Accept-Encoding", "identity");
}
+ if (dataSpec.isFlagSet(DataSpec.FLAG_ALLOW_ICY_METADATA)) {
+ builder.addHeader(
+ IcyHeaders.REQUEST_HEADER_ENABLE_METADATA_NAME,
+ IcyHeaders.REQUEST_HEADER_ENABLE_METADATA_VALUE);
+ }
RequestBody requestBody = null;
if (dataSpec.httpBody != null) {
requestBody = RequestBody.create(null, dataSpec.httpBody);
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 09f4e0b61a..d0ef35cb07 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2.ext.okhttp;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.upstream.HttpDataSource;
import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory;
import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
diff --git a/extensions/opus/README.md b/extensions/opus/README.md
index 15c3e5413d..95c6807275 100644
--- a/extensions/opus/README.md
+++ b/extensions/opus/README.md
@@ -98,4 +98,4 @@ player, then implement your own logic to use the renderer for a given track.
* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.opus.*`
belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
index cb12442de8..56acbdb7d3 100644
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -34,11 +33,15 @@ android {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
implementation project(modulePrefix + 'library-core')
- androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
+ testImplementation project(modulePrefix + 'testutils-robolectric')
+ androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
+ androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
}
ext {
diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml
index 5ba0f3c0f4..7f775f4d32 100644
--- a/extensions/opus/src/androidTest/AndroidManifest.xml
+++ b/extensions/opus/src/androidTest/AndroidManifest.xml
@@ -18,6 +18,9 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.google.android.exoplayer2.ext.opus.test">
+
+
+
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 c457514c87..dcd5f4957a 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
@@ -15,21 +15,21 @@
*/
package com.google.android.exoplayer2.ext.opus;
-import static androidx.test.InstrumentationRegistry.getContext;
import static org.junit.Assert.fail;
import android.content.Context;
import android.net.Uri;
import android.os.Looper;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.ExoPlayerFactory;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import org.junit.Before;
@@ -56,7 +56,7 @@ public class OpusPlaybackTest {
private void playUri(String uri) throws Exception {
TestPlaybackRunnable testPlaybackRunnable =
- new TestPlaybackRunnable(Uri.parse(uri), getContext());
+ new TestPlaybackRunnable(Uri.parse(uri), ApplicationProvider.getApplicationContext());
Thread thread = new Thread(testPlaybackRunnable);
thread.start();
thread.join();
@@ -83,12 +83,12 @@ public class OpusPlaybackTest {
Looper.prepare();
LibopusAudioRenderer audioRenderer = new LibopusAudioRenderer();
DefaultTrackSelector trackSelector = new DefaultTrackSelector();
- player = ExoPlayerFactory.newInstance(new Renderer[] {audioRenderer}, trackSelector);
+ player = ExoPlayerFactory.newInstance(context, new Renderer[] {audioRenderer}, trackSelector);
player.addListener(this);
MediaSource mediaSource =
- new ExtractorMediaSource.Factory(
- new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"))
- .setExtractorsFactory(MatroskaExtractor.FACTORY)
+ new ProgressiveMediaSource.Factory(
+ new DefaultDataSourceFactory(context, "ExoPlayerExtOpusTest"),
+ MatroskaExtractor.FACTORY)
.createMediaSource(uri);
player.prepare(mediaSource);
player.setPlayWhenReady(true);
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 e288339058..59337c0847 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
@@ -47,7 +47,9 @@ public final class LibopusAudioRenderer extends SimpleDecoderAudioRenderer {
* @param eventListener A listener of events. May be null if delivery of events is not required.
* @param audioProcessors Optional {@link AudioProcessor}s that will process audio before output.
*/
- public LibopusAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
+ public LibopusAudioRenderer(
+ Handler eventHandler,
+ AudioRendererEventListener eventListener,
AudioProcessor... audioProcessors) {
super(eventHandler, eventListener, audioProcessors);
}
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 4cb3ce3190..285be96388 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
@@ -27,7 +27,7 @@ public final class OpusLibrary {
ExoPlayerLibraryInfo.registerModule("goog.exo.opus");
}
- private static final LibraryLoader LOADER = new LibraryLoader("opusJNI");
+ private static final LibraryLoader LOADER = new LibraryLoader("opusV2JNI");
private OpusLibrary() {}
diff --git a/extensions/opus/src/main/jni/Android.mk b/extensions/opus/src/main/jni/Android.mk
index 9d1e4fe726..0b06d9ecd8 100644
--- a/extensions/opus/src/main/jni/Android.mk
+++ b/extensions/opus/src/main/jni/Android.mk
@@ -21,10 +21,10 @@ include $(CLEAR_VARS)
LOCAL_PATH := $(WORKING_DIR)
include libopus.mk
-# build libopusJNI.so
+# build libopusV2JNI.so
include $(CLEAR_VARS)
LOCAL_PATH := $(WORKING_DIR)
-LOCAL_MODULE := libopusJNI
+LOCAL_MODULE := libopusV2JNI
LOCAL_ARM_MODE := arm
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := opus_jni.cc
diff --git a/extensions/opus/src/test/AndroidManifest.xml b/extensions/opus/src/test/AndroidManifest.xml
new file mode 100644
index 0000000000..ac6a3bf68f
--- /dev/null
+++ b/extensions/opus/src/test/AndroidManifest.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java b/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
new file mode 100644
index 0000000000..e57ad84a41
--- /dev/null
+++ b/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.opus;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibopusAudioRenderer}. */
+@RunWith(AndroidJUnit4.class)
+public final class DefaultRenderersFactoryTest {
+
+ @Test
+ public void createRenderers_instantiatesVpxRenderer() {
+ DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
+ LibopusAudioRenderer.class, C.TRACK_TYPE_AUDIO);
+ }
+}
diff --git a/extensions/rtmp/README.md b/extensions/rtmp/README.md
index 3863dff965..a34341692b 100644
--- a/extensions/rtmp/README.md
+++ b/extensions/rtmp/README.md
@@ -3,7 +3,7 @@
The RTMP extension is a [DataSource][] implementation for playing [RTMP][]
streams using [LibRtmp Client for Android][].
-[DataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/DataSource.html
+[DataSource]: https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/upstream/DataSource.html
[RTMP]: https://en.wikipedia.org/wiki/Real-Time_Messaging_Protocol
[LibRtmp Client for Android]: https://github.com/ant-media/LibRtmp-Client-for-Android
@@ -53,4 +53,4 @@ doesn't need to handle any other protocols, you can update any `DataSource`s and
* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.rtmp.*`
belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle
index af02ee2eaa..ca734c3657 100644
--- a/extensions/rtmp/build.gradle
+++ b/extensions/rtmp/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -24,17 +23,18 @@ android {
}
defaultConfig {
- minSdkVersion 15
+ minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
implementation project(modulePrefix + 'library-core')
implementation 'net.butterflytv.utils:rtmp-client:3.0.1'
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
- testImplementation 'junit:junit:' + junitVersion
- testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+ implementation 'androidx.annotation:annotation:1.0.2'
+ testImplementation project(modulePrefix + 'testutils-robolectric')
}
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 08c328ce81..272a8d1eb4 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
@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.ext.rtmp;
import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
import com.google.android.exoplayer2.upstream.BaseDataSource;
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 d1350276f2..36abf825d6 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2.ext.rtmp;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
import com.google.android.exoplayer2.upstream.TransferListener;
diff --git a/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java b/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
index f4753798b8..469e66a884 100644
--- a/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
+++ b/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
@@ -16,23 +16,25 @@
package com.google.android.exoplayer2.ext.rtmp;
import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.DefaultDataSource;
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
/** Unit test for {@link DefaultDataSource} with RTMP URIs. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
public final class DefaultDataSourceTest {
@Test
public void openRtmpDataSpec_instantiatesRtmpDataSourceViaReflection() throws IOException {
DefaultDataSource dataSource =
new DefaultDataSource(
- RuntimeEnvironment.application, "userAgent", /* allowCrossProtocolRedirects= */ false);
+ ApplicationProvider.getApplicationContext(),
+ "userAgent",
+ /* allowCrossProtocolRedirects= */ false);
DataSpec dataSpec = new DataSpec(Uri.parse("rtmp://test.com/stream"));
try {
dataSource.open(dataSpec);
diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 306f04d0e2..0de29eea32 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -34,24 +34,20 @@ VP9_EXT_PATH="${EXOPLAYER_ROOT}/extensions/vp9/src/main"
NDK_PATH=""
```
-* Fetch libvpx and libyuv:
+* Fetch libvpx:
```
cd "${VP9_EXT_PATH}/jni" && \
-git clone https://chromium.googlesource.com/webm/libvpx libvpx && \
-git clone https://chromium.googlesource.com/libyuv/libyuv libyuv
+git clone https://chromium.googlesource.com/webm/libvpx libvpx
```
-* Checkout the appropriate branches of libvpx and libyuv (the scripts and
- makefiles bundled in this repo are known to work only at these versions of the
- libraries - we will update this periodically as newer versions of
- libvpx/libyuv are released):
+* Checkout the appropriate branch of libvpx (the scripts and makefiles bundled
+ in this repo are known to work only at specific versions of the library - we
+ will update this periodically as newer versions of libvpx are released):
```
cd "${VP9_EXT_PATH}/jni/libvpx" && \
-git checkout tags/v1.7.0 -b v1.7.0 && \
-cd "${VP9_EXT_PATH}/jni/libyuv" && \
-git checkout 996a2bbd
+git checkout tags/v1.8.0 -b v1.8.0
```
* Run a script that generates necessary configuration files for libvpx:
@@ -78,10 +74,10 @@ ${NDK_PATH}/ndk-build APP_ABI=all -j4
* Android config scripts should be re-generated by running
`generate_libvpx_android_configs.sh`
* Clean and re-build the project.
-* If you want to use your own version of libvpx or libyuv, place it in
- `${VP9_EXT_PATH}/jni/libvpx` or `${VP9_EXT_PATH}/jni/libyuv` respectively. But
- please note that `generate_libvpx_android_configs.sh` and the makefiles need
- to be modified to work with arbitrary versions of libvpx and libyuv.
+* If you want to use your own version of libvpx, place it in
+ `${VP9_EXT_PATH}/jni/libvpx`. Please note that
+ `generate_libvpx_android_configs.sh` and the makefiles may need to be modified
+ to work with arbitrary versions of libvpx.
## Using the extension ##
@@ -123,4 +119,4 @@ type `LibvpxVideoRenderer.MSG_SET_OUTPUT_BUFFER_RENDERER` with the
* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.vp9.*`
belong to this module.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index 96c58d7a57..02b68b831d 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -34,13 +33,17 @@ android {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
implementation project(modulePrefix + 'library-core')
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
- androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
- androidTestImplementation 'com.google.truth:truth:' + truthVersion
+ implementation 'androidx.annotation:annotation:1.0.2'
+ testImplementation project(modulePrefix + 'testutils-robolectric')
+ androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
+ androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
+ androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion
}
ext {
diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml
index 214427c4f0..6ca2e7164a 100644
--- a/extensions/vp9/src/androidTest/AndroidManifest.xml
+++ b/extensions/vp9/src/androidTest/AndroidManifest.xml
@@ -18,6 +18,9 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.google.android.exoplayer2.ext.vp9.test">
+
+
+
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 2eb5c87e04..5120004889 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
@@ -15,22 +15,22 @@
*/
package com.google.android.exoplayer2.ext.vp9;
-import static androidx.test.InstrumentationRegistry.getContext;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;
import android.content.Context;
import android.net.Uri;
import android.os.Looper;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.ExoPlayerFactory;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import com.google.android.exoplayer2.util.Log;
@@ -89,7 +89,7 @@ public class VpxPlaybackTest {
private void playUri(String uri) throws Exception {
TestPlaybackRunnable testPlaybackRunnable =
- new TestPlaybackRunnable(Uri.parse(uri), getContext());
+ new TestPlaybackRunnable(Uri.parse(uri), ApplicationProvider.getApplicationContext());
Thread thread = new Thread(testPlaybackRunnable);
thread.start();
thread.join();
@@ -114,14 +114,14 @@ public class VpxPlaybackTest {
@Override
public void run() {
Looper.prepare();
- LibvpxVideoRenderer videoRenderer = new LibvpxVideoRenderer(true, 0);
+ LibvpxVideoRenderer videoRenderer = new LibvpxVideoRenderer(0);
DefaultTrackSelector trackSelector = new DefaultTrackSelector();
- player = ExoPlayerFactory.newInstance(new Renderer[] {videoRenderer}, trackSelector);
+ player = ExoPlayerFactory.newInstance(context, new Renderer[] {videoRenderer}, trackSelector);
player.addListener(this);
MediaSource mediaSource =
- new ExtractorMediaSource.Factory(
- new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"))
- .setExtractorsFactory(MatroskaExtractor.FACTORY)
+ new ProgressiveMediaSource.Factory(
+ new DefaultDataSourceFactory(context, "ExoPlayerExtVp9Test"),
+ MatroskaExtractor.FACTORY)
.createMediaSource(uri);
player
.createMessage(videoRenderer)
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 e3081cd2d2..d5da9a011d 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
@@ -15,14 +15,14 @@
*/
package com.google.android.exoplayer2.ext.vp9;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
+import static java.lang.Runtime.getRuntime;
+
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
-import android.support.annotation.CallSuper;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.CallSuper;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import android.view.Surface;
import com.google.android.exoplayer2.BaseRenderer;
import com.google.android.exoplayer2.C;
@@ -97,19 +97,17 @@ public class LibvpxVideoRenderer extends BaseRenderer {
*/
public static final int MSG_SET_OUTPUT_BUFFER_RENDERER = C.MSG_CUSTOM_BASE;
- /**
- * The number of input buffers.
- */
- private static final int NUM_INPUT_BUFFERS = 8;
+ /** The number of input buffers. */
+ private final int numInputBuffers;
/**
* The number of output buffers. The renderer may limit the minimum possible value due to
* requiring multiple output buffers to be dequeued at a time for it to make progress.
*/
- private static final int NUM_OUTPUT_BUFFERS = 8;
+ private final int numOutputBuffers;
/** The default input buffer size. */
private static final int DEFAULT_INPUT_BUFFER_SIZE = 768 * 1024; // Value based on cs/SoftVpx.cpp.
- private final boolean scaleToFit;
+ private final boolean enableRowMultiThreadMode;
private final boolean disableLoopFilter;
private final long allowedJoiningTimeMs;
private final int maxDroppedFramesToNotify;
@@ -119,7 +117,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
private final TimedValueQueue formatQueue;
private final DecoderInputBuffer flagsOnlyBuffer;
private final DrmSessionManager drmSessionManager;
- private final boolean useSurfaceYuvOutput;
+ private final int threads;
private Format format;
private Format pendingFormat;
@@ -127,13 +125,12 @@ public class LibvpxVideoRenderer extends BaseRenderer {
private VpxDecoder decoder;
private VpxInputBuffer inputBuffer;
private VpxOutputBuffer outputBuffer;
- private DrmSession drmSession;
- private DrmSession pendingDrmSession;
+ @Nullable private DrmSession decoderDrmSession;
+ @Nullable private DrmSession sourceDrmSession;
private @ReinitializationState int decoderReinitializationState;
private boolean decoderReceivedBuffers;
- private Bitmap bitmap;
private boolean renderedFirstFrame;
private long initialPositionUs;
private long joiningDeadlineMs;
@@ -158,16 +155,14 @@ public class LibvpxVideoRenderer extends BaseRenderer {
protected DecoderCounters decoderCounters;
/**
- * @param scaleToFit Whether video frames should be scaled to fit when rendering.
* @param allowedJoiningTimeMs The maximum duration in milliseconds for which this video renderer
* can attempt to seamlessly join an ongoing playback.
*/
- public LibvpxVideoRenderer(boolean scaleToFit, long allowedJoiningTimeMs) {
- this(scaleToFit, allowedJoiningTimeMs, null, null, 0);
+ public LibvpxVideoRenderer(long allowedJoiningTimeMs) {
+ this(allowedJoiningTimeMs, null, null, 0);
}
/**
- * @param scaleToFit Whether video frames should be scaled to fit when rendering.
* @param allowedJoiningTimeMs The maximum duration in milliseconds for which this video renderer
* can attempt to seamlessly join an ongoing playback.
* @param eventHandler A handler to use when delivering events to {@code eventListener}. May be
@@ -176,23 +171,22 @@ public class LibvpxVideoRenderer extends BaseRenderer {
* @param maxDroppedFramesToNotify The maximum number of frames that can be dropped between
* invocations of {@link VideoRendererEventListener#onDroppedFrames(int, long)}.
*/
- public LibvpxVideoRenderer(boolean scaleToFit, long allowedJoiningTimeMs,
- Handler eventHandler, VideoRendererEventListener eventListener,
+ public LibvpxVideoRenderer(
+ long allowedJoiningTimeMs,
+ Handler eventHandler,
+ VideoRendererEventListener eventListener,
int maxDroppedFramesToNotify) {
this(
- scaleToFit,
allowedJoiningTimeMs,
eventHandler,
eventListener,
maxDroppedFramesToNotify,
/* drmSessionManager= */ null,
/* playClearSamplesWithoutKeys= */ false,
- /* disableLoopFilter= */ false,
- /* useSurfaceYuvOutput= */ false);
+ /* disableLoopFilter= */ false);
}
/**
- * @param scaleToFit Whether video frames should be scaled to fit when rendering.
* @param allowedJoiningTimeMs The maximum duration in milliseconds for which this video renderer
* can attempt to seamlessly join an ongoing playback.
* @param eventHandler A handler to use when delivering events to {@code eventListener}. May be
@@ -208,10 +202,51 @@ public class LibvpxVideoRenderer extends BaseRenderer {
* 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 disableLoopFilter Disable the libvpx in-loop smoothing filter.
- * @param useSurfaceYuvOutput Directly output YUV to the Surface via ANativeWindow.
*/
public LibvpxVideoRenderer(
- boolean scaleToFit,
+ long allowedJoiningTimeMs,
+ Handler eventHandler,
+ VideoRendererEventListener eventListener,
+ int maxDroppedFramesToNotify,
+ DrmSessionManager drmSessionManager,
+ boolean playClearSamplesWithoutKeys,
+ boolean disableLoopFilter) {
+ this(
+ allowedJoiningTimeMs,
+ eventHandler,
+ eventListener,
+ maxDroppedFramesToNotify,
+ drmSessionManager,
+ playClearSamplesWithoutKeys,
+ disableLoopFilter,
+ /* enableRowMultiThreadMode= */ false,
+ getRuntime().availableProcessors(),
+ /* numInputBuffers= */ 4,
+ /* numOutputBuffers= */ 4);
+ }
+
+ /**
+ * @param allowedJoiningTimeMs The maximum duration in milliseconds for which this video renderer
+ * can attempt to seamlessly join an ongoing playback.
+ * @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 maxDroppedFramesToNotify The maximum number of frames that can be dropped between
+ * invocations of {@link VideoRendererEventListener#onDroppedFrames(int, long)}.
+ * @param drmSessionManager For use with encrypted media. May be null if support for encrypted
+ * media 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 disableLoopFilter Disable the libvpx in-loop smoothing filter.
+ * @param enableRowMultiThreadMode Whether row multi threading decoding is enabled.
+ * @param threads Number of threads libvpx will use to decode.
+ * @param numInputBuffers Number of input buffers.
+ * @param numOutputBuffers Number of output buffers.
+ */
+ public LibvpxVideoRenderer(
long allowedJoiningTimeMs,
Handler eventHandler,
VideoRendererEventListener eventListener,
@@ -219,15 +254,20 @@ public class LibvpxVideoRenderer extends BaseRenderer {
DrmSessionManager drmSessionManager,
boolean playClearSamplesWithoutKeys,
boolean disableLoopFilter,
- boolean useSurfaceYuvOutput) {
+ boolean enableRowMultiThreadMode,
+ int threads,
+ int numInputBuffers,
+ int numOutputBuffers) {
super(C.TRACK_TYPE_VIDEO);
- this.scaleToFit = scaleToFit;
this.disableLoopFilter = disableLoopFilter;
this.allowedJoiningTimeMs = allowedJoiningTimeMs;
this.maxDroppedFramesToNotify = maxDroppedFramesToNotify;
this.drmSessionManager = drmSessionManager;
this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
- this.useSurfaceYuvOutput = useSurfaceYuvOutput;
+ this.enableRowMultiThreadMode = enableRowMultiThreadMode;
+ this.threads = threads;
+ this.numInputBuffers = numInputBuffers;
+ this.numOutputBuffers = numOutputBuffers;
joiningDeadlineMs = C.TIME_UNSET;
clearReportedVideoSize();
formatHolder = new FormatHolder();
@@ -364,24 +404,10 @@ public class LibvpxVideoRenderer extends BaseRenderer {
clearReportedVideoSize();
clearRenderedFirstFrame();
try {
+ setSourceDrmSession(null);
releaseDecoder();
} finally {
- try {
- if (drmSession != null) {
- drmSessionManager.releaseSession(drmSession);
- }
- } finally {
- try {
- if (pendingDrmSession != null && pendingDrmSession != drmSession) {
- drmSessionManager.releaseSession(pendingDrmSession);
- }
- } finally {
- drmSession = null;
- pendingDrmSession = null;
- decoderCounters.ensureUpdated();
- eventDispatcher.disabled(decoderCounters);
- }
- }
+ eventDispatcher.disabled(decoderCounters);
}
}
@@ -433,18 +459,35 @@ public class LibvpxVideoRenderer extends BaseRenderer {
/** Releases the decoder. */
@CallSuper
protected void releaseDecoder() {
- if (decoder == null) {
- return;
- }
-
inputBuffer = null;
outputBuffer = null;
- decoder.release();
- decoder = null;
- decoderCounters.decoderReleaseCount++;
decoderReinitializationState = REINITIALIZATION_STATE_NONE;
decoderReceivedBuffers = false;
buffersInCodecCount = 0;
+ if (decoder != null) {
+ decoder.release();
+ decoder = null;
+ decoderCounters.decoderReleaseCount++;
+ }
+ setDecoderDrmSession(null);
+ }
+
+ private void setSourceDrmSession(@Nullable DrmSession session) {
+ DrmSession previous = sourceDrmSession;
+ sourceDrmSession = session;
+ releaseDrmSessionIfUnused(previous);
+ }
+
+ private void setDecoderDrmSession(@Nullable DrmSession session) {
+ DrmSession previous = decoderDrmSession;
+ decoderDrmSession = session;
+ releaseDrmSessionIfUnused(previous);
+ }
+
+ private void releaseDrmSessionIfUnused(@Nullable DrmSession session) {
+ if (session != null && session != decoderDrmSession && session != sourceDrmSession) {
+ drmSessionManager.releaseSession(session);
+ }
}
/**
@@ -467,16 +510,20 @@ public class LibvpxVideoRenderer extends BaseRenderer {
throw ExoPlaybackException.createForRenderer(
new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
}
- pendingDrmSession = drmSessionManager.acquireSession(Looper.myLooper(), format.drmInitData);
- if (pendingDrmSession == drmSession) {
- drmSessionManager.releaseSession(pendingDrmSession);
+ 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 {
- pendingDrmSession = null;
+ setSourceDrmSession(null);
}
}
- if (pendingDrmSession != drmSession) {
+ if (sourceDrmSession != decoderDrmSession) {
if (decoderReceivedBuffers) {
// Signal end of stream and wait for any final output buffers before re-initialization.
decoderReinitializationState = REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM;
@@ -579,18 +626,14 @@ public class LibvpxVideoRenderer extends BaseRenderer {
*/
protected void renderOutputBuffer(VpxOutputBuffer outputBuffer) throws VpxDecoderException {
int bufferMode = outputBuffer.mode;
- boolean renderRgb = bufferMode == VpxDecoder.OUTPUT_MODE_RGB && surface != null;
boolean renderSurface = bufferMode == VpxDecoder.OUTPUT_MODE_SURFACE_YUV && surface != null;
boolean renderYuv = bufferMode == VpxDecoder.OUTPUT_MODE_YUV && outputBufferRenderer != null;
lastRenderTimeUs = SystemClock.elapsedRealtime() * 1000;
- if (!renderRgb && !renderYuv && !renderSurface) {
+ if (!renderYuv && !renderSurface) {
dropOutputBuffer(outputBuffer);
} else {
maybeNotifyVideoSizeChanged(outputBuffer.width, outputBuffer.height);
- if (renderRgb) {
- renderRgbFrame(outputBuffer, scaleToFit);
- outputBuffer.release();
- } else if (renderYuv) {
+ if (renderYuv) {
outputBufferRenderer.setOutputBuffer(outputBuffer);
// The renderer will release the buffer.
} else { // renderSurface
@@ -668,8 +711,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
this.surface = surface;
this.outputBufferRenderer = outputBufferRenderer;
if (surface != null) {
- outputMode =
- useSurfaceYuvOutput ? VpxDecoder.OUTPUT_MODE_SURFACE_YUV : VpxDecoder.OUTPUT_MODE_RGB;
+ outputMode = VpxDecoder.OUTPUT_MODE_SURFACE_YUV;
} else {
outputMode =
outputBufferRenderer != null ? VpxDecoder.OUTPUT_MODE_YUV : VpxDecoder.OUTPUT_MODE_NONE;
@@ -704,12 +746,13 @@ public class LibvpxVideoRenderer extends BaseRenderer {
return;
}
- drmSession = pendingDrmSession;
+ setDecoderDrmSession(sourceDrmSession);
+
ExoMediaCrypto mediaCrypto = null;
- if (drmSession != null) {
- mediaCrypto = drmSession.getMediaCrypto();
+ if (decoderDrmSession != null) {
+ mediaCrypto = decoderDrmSession.getMediaCrypto();
if (mediaCrypto == null) {
- DrmSessionException drmError = drmSession.getError();
+ DrmSessionException drmError = decoderDrmSession.getError();
if (drmError != null) {
// Continue for now. We may be able to avoid failure if the session recovers, or if a new
// input format causes the session to be replaced before it's used.
@@ -727,12 +770,13 @@ public class LibvpxVideoRenderer extends BaseRenderer {
format.maxInputSize != Format.NO_VALUE ? format.maxInputSize : DEFAULT_INPUT_BUFFER_SIZE;
decoder =
new VpxDecoder(
- NUM_INPUT_BUFFERS,
- NUM_OUTPUT_BUFFERS,
+ numInputBuffers,
+ numOutputBuffers,
initialInputBufferSize,
mediaCrypto,
disableLoopFilter,
- useSurfaceYuvOutput);
+ enableRowMultiThreadMode,
+ threads);
decoder.setOutputMode(outputMode);
TraceUtil.endSection();
long decoderInitializedTimestamp = SystemClock.elapsedRealtime();
@@ -922,33 +966,16 @@ public class LibvpxVideoRenderer extends BaseRenderer {
}
private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
- if (drmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
+ if (decoderDrmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
return false;
}
- @DrmSession.State int drmSessionState = drmSession.getState();
+ @DrmSession.State int drmSessionState = decoderDrmSession.getState();
if (drmSessionState == DrmSession.STATE_ERROR) {
- throw ExoPlaybackException.createForRenderer(drmSession.getError(), getIndex());
+ throw ExoPlaybackException.createForRenderer(decoderDrmSession.getError(), getIndex());
}
return drmSessionState != DrmSession.STATE_OPENED_WITH_KEYS;
}
- private void renderRgbFrame(VpxOutputBuffer outputBuffer, boolean scale) {
- if (bitmap == null
- || bitmap.getWidth() != outputBuffer.width
- || bitmap.getHeight() != outputBuffer.height) {
- bitmap = Bitmap.createBitmap(outputBuffer.width, outputBuffer.height, Bitmap.Config.RGB_565);
- }
- bitmap.copyPixelsFromBuffer(outputBuffer.data);
- Canvas canvas = surface.lockCanvas(null);
- if (scale) {
- canvas.scale(
- ((float) canvas.getWidth()) / outputBuffer.width,
- ((float) canvas.getHeight()) / outputBuffer.height);
- }
- canvas.drawBitmap(bitmap, 0, 0, null);
- surface.unlockCanvasAndPost(canvas);
- }
-
private void setJoiningDeadlineMs() {
joiningDeadlineMs = allowedJoiningTimeMs > 0
? (SystemClock.elapsedRealtime() + allowedJoiningTimeMs) : C.TIME_UNSET;
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 51ef8e9bcf..57e5481b55 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
@@ -31,8 +31,7 @@ import java.nio.ByteBuffer;
public static final int OUTPUT_MODE_NONE = -1;
public static final int OUTPUT_MODE_YUV = 0;
- public static final int OUTPUT_MODE_RGB = 1;
- public static final int OUTPUT_MODE_SURFACE_YUV = 2;
+ public static final int OUTPUT_MODE_SURFACE_YUV = 1;
private static final int NO_ERROR = 0;
private static final int DECODE_ERROR = 1;
@@ -52,7 +51,8 @@ import java.nio.ByteBuffer;
* @param exoMediaCrypto The {@link ExoMediaCrypto} object required for decoding encrypted
* content. Maybe null and can be ignored if decoder does not handle encrypted content.
* @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
- * @param enableSurfaceYuvOutputMode Whether OUTPUT_MODE_SURFACE_YUV is allowed.
+ * @param enableRowMultiThreadMode Whether row multi threading decoding is enabled.
+ * @param threads Number of threads libvpx will use to decode.
* @throws VpxDecoderException Thrown if an exception occurs when initializing the decoder.
*/
public VpxDecoder(
@@ -61,7 +61,8 @@ import java.nio.ByteBuffer;
int initialInputBufferSize,
ExoMediaCrypto exoMediaCrypto,
boolean disableLoopFilter,
- boolean enableSurfaceYuvOutputMode)
+ boolean enableRowMultiThreadMode,
+ int threads)
throws VpxDecoderException {
super(new VpxInputBuffer[numInputBuffers], new VpxOutputBuffer[numOutputBuffers]);
if (!VpxLibrary.isAvailable()) {
@@ -71,7 +72,7 @@ import java.nio.ByteBuffer;
if (exoMediaCrypto != null && !VpxLibrary.vpxIsSecureDecodeSupported()) {
throw new VpxDecoderException("Vpx decoder does not support secure decode.");
}
- vpxDecContext = vpxInit(disableLoopFilter, enableSurfaceYuvOutputMode);
+ vpxDecContext = vpxInit(disableLoopFilter, enableRowMultiThreadMode, threads);
if (vpxDecContext == 0) {
throw new VpxDecoderException("Failed to initialize decoder");
}
@@ -86,8 +87,8 @@ 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}, {@link #OUTPUT_MODE_RGB}
- * and {@link #OUTPUT_MODE_YUV}.
+ * @param outputMode The output mode. One of {@link #OUTPUT_MODE_NONE} and {@link
+ * #OUTPUT_MODE_YUV}.
*/
public void setOutputMode(int outputMode) {
this.outputMode = outputMode;
@@ -168,7 +169,8 @@ import java.nio.ByteBuffer;
}
}
- private native long vpxInit(boolean disableLoopFilter, boolean enableSurfaceYuvOutputMode);
+ private native long vpxInit(
+ boolean disableLoopFilter, boolean enableRowMultiThreadMode, int threads);
private native long vpxClose(long context);
private native long vpxDecode(long context, ByteBuffer encoded, int length);
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 854576b4b2..5a65fc56ff 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
@@ -27,7 +27,7 @@ public final class VpxLibrary {
ExoPlayerLibraryInfo.registerModule("goog.exo.vpx");
}
- private static final LibraryLoader LOADER = new LibraryLoader("vpx", "vpxJNI");
+ private static final LibraryLoader LOADER = new LibraryLoader("vpx", "vpxV2JNI");
private VpxLibrary() {}
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 fa0df1cfa9..22330e0a05 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
@@ -19,10 +19,8 @@ import com.google.android.exoplayer2.decoder.OutputBuffer;
import com.google.android.exoplayer2.video.ColorInfo;
import java.nio.ByteBuffer;
-/**
- * Output buffer containing video frame data, populated by {@link VpxDecoder}.
- */
-/* package */ final class VpxOutputBuffer extends OutputBuffer {
+/** 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;
@@ -62,36 +60,20 @@ import java.nio.ByteBuffer;
* 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},
- * {@link VpxDecoder#OUTPUT_MODE_RGB} and {@link VpxDecoder#OUTPUT_MODE_YUV}.
+ * @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 dimensions. Called via JNI after decoding completes.
- * @return Whether the buffer was resized successfully.
- */
- public boolean initForRgbFrame(int width, int height) {
- this.width = width;
- this.height = height;
- this.yuvPlanes = null;
- if (!isSafeToMultiply(width, height) || !isSafeToMultiply(width * height, 2)) {
- return false;
- }
- int minimumRgbSize = width * height * 2;
- initData(minimumRgbSize);
- return true;
- }
-
/**
* 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) {
+ public boolean initForYuvFrame(int width, int height, int yStride, int uvStride, int colorspace) {
this.width = width;
this.height = height;
this.colorspace = colorspace;
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java
index 837539593e..d82f5a6071 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java
@@ -17,8 +17,7 @@ package com.google.android.exoplayer2.ext.vp9;
import android.opengl.GLES20;
import android.opengl.GLSurfaceView;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
+import com.google.android.exoplayer2.util.GlUtil;
import java.nio.FloatBuffer;
import java.util.concurrent.atomic.AtomicReference;
import javax.microedition.khronos.egl.EGLConfig;
@@ -72,11 +71,8 @@ import javax.microedition.khronos.opengles.GL10;
+ " gl_FragColor = vec4(mColorConversion * yuv, 1.0);\n"
+ "}\n";
- private static final FloatBuffer TEXTURE_VERTICES = nativeFloatBuffer(
- -1.0f, 1.0f,
- -1.0f, -1.0f,
- 1.0f, 1.0f,
- 1.0f, -1.0f);
+ private static final FloatBuffer TEXTURE_VERTICES =
+ GlUtil.createBuffer(new float[] {-1.0f, 1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f, -1.0f});
private final int[] yuvTextures = new int[3];
private final AtomicReference pendingOutputBufferReference;
@@ -114,21 +110,7 @@ import javax.microedition.khronos.opengles.GL10;
@Override
public void onSurfaceCreated(GL10 unused, EGLConfig config) {
- // Create the GL program.
- program = GLES20.glCreateProgram();
-
- // Add the vertex and fragment shaders.
- addShader(GLES20.GL_VERTEX_SHADER, VERTEX_SHADER, program);
- addShader(GLES20.GL_FRAGMENT_SHADER, FRAGMENT_SHADER, program);
-
- // Link the GL program.
- GLES20.glLinkProgram(program);
- int[] result = new int[] {
- GLES20.GL_FALSE
- };
- result[0] = GLES20.GL_FALSE;
- GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, result, 0);
- abortUnless(result[0] == GLES20.GL_TRUE, GLES20.glGetProgramInfoLog(program));
+ program = GlUtil.compileProgram(VERTEX_SHADER, FRAGMENT_SHADER);
GLES20.glUseProgram(program);
int posLocation = GLES20.glGetAttribLocation(program, "in_pos");
GLES20.glEnableVertexAttribArray(posLocation);
@@ -136,11 +118,11 @@ import javax.microedition.khronos.opengles.GL10;
posLocation, 2, GLES20.GL_FLOAT, false, 0, TEXTURE_VERTICES);
texLocation = GLES20.glGetAttribLocation(program, "in_tc");
GLES20.glEnableVertexAttribArray(texLocation);
- checkNoGLES2Error();
+ GlUtil.checkGlError();
colorMatrixLocation = GLES20.glGetUniformLocation(program, "mColorConversion");
- checkNoGLES2Error();
+ GlUtil.checkGlError();
setupTextures();
- checkNoGLES2Error();
+ GlUtil.checkGlError();
}
@Override
@@ -191,11 +173,8 @@ import javax.microedition.khronos.opengles.GL10;
float crop = (float) outputBuffer.width / outputBuffer.yuvStrides[0];
// This buffer is consumed during each call to glDrawArrays. It needs to be a member variable
// rather than a local variable to ensure that it doesn't get garbage collected.
- textureCoords = nativeFloatBuffer(
- 0.0f, 0.0f,
- 0.0f, 1.0f,
- crop, 0.0f,
- crop, 1.0f);
+ textureCoords =
+ GlUtil.createBuffer(new float[] {0.0f, 0.0f, 0.0f, 1.0f, crop, 0.0f, crop, 1.0f});
GLES20.glVertexAttribPointer(
texLocation, 2, GLES20.GL_FLOAT, false, 0, textureCoords);
previousWidth = outputBuffer.width;
@@ -203,23 +182,7 @@ import javax.microedition.khronos.opengles.GL10;
}
GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
- checkNoGLES2Error();
- }
-
- private void addShader(int type, String source, int program) {
- int[] result = new int[] {
- GLES20.GL_FALSE
- };
- int shader = GLES20.glCreateShader(type);
- GLES20.glShaderSource(shader, source);
- GLES20.glCompileShader(shader);
- GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, result, 0);
- abortUnless(result[0] == GLES20.GL_TRUE,
- GLES20.glGetShaderInfoLog(shader) + ", source: " + source);
- GLES20.glAttachShader(program, shader);
- GLES20.glDeleteShader(shader);
-
- checkNoGLES2Error();
+ GlUtil.checkGlError();
}
private void setupTextures() {
@@ -237,28 +200,6 @@ import javax.microedition.khronos.opengles.GL10;
GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
}
- checkNoGLES2Error();
+ GlUtil.checkGlError();
}
-
- private void abortUnless(boolean condition, String msg) {
- if (!condition) {
- throw new RuntimeException(msg);
- }
- }
-
- private void checkNoGLES2Error() {
- int error = GLES20.glGetError();
- if (error != GLES20.GL_NO_ERROR) {
- throw new RuntimeException("GLES20 error: " + error);
- }
- }
-
- private static FloatBuffer nativeFloatBuffer(float... array) {
- FloatBuffer buffer = ByteBuffer.allocateDirect(array.length * 4).order(
- ByteOrder.nativeOrder()).asFloatBuffer();
- buffer.put(array);
- buffer.flip();
- return buffer;
- }
-
}
diff --git a/extensions/vp9/src/main/jni/Android.mk b/extensions/vp9/src/main/jni/Android.mk
index 868b869d56..cb7571a1b0 100644
--- a/extensions/vp9/src/main/jni/Android.mk
+++ b/extensions/vp9/src/main/jni/Android.mk
@@ -17,27 +17,21 @@
WORKING_DIR := $(call my-dir)
include $(CLEAR_VARS)
LIBVPX_ROOT := $(WORKING_DIR)/libvpx
-LIBYUV_ROOT := $(WORKING_DIR)/libyuv
-
-# build libyuv_static.a
-LOCAL_PATH := $(WORKING_DIR)
-LIBYUV_DISABLE_JPEG := "yes"
-include $(LIBYUV_ROOT)/Android.mk
# build libvpx.so
LOCAL_PATH := $(WORKING_DIR)
include libvpx.mk
-# build libvpxJNI.so
+# build libvpxV2JNI.so
include $(CLEAR_VARS)
LOCAL_PATH := $(WORKING_DIR)
-LOCAL_MODULE := libvpxJNI
+LOCAL_MODULE := libvpxV2JNI
LOCAL_ARM_MODE := arm
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := vpx_jni.cc
LOCAL_LDLIBS := -llog -lz -lm -landroid
LOCAL_SHARED_LIBRARIES := libvpx
-LOCAL_STATIC_LIBRARIES := libyuv_static cpufeatures
+LOCAL_STATIC_LIBRARIES := cpufeatures
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/cpufeatures)
diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index f36c433b22..82c023afbc 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -30,8 +30,6 @@
#include
#include
-#include "libyuv.h" // NOLINT
-
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx/vpx_decoder.h"
#include "vpx/vp8dx.h"
@@ -61,7 +59,6 @@
(JNIEnv* env, jobject thiz, ##__VA_ARGS__)\
// JNI references for VpxOutputBuffer class.
-static jmethodID initForRgbFrame;
static jmethodID initForYuvFrame;
static jfieldID dataField;
static jfieldID outputModeField;
@@ -393,11 +390,7 @@ class JniBufferManager {
};
struct JniCtx {
- JniCtx(bool enableBufferManager) {
- if (enableBufferManager) {
- buffer_manager = new JniBufferManager();
- }
- }
+ JniCtx() { buffer_manager = new JniBufferManager(); }
~JniCtx() {
if (native_window) {
@@ -441,11 +434,11 @@ int vpx_release_frame_buffer(void* priv, vpx_codec_frame_buffer_t* fb) {
}
DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
- jboolean enableBufferManager) {
- JniCtx* context = new JniCtx(enableBufferManager);
+ jboolean enableRowMultiThreadMode, jint threads) {
+ JniCtx* context = new JniCtx();
context->decoder = new vpx_codec_ctx_t();
vpx_codec_dec_cfg_t cfg = {0, 0, 0};
- cfg.threads = android_getCpuCount();
+ cfg.threads = threads;
errorCode = 0;
vpx_codec_err_t err =
vpx_codec_dec_init(context->decoder, &vpx_codec_vp9_dx_algo, &cfg, 0);
@@ -454,21 +447,33 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
errorCode = err;
return 0;
}
+#ifdef VPX_CTRL_VP9_DECODE_SET_ROW_MT
+ err = vpx_codec_control(context->decoder, VP9D_SET_ROW_MT,
+ enableRowMultiThreadMode);
+ if (err) {
+ LOGE("ERROR: Failed to enable row multi thread mode, error = %d.", err);
+ }
+#endif
if (disableLoopFilter) {
- // TODO(b/71930387): Use vpx_codec_control(), not vpx_codec_control_().
- err = vpx_codec_control_(context->decoder, VP9_SET_SKIP_LOOP_FILTER, true);
+ err = vpx_codec_control(context->decoder, VP9_SET_SKIP_LOOP_FILTER, true);
if (err) {
LOGE("ERROR: Failed to shut off libvpx loop filter, error = %d.", err);
}
- }
- if (enableBufferManager) {
- err = vpx_codec_set_frame_buffer_functions(
- context->decoder, vpx_get_frame_buffer, vpx_release_frame_buffer,
- context->buffer_manager);
+#ifdef VPX_CTRL_VP9_SET_LOOP_FILTER_OPT
+ } else {
+ err = vpx_codec_control(context->decoder, VP9D_SET_LOOP_FILTER_OPT, true);
if (err) {
- LOGE("ERROR: Failed to set libvpx frame buffer functions, error = %d.",
+ LOGE("ERROR: Failed to enable loop filter optimization, error = %d.",
err);
}
+#endif
+ }
+ err = vpx_codec_set_frame_buffer_functions(
+ context->decoder, vpx_get_frame_buffer, vpx_release_frame_buffer,
+ context->buffer_manager);
+ if (err) {
+ LOGE("ERROR: Failed to set libvpx frame buffer functions, error = %d.",
+ err);
}
// Populate JNI References.
@@ -476,8 +481,6 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
"com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer");
initForYuvFrame = env->GetMethodID(outputBufferClass, "initForYuvFrame",
"(IIIII)Z");
- initForRgbFrame = env->GetMethodID(outputBufferClass, "initForRgbFrame",
- "(II)Z");
dataField = env->GetFieldID(outputBufferClass, "data",
"Ljava/nio/ByteBuffer;");
outputModeField = env->GetFieldID(outputBufferClass, "mode", "I");
@@ -529,28 +532,10 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) {
}
const int kOutputModeYuv = 0;
- const int kOutputModeRgb = 1;
- const int kOutputModeSurfaceYuv = 2;
+ const int kOutputModeSurfaceYuv = 1;
int outputMode = env->GetIntField(jOutputBuffer, outputModeField);
- if (outputMode == kOutputModeRgb) {
- // resize buffer if required.
- jboolean initResult = env->CallBooleanMethod(jOutputBuffer, initForRgbFrame,
- img->d_w, img->d_h);
- if (env->ExceptionCheck() || !initResult) {
- return -1;
- }
-
- // get pointer to the data buffer.
- const jobject dataObject = env->GetObjectField(jOutputBuffer, dataField);
- uint8_t* const dst =
- reinterpret_cast(env->GetDirectBufferAddress(dataObject));
-
- libyuv::I420ToRGB565(img->planes[VPX_PLANE_Y], img->stride[VPX_PLANE_Y],
- img->planes[VPX_PLANE_U], img->stride[VPX_PLANE_U],
- img->planes[VPX_PLANE_V], img->stride[VPX_PLANE_V],
- dst, img->d_w * 2, img->d_w, img->d_h);
- } else if (outputMode == kOutputModeYuv) {
+ if (outputMode == kOutputModeYuv) {
const int kColorspaceUnknown = 0;
const int kColorspaceBT601 = 1;
const int kColorspaceBT709 = 2;
@@ -608,9 +593,6 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) {
}
} else if (outputMode == kOutputModeSurfaceYuv &&
img->fmt != VPX_IMG_FMT_I42016) {
- if (!context->buffer_manager) {
- return -1; // enableBufferManager was not set in vpxInit.
- }
int id = *(int*)img->fb_priv;
context->buffer_manager->add_ref(id);
JniFrameBuffer* jfb = context->buffer_manager->get_buffer(id);
diff --git a/extensions/vp9/src/test/AndroidManifest.xml b/extensions/vp9/src/test/AndroidManifest.xml
new file mode 100644
index 0000000000..a0123f17db
--- /dev/null
+++ b/extensions/vp9/src/test/AndroidManifest.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java b/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
new file mode 100644
index 0000000000..33de600aa7
--- /dev/null
+++ b/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.vp9;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibvpxVideoRenderer}. */
+@RunWith(AndroidJUnit4.class)
+public final class DefaultRenderersFactoryTest {
+
+ @Test
+ public void createRenderers_instantiatesVpxRenderer() {
+ DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
+ LibvpxVideoRenderer.class, C.TRACK_TYPE_VIDEO);
+ }
+}
diff --git a/gradle.properties b/gradle.properties
index b55575bc3b..4b9bfa8fa2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,5 @@
## Project-wide Gradle settings.
-android.useDeprecatedNdk=true
+android.useAndroidX=true
+android.enableJetifier=true
+android.enableUnitTestBinaryResources=true
buildDir=buildout
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5559e8ccfa..6d00e1ce97 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 05 13:43:42 BST 2017
+#Thu Apr 25 13:15:25 BST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/javadoc_combined.gradle b/javadoc_combined.gradle
index 209ad3a1a3..d2fa241a81 100644
--- a/javadoc_combined.gradle
+++ b/javadoc_combined.gradle
@@ -42,7 +42,7 @@ class CombinedJavadocPlugin implements Plugin {
if (name == "release") {
classpath +=
libraryModule.project.files(
- variant.javaCompile.classpath.files,
+ variant.javaCompileProvider.get().classpath.files,
libraryModule.project.android.getBootClasspath())
}
}
diff --git a/javadoc_library.gradle b/javadoc_library.gradle
index 65219843e3..a818ea390e 100644
--- a/javadoc_library.gradle
+++ b/javadoc_library.gradle
@@ -21,7 +21,7 @@ android.libraryVariants.all { variant ->
task("generateJavadoc", type: Javadoc) {
description = "Generates Javadoc for the ${javadocTitle}."
title = "ExoPlayer ${javadocTitle}"
- source = variant.javaCompile.source
+ source = variant.javaCompileProvider.get().source
options {
links "http://docs.oracle.com/javase/7/docs/api/"
linksOffline "https://developer.android.com/reference",
@@ -33,7 +33,7 @@ android.libraryVariants.all { variant ->
doFirst {
classpath =
files(
- variant.javaCompile.classpath.files,
+ variant.javaCompileProvider.get().classpath.files,
project.android.getBootClasspath())
}
doLast {
diff --git a/library/all/README.md b/library/all/README.md
index 8746e3afc6..43f942116e 100644
--- a/library/all/README.md
+++ b/library/all/README.md
@@ -10,4 +10,4 @@ individually. See ExoPlayer's [top level README][] for more information.
* [Javadoc][]: Note that this Javadoc is combined with that of other modules.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/library/all/build.gradle b/library/all/build.gradle
index bb832ba0ff..f78b8b2132 100644
--- a/library/all/build.gradle
+++ b/library/all/build.gradle
@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
defaultConfig {
minSdkVersion project.ext.minSdkVersion
diff --git a/library/core/README.md b/library/core/README.md
index f31ffed131..7fa89dda8d 100644
--- a/library/core/README.md
+++ b/library/core/README.md
@@ -6,4 +6,4 @@ The core of the ExoPlayer library.
* [Javadoc][]: Note that this Javadoc is combined with that of other modules.
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+[Javadoc]: https://exoplayer.dev/doc/reference/index.html
diff --git a/library/core/build.gradle b/library/core/build.gradle
index 606033fdea..68ff8cc977 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -16,7 +16,6 @@ apply from: '../../constants.gradle'
android {
compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -54,21 +53,25 @@ android {
// testCoverageEnabled = true
// }
}
+
+ testOptions.unitTests.includeAndroidResources = true
}
dependencies {
- implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+ implementation 'androidx.annotation:annotation:1.0.2'
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
- androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
+ androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
+ androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
+ androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion
androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
- androidTestImplementation 'com.google.dexmaker:dexmaker:' + dexmakerVersion
- androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
- androidTestImplementation 'com.google.truth:truth:' + truthVersion
+ androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion
+ androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion
androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
- testImplementation 'com.google.truth:truth:' + truthVersion
- testImplementation 'junit:junit:' + junitVersion
+ testImplementation 'androidx.test:core:' + androidXTestVersion
+ testImplementation 'androidx.test.ext:junit:' + androidXTestVersion
+ testImplementation 'androidx.test.ext:truth:' + androidXTestVersion
testImplementation 'org.mockito:mockito-core:' + mockitoVersion
testImplementation 'org.robolectric:robolectric:' + robolectricVersion
testImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
diff --git a/library/core/proguard-rules.txt b/library/core/proguard-rules.txt
index a5c50a78f5..07ba438182 100644
--- a/library/core/proguard-rules.txt
+++ b/library/core/proguard-rules.txt
@@ -3,7 +3,7 @@
# Constructors accessed via reflection in DefaultRenderersFactory
-dontnote com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer
-keepclassmembers class com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer {
- (boolean, long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int);
+ (long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int);
}
-dontnote com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer
-keepclassmembers class com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer {
@@ -30,10 +30,36 @@
();
}
-# Constructors accessed via reflection in DownloadAction
--dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloadAction
--dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloadAction
--dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloadAction
+# Constructors accessed via reflection in DefaultDownloaderFactory
+-dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloader
+-keepclassmembers class com.google.android.exoplayer2.source.dash.offline.DashDownloader {
+ (android.net.Uri, java.util.List, com.google.android.exoplayer2.offline.DownloaderConstructorHelper);
+}
+-dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloader
+-keepclassmembers class com.google.android.exoplayer2.source.hls.offline.HlsDownloader {
+ (android.net.Uri, java.util.List, com.google.android.exoplayer2.offline.DownloaderConstructorHelper);
+}
+-dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader
+-keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader {
+ (android.net.Uri, java.util.List, com.google.android.exoplayer2.offline.DownloaderConstructorHelper);
+}
+
+# Constructors accessed via reflection in DownloadHelper
+-dontnote com.google.android.exoplayer2.source.dash.DashMediaSource$Factory
+-keepclassmembers class com.google.android.exoplayer2.source.dash.DashMediaSource$Factory {
+ (com.google.android.exoplayer2.upstream.DataSource$Factory);
+ com.google.android.exoplayer2.source.dash.DashMediaSource createMediaSource(android.net.Uri);
+}
+-dontnote com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory
+-keepclassmembers class com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory {
+ (com.google.android.exoplayer2.upstream.DataSource$Factory);
+ com.google.android.exoplayer2.source.hls.HlsMediaSource createMediaSource(android.net.Uri);
+}
+-dontnote com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory
+-keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory {
+ (com.google.android.exoplayer2.upstream.DataSource$Factory);
+ com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource createMediaSource(android.net.Uri);
+}
# Don't warn about checkerframework
-dontwarn org.checkerframework.**
diff --git a/library/core/src/androidTest/AndroidManifest.xml b/library/core/src/androidTest/AndroidManifest.xml
index d9104b1077..e6e874a27a 100644
--- a/library/core/src/androidTest/AndroidManifest.xml
+++ b/library/core/src/androidTest/AndroidManifest.xml
@@ -18,6 +18,9 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.google.android.exoplayer2.core.test">
+
+
+
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
index 45b784e30f..a76b5cf6c1 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
@@ -26,10 +26,10 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.TestUtil;
import java.io.FileNotFoundException;
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 eb3bd4f91a..774f1b452c 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.util.Util;
/** Abstract base {@link Player} which implements common implementation independent methods. */
@@ -135,4 +135,58 @@ public abstract class BasePlayer implements Player {
@RepeatMode int repeatMode = getRepeatMode();
return repeatMode == REPEAT_MODE_ONE ? REPEAT_MODE_OFF : repeatMode;
}
+
+ /** Holds a listener reference. */
+ protected static final class ListenerHolder {
+
+ /**
+ * The listener on which {link #invoke} will execute {@link ListenerInvocation listener
+ * invocations}.
+ */
+ public final Player.EventListener listener;
+
+ private boolean released;
+
+ public ListenerHolder(Player.EventListener listener) {
+ this.listener = listener;
+ }
+
+ /** Prevents any further {@link ListenerInvocation} to be executed on {@link #listener}. */
+ public void release() {
+ released = true;
+ }
+
+ /**
+ * Executes the given {@link ListenerInvocation} on {@link #listener}. Does nothing if {@link
+ * #release} has been called on this instance.
+ */
+ public void invoke(ListenerInvocation listenerInvocation) {
+ if (!released) {
+ listenerInvocation.invokeListener(listener);
+ }
+ }
+
+ @Override
+ public boolean equals(@Nullable Object other) {
+ if (this == other) {
+ return true;
+ }
+ if (other == null || getClass() != other.getClass()) {
+ return false;
+ }
+ return listener.equals(((ListenerHolder) other).listener);
+ }
+
+ @Override
+ public int hashCode() {
+ return listener.hashCode();
+ }
+ }
+
+ /** Parameterized invocation of a {@link Player.EventListener} method. */
+ protected interface ListenerInvocation {
+
+ /** Executes the invocation on the given {@link Player.EventListener}. */
+ void invokeListener(Player.EventListener listener);
+ }
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
index 51e724bee1..1099b14bfc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.drm.DrmSessionManager;
@@ -37,7 +37,7 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
private SampleStream stream;
private Format[] streamFormats;
private long streamOffsetUs;
- private boolean readEndOfStream;
+ private long readingPositionUs;
private boolean streamIsFinal;
/**
@@ -46,7 +46,7 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
*/
public BaseRenderer(int trackType) {
this.trackType = trackType;
- readEndOfStream = true;
+ readingPositionUs = C.TIME_END_OF_SOURCE;
}
@Override
@@ -98,7 +98,7 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
throws ExoPlaybackException {
Assertions.checkState(!streamIsFinal);
this.stream = stream;
- readEndOfStream = false;
+ readingPositionUs = offsetUs;
streamFormats = formats;
streamOffsetUs = offsetUs;
onStreamChanged(formats, offsetUs);
@@ -111,7 +111,12 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
@Override
public final boolean hasReadStreamToEnd() {
- return readEndOfStream;
+ return readingPositionUs == C.TIME_END_OF_SOURCE;
+ }
+
+ @Override
+ public final long getReadingPositionUs() {
+ return readingPositionUs;
}
@Override
@@ -132,7 +137,7 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
@Override
public final void resetPosition(long positionUs) throws ExoPlaybackException {
streamIsFinal = false;
- readEndOfStream = false;
+ readingPositionUs = positionUs;
onPositionReset(positionUs, false);
}
@@ -153,6 +158,12 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
onDisabled();
}
+ @Override
+ public final void reset() {
+ Assertions.checkState(state == STATE_DISABLED);
+ onReset();
+ }
+
// RendererCapabilities implementation.
@Override
@@ -247,6 +258,15 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
// Do nothing.
}
+ /**
+ * Called when the renderer is reset.
+ *
+ * The default implementation is a no-op.
+ */
+ protected void onReset() {
+ // Do nothing.
+ }
+
// Methods to be called by subclasses.
/** Returns the formats of the currently enabled stream. */
@@ -288,10 +308,11 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
int result = stream.readData(formatHolder, buffer, formatRequired);
if (result == C.RESULT_BUFFER_READ) {
if (buffer.isEndOfStream()) {
- readEndOfStream = true;
+ readingPositionUs = C.TIME_END_OF_SOURCE;
return streamIsFinal ? C.RESULT_BUFFER_READ : C.RESULT_NOTHING_READ;
}
buffer.timeUs += streamOffsetUs;
+ readingPositionUs = Math.max(readingPositionUs, buffer.timeUs);
} else if (result == C.RESULT_FORMAT_READ) {
Format format = formatHolder.format;
if (format.subsampleOffsetUs != Format.OFFSET_SAMPLE_RELATIVE) {
@@ -317,7 +338,7 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
* Returns whether the upstream source is ready.
*/
protected final boolean isSourceReady() {
- return readEndOfStream ? streamIsFinal : stream.isReady();
+ return hasReadStreamToEnd() ? streamIsFinal : stream.isReady();
}
/**
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 8810b51000..04a90b38d8 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
@@ -21,7 +21,7 @@ import android.media.AudioFormat;
import android.media.AudioManager;
import android.media.MediaCodec;
import android.media.MediaFormat;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.view.Surface;
import com.google.android.exoplayer2.PlayerMessage.Target;
import com.google.android.exoplayer2.audio.AuxEffectInfo;
@@ -101,6 +101,9 @@ public final class C {
*/
public static final String UTF16_NAME = "UTF-16";
+ /** The name of the UTF-16 little-endian charset. */
+ public static final String UTF16LE_NAME = "UTF-16LE";
+
/**
* The name of the serif font family.
*/
@@ -143,8 +146,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_DTS}, {@link #ENCODING_DTS_HD} or {@link
- * #ENCODING_DOLBY_TRUEHD}.
+ * #ENCODING_E_AC3}, {@link #ENCODING_AC4}, {@link #ENCODING_DTS}, {@link #ENCODING_DTS_HD} or
+ * {@link #ENCODING_DOLBY_TRUEHD}.
*/
@Documented
@Retention(RetentionPolicy.SOURCE)
@@ -160,9 +163,10 @@ public final class C {
ENCODING_PCM_A_LAW,
ENCODING_AC3,
ENCODING_E_AC3,
+ ENCODING_AC4,
ENCODING_DTS,
ENCODING_DTS_HD,
- ENCODING_DOLBY_TRUEHD
+ ENCODING_DOLBY_TRUEHD,
})
public @interface Encoding {}
@@ -206,6 +210,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_AC4 */
+ public static final int ENCODING_AC4 = AudioFormat.ENCODING_AC4;
/** @see AudioFormat#ENCODING_DTS */
public static final int ENCODING_DTS = AudioFormat.ENCODING_DTS;
/** @see AudioFormat#ENCODING_DTS_HD */
@@ -536,9 +542,7 @@ public final class C {
*/
public static final int SELECTION_FLAG_AUTOSELECT = 1 << 2; // 4
- /**
- * Represents an undetermined language as an ISO 639 alpha-3 language code.
- */
+ /** Represents an undetermined language as an ISO 639-2 language code. */
public static final String LANGUAGE_UNDETERMINED = "und";
/**
@@ -978,6 +982,79 @@ public final class C {
*/
public static final int NETWORK_TYPE_OTHER = 8;
+ /**
+ * Track role flags. Possible flag values are {@link #ROLE_FLAG_MAIN}, {@link
+ * #ROLE_FLAG_ALTERNATE}, {@link #ROLE_FLAG_SUPPLEMENTARY}, {@link #ROLE_FLAG_COMMENTARY}, {@link
+ * #ROLE_FLAG_DUB}, {@link #ROLE_FLAG_EMERGENCY}, {@link #ROLE_FLAG_CAPTION}, {@link
+ * #ROLE_FLAG_SUBTITLE}, {@link #ROLE_FLAG_SIGN}, {@link #ROLE_FLAG_DESCRIBES_VIDEO}, {@link
+ * #ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND}, {@link #ROLE_FLAG_ENHANCED_DIALOG_INTELLIGIBILITY},
+ * {@link #ROLE_FLAG_TRANSCRIBES_DIALOG} and {@link #ROLE_FLAG_EASY_TO_READ}.
+ */
+ @Documented
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(
+ flag = true,
+ value = {
+ ROLE_FLAG_MAIN,
+ ROLE_FLAG_ALTERNATE,
+ ROLE_FLAG_SUPPLEMENTARY,
+ ROLE_FLAG_COMMENTARY,
+ ROLE_FLAG_DUB,
+ ROLE_FLAG_EMERGENCY,
+ ROLE_FLAG_CAPTION,
+ ROLE_FLAG_SUBTITLE,
+ ROLE_FLAG_SIGN,
+ ROLE_FLAG_DESCRIBES_VIDEO,
+ ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND,
+ ROLE_FLAG_ENHANCED_DIALOG_INTELLIGIBILITY,
+ ROLE_FLAG_TRANSCRIBES_DIALOG,
+ ROLE_FLAG_EASY_TO_READ
+ })
+ public @interface RoleFlags {}
+ /** Indicates a main track. */
+ public static final int ROLE_FLAG_MAIN = 1;
+ /**
+ * Indicates an alternate track. For example a video track recorded from an different view point
+ * than the main track(s).
+ */
+ public static final int ROLE_FLAG_ALTERNATE = 1 << 1;
+ /**
+ * Indicates a supplementary track, meaning the track has lower importance than the main track(s).
+ * For example a video track that provides a visual accompaniment to a main audio track.
+ */
+ public static final int ROLE_FLAG_SUPPLEMENTARY = 1 << 2;
+ /** Indicates the track contains commentary, for example from the director. */
+ public static final int ROLE_FLAG_COMMENTARY = 1 << 3;
+ /**
+ * Indicates the track is in a different language from the original, for example dubbed audio or
+ * translated captions.
+ */
+ public static final int ROLE_FLAG_DUB = 1 << 4;
+ /** Indicates the track contains information about a current emergency. */
+ public static final int ROLE_FLAG_EMERGENCY = 1 << 5;
+ /**
+ * Indicates the track contains captions. This flag may be set on video tracks to indicate the
+ * presence of burned in captions.
+ */
+ public static final int ROLE_FLAG_CAPTION = 1 << 6;
+ /**
+ * Indicates the track contains subtitles. This flag may be set on video tracks to indicate the
+ * presence of burned in subtitles.
+ */
+ public static final int ROLE_FLAG_SUBTITLE = 1 << 7;
+ /** Indicates the track contains a visual sign-language interpretation of an audio track. */
+ public static final int ROLE_FLAG_SIGN = 1 << 8;
+ /** Indicates the track contains an audio or textual description of a video track. */
+ public static final int ROLE_FLAG_DESCRIBES_VIDEO = 1 << 9;
+ /** Indicates the track contains a textual description of music and sound. */
+ public static final int ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND = 1 << 10;
+ /** Indicates the track is designed for improved intelligibility of dialogue. */
+ public static final int ROLE_FLAG_ENHANCED_DIALOG_INTELLIGIBILITY = 1 << 11;
+ /** Indicates the track contains a transcription of spoken dialog. */
+ public static final int ROLE_FLAG_TRANSCRIBES_DIALOG = 1 << 12;
+ /** Indicates the track contains a text that has been edited for ease of reading. */
+ public static final int ROLE_FLAG_EASY_TO_READ = 1 << 13;
+
/**
* Converts a time in microseconds to the corresponding time in milliseconds, preserving
* {@link #TIME_UNSET} and {@link #TIME_END_OF_SOURCE} values.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
index c109ed81c1..972f651a41 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
@@ -20,7 +20,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.upstream.Allocator;
import com.google.android.exoplayer2.upstream.DefaultAllocator;
import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.PriorityTaskManager;
import com.google.android.exoplayer2.util.Util;
/**
@@ -30,12 +29,14 @@ public class DefaultLoadControl implements LoadControl {
/**
* The default minimum duration of media that the player will attempt to ensure is buffered at all
- * times, in milliseconds.
+ * times, in milliseconds. This value is only applied to playbacks without video.
*/
public static final int DEFAULT_MIN_BUFFER_MS = 15000;
/**
* The default maximum duration of media that the player will attempt to buffer, in milliseconds.
+ * For playbacks with video, this is also the default minimum duration of media that the player
+ * will attempt to ensure is buffered.
*/
public static final int DEFAULT_MAX_BUFFER_MS = 50000;
@@ -70,27 +71,26 @@ public class DefaultLoadControl implements LoadControl {
public static final class Builder {
private DefaultAllocator allocator;
- private int minBufferMs;
+ private int minBufferAudioMs;
+ private int minBufferVideoMs;
private int maxBufferMs;
private int bufferForPlaybackMs;
private int bufferForPlaybackAfterRebufferMs;
private int targetBufferBytes;
private boolean prioritizeTimeOverSizeThresholds;
- private PriorityTaskManager priorityTaskManager;
private int backBufferDurationMs;
private boolean retainBackBufferFromKeyframe;
private boolean createDefaultLoadControlCalled;
/** Constructs a new instance. */
public Builder() {
- allocator = null;
- minBufferMs = DEFAULT_MIN_BUFFER_MS;
+ minBufferAudioMs = DEFAULT_MIN_BUFFER_MS;
+ minBufferVideoMs = DEFAULT_MAX_BUFFER_MS;
maxBufferMs = DEFAULT_MAX_BUFFER_MS;
bufferForPlaybackMs = DEFAULT_BUFFER_FOR_PLAYBACK_MS;
bufferForPlaybackAfterRebufferMs = DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS;
targetBufferBytes = DEFAULT_TARGET_BUFFER_BYTES;
prioritizeTimeOverSizeThresholds = DEFAULT_PRIORITIZE_TIME_OVER_SIZE_THRESHOLDS;
- priorityTaskManager = null;
backBufferDurationMs = DEFAULT_BACK_BUFFER_DURATION_MS;
retainBackBufferFromKeyframe = DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME;
}
@@ -129,7 +129,18 @@ public class DefaultLoadControl implements LoadControl {
int bufferForPlaybackMs,
int bufferForPlaybackAfterRebufferMs) {
Assertions.checkState(!createDefaultLoadControlCalled);
- this.minBufferMs = minBufferMs;
+ assertGreaterOrEqual(bufferForPlaybackMs, 0, "bufferForPlaybackMs", "0");
+ assertGreaterOrEqual(
+ bufferForPlaybackAfterRebufferMs, 0, "bufferForPlaybackAfterRebufferMs", "0");
+ assertGreaterOrEqual(minBufferMs, bufferForPlaybackMs, "minBufferMs", "bufferForPlaybackMs");
+ assertGreaterOrEqual(
+ minBufferMs,
+ bufferForPlaybackAfterRebufferMs,
+ "minBufferMs",
+ "bufferForPlaybackAfterRebufferMs");
+ assertGreaterOrEqual(maxBufferMs, minBufferMs, "maxBufferMs", "minBufferMs");
+ this.minBufferAudioMs = minBufferMs;
+ this.minBufferVideoMs = minBufferMs;
this.maxBufferMs = maxBufferMs;
this.bufferForPlaybackMs = bufferForPlaybackMs;
this.bufferForPlaybackAfterRebufferMs = bufferForPlaybackAfterRebufferMs;
@@ -165,19 +176,6 @@ public class DefaultLoadControl implements LoadControl {
return this;
}
- /**
- * Sets the {@link PriorityTaskManager} to use.
- *
- * @param priorityTaskManager The {@link PriorityTaskManager} to use.
- * @return This builder, for convenience.
- * @throws IllegalStateException If {@link #createDefaultLoadControl()} has already been called.
- */
- public Builder setPriorityTaskManager(PriorityTaskManager priorityTaskManager) {
- Assertions.checkState(!createDefaultLoadControlCalled);
- this.priorityTaskManager = priorityTaskManager;
- return this;
- }
-
/**
* Sets the back buffer duration, and whether the back buffer is retained from the previous
* keyframe.
@@ -190,6 +188,7 @@ public class DefaultLoadControl implements LoadControl {
*/
public Builder setBackBuffer(int backBufferDurationMs, boolean retainBackBufferFromKeyframe) {
Assertions.checkState(!createDefaultLoadControlCalled);
+ assertGreaterOrEqual(backBufferDurationMs, 0, "backBufferDurationMs", "0");
this.backBufferDurationMs = backBufferDurationMs;
this.retainBackBufferFromKeyframe = retainBackBufferFromKeyframe;
return this;
@@ -197,19 +196,20 @@ public class DefaultLoadControl implements LoadControl {
/** Creates a {@link DefaultLoadControl}. */
public DefaultLoadControl createDefaultLoadControl() {
+ Assertions.checkState(!createDefaultLoadControlCalled);
createDefaultLoadControlCalled = true;
if (allocator == null) {
- allocator = new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE);
+ allocator = new DefaultAllocator(/* trimOnReset= */ true, C.DEFAULT_BUFFER_SEGMENT_SIZE);
}
return new DefaultLoadControl(
allocator,
- minBufferMs,
+ minBufferAudioMs,
+ minBufferVideoMs,
maxBufferMs,
bufferForPlaybackMs,
bufferForPlaybackAfterRebufferMs,
targetBufferBytes,
prioritizeTimeOverSizeThresholds,
- priorityTaskManager,
backBufferDurationMs,
retainBackBufferFromKeyframe);
}
@@ -217,18 +217,19 @@ public class DefaultLoadControl implements LoadControl {
private final DefaultAllocator allocator;
- private final long minBufferUs;
+ private final long minBufferAudioUs;
+ private final long minBufferVideoUs;
private final long maxBufferUs;
private final long bufferForPlaybackUs;
private final long bufferForPlaybackAfterRebufferUs;
private final int targetBufferBytesOverwrite;
private final boolean prioritizeTimeOverSizeThresholds;
- private final PriorityTaskManager priorityTaskManager;
private final long backBufferDurationUs;
private final boolean retainBackBufferFromKeyframe;
private int targetBufferSize;
private boolean isBuffering;
+ private boolean hasVideo;
/** Constructs a new instance, using the {@code DEFAULT_*} constants defined in this class. */
@SuppressWarnings("deprecation")
@@ -238,21 +239,22 @@ public class DefaultLoadControl implements LoadControl {
/** @deprecated Use {@link Builder} instead. */
@Deprecated
- @SuppressWarnings("deprecation")
public DefaultLoadControl(DefaultAllocator allocator) {
this(
allocator,
- DEFAULT_MIN_BUFFER_MS,
+ /* minBufferAudioMs= */ DEFAULT_MIN_BUFFER_MS,
+ /* minBufferVideoMs= */ DEFAULT_MAX_BUFFER_MS,
DEFAULT_MAX_BUFFER_MS,
DEFAULT_BUFFER_FOR_PLAYBACK_MS,
DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS,
DEFAULT_TARGET_BUFFER_BYTES,
- DEFAULT_PRIORITIZE_TIME_OVER_SIZE_THRESHOLDS);
+ DEFAULT_PRIORITIZE_TIME_OVER_SIZE_THRESHOLDS,
+ DEFAULT_BACK_BUFFER_DURATION_MS,
+ DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME);
}
/** @deprecated Use {@link Builder} instead. */
@Deprecated
- @SuppressWarnings("deprecation")
public DefaultLoadControl(
DefaultAllocator allocator,
int minBufferMs,
@@ -263,70 +265,57 @@ public class DefaultLoadControl implements LoadControl {
boolean prioritizeTimeOverSizeThresholds) {
this(
allocator,
- minBufferMs,
+ /* minBufferAudioMs= */ minBufferMs,
+ /* minBufferVideoMs= */ minBufferMs,
maxBufferMs,
bufferForPlaybackMs,
bufferForPlaybackAfterRebufferMs,
targetBufferBytes,
prioritizeTimeOverSizeThresholds,
- /* priorityTaskManager= */ null);
- }
-
- /** @deprecated Use {@link Builder} instead. */
- @Deprecated
- public DefaultLoadControl(
- DefaultAllocator allocator,
- int minBufferMs,
- int maxBufferMs,
- int bufferForPlaybackMs,
- int bufferForPlaybackAfterRebufferMs,
- int targetBufferBytes,
- boolean prioritizeTimeOverSizeThresholds,
- PriorityTaskManager priorityTaskManager) {
- this(
- allocator,
- minBufferMs,
- maxBufferMs,
- bufferForPlaybackMs,
- bufferForPlaybackAfterRebufferMs,
- targetBufferBytes,
- prioritizeTimeOverSizeThresholds,
- priorityTaskManager,
DEFAULT_BACK_BUFFER_DURATION_MS,
DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME);
}
protected DefaultLoadControl(
DefaultAllocator allocator,
- int minBufferMs,
+ int minBufferAudioMs,
+ int minBufferVideoMs,
int maxBufferMs,
int bufferForPlaybackMs,
int bufferForPlaybackAfterRebufferMs,
int targetBufferBytes,
boolean prioritizeTimeOverSizeThresholds,
- PriorityTaskManager priorityTaskManager,
int backBufferDurationMs,
boolean retainBackBufferFromKeyframe) {
assertGreaterOrEqual(bufferForPlaybackMs, 0, "bufferForPlaybackMs", "0");
assertGreaterOrEqual(
bufferForPlaybackAfterRebufferMs, 0, "bufferForPlaybackAfterRebufferMs", "0");
- assertGreaterOrEqual(minBufferMs, bufferForPlaybackMs, "minBufferMs", "bufferForPlaybackMs");
assertGreaterOrEqual(
- minBufferMs,
+ minBufferAudioMs, bufferForPlaybackMs, "minBufferAudioMs", "bufferForPlaybackMs");
+ assertGreaterOrEqual(
+ minBufferVideoMs, bufferForPlaybackMs, "minBufferVideoMs", "bufferForPlaybackMs");
+ assertGreaterOrEqual(
+ minBufferAudioMs,
bufferForPlaybackAfterRebufferMs,
- "minBufferMs",
+ "minBufferAudioMs",
"bufferForPlaybackAfterRebufferMs");
- assertGreaterOrEqual(maxBufferMs, minBufferMs, "maxBufferMs", "minBufferMs");
+ assertGreaterOrEqual(
+ minBufferVideoMs,
+ bufferForPlaybackAfterRebufferMs,
+ "minBufferVideoMs",
+ "bufferForPlaybackAfterRebufferMs");
+ assertGreaterOrEqual(maxBufferMs, minBufferAudioMs, "maxBufferMs", "minBufferAudioMs");
+ assertGreaterOrEqual(maxBufferMs, minBufferVideoMs, "maxBufferMs", "minBufferVideoMs");
assertGreaterOrEqual(backBufferDurationMs, 0, "backBufferDurationMs", "0");
this.allocator = allocator;
- this.minBufferUs = C.msToUs(minBufferMs);
+ this.minBufferAudioUs = C.msToUs(minBufferAudioMs);
+ this.minBufferVideoUs = C.msToUs(minBufferVideoMs);
this.maxBufferUs = C.msToUs(maxBufferMs);
this.bufferForPlaybackUs = C.msToUs(bufferForPlaybackMs);
this.bufferForPlaybackAfterRebufferUs = C.msToUs(bufferForPlaybackAfterRebufferMs);
this.targetBufferBytesOverwrite = targetBufferBytes;
this.prioritizeTimeOverSizeThresholds = prioritizeTimeOverSizeThresholds;
- this.priorityTaskManager = priorityTaskManager;
this.backBufferDurationUs = C.msToUs(backBufferDurationMs);
this.retainBackBufferFromKeyframe = retainBackBufferFromKeyframe;
}
@@ -339,6 +328,7 @@ public class DefaultLoadControl implements LoadControl {
@Override
public void onTracksSelected(Renderer[] renderers, TrackGroupArray trackGroups,
TrackSelectionArray trackSelections) {
+ hasVideo = hasVideo(renderers, trackSelections);
targetBufferSize =
targetBufferBytesOverwrite == C.LENGTH_UNSET
? calculateTargetBufferSize(renderers, trackSelections)
@@ -374,8 +364,7 @@ public class DefaultLoadControl implements LoadControl {
@Override
public boolean shouldContinueLoading(long bufferedDurationUs, float playbackSpeed) {
boolean targetBufferSizeReached = allocator.getTotalBytesAllocated() >= targetBufferSize;
- boolean wasBuffering = isBuffering;
- long minBufferUs = this.minBufferUs;
+ long minBufferUs = hasVideo ? minBufferVideoUs : minBufferAudioUs;
if (playbackSpeed > 1) {
// The playback speed is faster than real time, so scale up the minimum required media
// duration to keep enough media buffered for a playout duration of minBufferUs.
@@ -388,13 +377,6 @@ public class DefaultLoadControl implements LoadControl {
} else if (bufferedDurationUs >= maxBufferUs || targetBufferSizeReached) {
isBuffering = false;
} // Else don't change the buffering state
- if (priorityTaskManager != null && isBuffering != wasBuffering) {
- if (isBuffering) {
- priorityTaskManager.add(C.PRIORITY_PLAYBACK);
- } else {
- priorityTaskManager.remove(C.PRIORITY_PLAYBACK);
- }
- }
return isBuffering;
}
@@ -430,15 +412,21 @@ public class DefaultLoadControl implements LoadControl {
private void reset(boolean resetAllocator) {
targetBufferSize = 0;
- if (priorityTaskManager != null && isBuffering) {
- priorityTaskManager.remove(C.PRIORITY_PLAYBACK);
- }
isBuffering = false;
if (resetAllocator) {
allocator.reset();
}
}
+ private static boolean hasVideo(Renderer[] renderers, TrackSelectionArray trackSelectionArray) {
+ for (int i = 0; i < renderers.length; i++) {
+ if (renderers[i].getTrackType() == C.TRACK_TYPE_VIDEO && trackSelectionArray.get(i) != null) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private static void assertGreaterOrEqual(int value1, int value2, String name1, String name2) {
Assertions.checkArgument(value1 >= value2, name1 + " cannot be less than " + name2);
}
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 ed57cec70c..89e7d857c8 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.MediaClock;
import com.google.android.exoplayer2.util.StandaloneMediaClock;
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 50832dd5af..2a977f5bba 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
@@ -19,8 +19,8 @@ import android.content.Context;
import android.media.MediaCodec;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+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;
@@ -268,7 +268,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
extensionRendererMode, renderersList);
buildCameraMotionRenderers(context, extensionRendererMode, renderersList);
buildMiscellaneousRenderers(context, eventHandler, extensionRendererMode, renderersList);
- return renderersList.toArray(new Renderer[renderersList.size()]);
+ return renderersList.toArray(new Renderer[0]);
}
/**
@@ -323,7 +323,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
Class clazz = Class.forName("com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer");
Constructor constructor =
clazz.getConstructor(
- boolean.class,
long.class,
android.os.Handler.class,
com.google.android.exoplayer2.video.VideoRendererEventListener.class,
@@ -332,7 +331,6 @@ public class DefaultRenderersFactory implements RenderersFactory {
Renderer renderer =
(Renderer)
constructor.newInstance(
- true,
allowedVideoJoiningTimeMs,
eventHandler,
eventListener,
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 6b84245141..b5f8f954bb 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,7 +15,8 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.util.Assertions;
import java.io.IOException;
@@ -30,11 +31,12 @@ public final class ExoPlaybackException extends Exception {
/**
* The type of source that produced the error. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER}
- * or {@link #TYPE_UNEXPECTED}.
+ * {@link #TYPE_UNEXPECTED}, {@link #TYPE_REMOTE} or {@link #TYPE_OUT_OF_MEMORY}. Note that new
+ * types may be added in the future and error handling should handle unknown type values.
*/
@Documented
@Retention(RetentionPolicy.SOURCE)
- @IntDef({TYPE_SOURCE, TYPE_RENDERER, TYPE_UNEXPECTED})
+ @IntDef({TYPE_SOURCE, TYPE_RENDERER, TYPE_UNEXPECTED, TYPE_REMOTE, TYPE_OUT_OF_MEMORY})
public @interface Type {}
/**
* The error occurred loading data from a {@link MediaSource}.
@@ -54,11 +56,16 @@ public final class ExoPlaybackException extends Exception {
* Call {@link #getUnexpectedException()} to retrieve the underlying cause.
*/
public static final int TYPE_UNEXPECTED = 2;
-
/**
- * The type of the playback failure. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER} and
- * {@link #TYPE_UNEXPECTED}.
+ * The error occurred in a remote component.
+ *
+ *
Call {@link #getMessage()} to retrieve the message associated with the error.
*/
+ public static final int TYPE_REMOTE = 3;
+ /** The error was an {@link OutOfMemoryError}. */
+ public static final int TYPE_OUT_OF_MEMORY = 4;
+
+ /** The {@link Type} of the playback failure. */
@Type public final int type;
/**
@@ -66,7 +73,7 @@ public final class ExoPlaybackException extends Exception {
*/
public final int rendererIndex;
- private final Throwable cause;
+ @Nullable private final Throwable cause;
/**
* Creates an instance of type {@link #TYPE_SOURCE}.
@@ -75,7 +82,7 @@ public final class ExoPlaybackException extends Exception {
* @return The created instance.
*/
public static ExoPlaybackException createForSource(IOException cause) {
- return new ExoPlaybackException(TYPE_SOURCE, cause, C.INDEX_UNSET);
+ return new ExoPlaybackException(TYPE_SOURCE, cause, /* rendererIndex= */ C.INDEX_UNSET);
}
/**
@@ -95,8 +102,28 @@ public final class ExoPlaybackException extends Exception {
* @param cause The cause of the failure.
* @return The created instance.
*/
- /* package */ static ExoPlaybackException createForUnexpected(RuntimeException cause) {
- return new ExoPlaybackException(TYPE_UNEXPECTED, cause, C.INDEX_UNSET);
+ public static ExoPlaybackException createForUnexpected(RuntimeException cause) {
+ return new ExoPlaybackException(TYPE_UNEXPECTED, cause, /* rendererIndex= */ C.INDEX_UNSET);
+ }
+
+ /**
+ * Creates an instance of type {@link #TYPE_REMOTE}.
+ *
+ * @param message The message associated with the error.
+ * @return The created instance.
+ */
+ public static ExoPlaybackException createForRemote(String message) {
+ return new ExoPlaybackException(TYPE_REMOTE, message);
+ }
+
+ /**
+ * Creates an instance of type {@link #TYPE_OUT_OF_MEMORY}.
+ *
+ * @param cause The cause of the failure.
+ * @return The created instance.
+ */
+ public static ExoPlaybackException createForOutOfMemoryError(OutOfMemoryError cause) {
+ return new ExoPlaybackException(TYPE_OUT_OF_MEMORY, cause, /* rendererIndex= */ C.INDEX_UNSET);
}
private ExoPlaybackException(@Type int type, Throwable cause, int rendererIndex) {
@@ -106,6 +133,13 @@ public final class ExoPlaybackException extends Exception {
this.rendererIndex = rendererIndex;
}
+ private ExoPlaybackException(@Type int type, String message) {
+ super(message);
+ this.type = type;
+ rendererIndex = C.INDEX_UNSET;
+ cause = null;
+ }
+
/**
* Retrieves the underlying error when {@link #type} is {@link #TYPE_SOURCE}.
*
@@ -113,7 +147,7 @@ public final class ExoPlaybackException extends Exception {
*/
public IOException getSourceException() {
Assertions.checkState(type == TYPE_SOURCE);
- return (IOException) cause;
+ return (IOException) Assertions.checkNotNull(cause);
}
/**
@@ -123,7 +157,7 @@ public final class ExoPlaybackException extends Exception {
*/
public Exception getRendererException() {
Assertions.checkState(type == TYPE_RENDERER);
- return (Exception) cause;
+ return (Exception) Assertions.checkNotNull(cause);
}
/**
@@ -133,7 +167,16 @@ public final class ExoPlaybackException extends Exception {
*/
public RuntimeException getUnexpectedException() {
Assertions.checkState(type == TYPE_UNEXPECTED);
- return (RuntimeException) cause;
+ return (RuntimeException) Assertions.checkNotNull(cause);
}
+ /**
+ * Retrieves the underlying error when {@link #type} is {@link #TYPE_OUT_OF_MEMORY}.
+ *
+ * @throws IllegalStateException If {@link #type} is not {@link #TYPE_OUT_OF_MEMORY}.
+ */
+ public OutOfMemoryError getOutOfMemoryError() {
+ Assertions.checkState(type == TYPE_OUT_OF_MEMORY);
+ return (OutOfMemoryError) Assertions.checkNotNull(cause);
+ }
}
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 0e8c176486..d0f9e2ae04 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
@@ -16,15 +16,15 @@
package com.google.android.exoplayer2;
import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer;
import com.google.android.exoplayer2.metadata.MetadataRenderer;
import com.google.android.exoplayer2.source.ClippingMediaSource;
import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
import com.google.android.exoplayer2.source.LoopingMediaSource;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.MergingMediaSource;
+import com.google.android.exoplayer2.source.ProgressiveMediaSource;
import com.google.android.exoplayer2.source.SingleSampleMediaSource;
import com.google.android.exoplayer2.text.TextRenderer;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
@@ -48,7 +48,7 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
*
A {@link MediaSource} that defines the media to be played, loads the media, and from
* which the loaded media can be read. A MediaSource is injected via {@link
* #prepare(MediaSource)} at the start of playback. The library modules provide default
- * implementations for regular media files ({@link ExtractorMediaSource}), DASH
+ * implementations for progressive media files ({@link ProgressiveMediaSource}), DASH
* (DashMediaSource), SmoothStreaming (SsMediaSource) and HLS (HlsMediaSource), an
* implementation for loading single media samples ({@link SingleSampleMediaSource}) that's
* most often used for side-loaded subtitle files, and implementations for building more
@@ -117,12 +117,6 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
*/
public interface ExoPlayer extends Player {
- /**
- * @deprecated Use {@link Player.EventListener} instead.
- */
- @Deprecated
- interface EventListener extends Player.EventListener {}
-
/** @deprecated Use {@link PlayerMessage.Target} instead. */
@Deprecated
interface ExoPlayerComponent extends PlayerMessage.Target {}
@@ -147,43 +141,6 @@ public interface ExoPlayer extends Player {
}
}
- /**
- * @deprecated Use {@link Player#STATE_IDLE} instead.
- */
- @Deprecated
- int STATE_IDLE = Player.STATE_IDLE;
- /**
- * @deprecated Use {@link Player#STATE_BUFFERING} instead.
- */
- @Deprecated
- int STATE_BUFFERING = Player.STATE_BUFFERING;
- /**
- * @deprecated Use {@link Player#STATE_READY} instead.
- */
- @Deprecated
- int STATE_READY = Player.STATE_READY;
- /**
- * @deprecated Use {@link Player#STATE_ENDED} instead.
- */
- @Deprecated
- int STATE_ENDED = Player.STATE_ENDED;
-
- /**
- * @deprecated Use {@link Player#REPEAT_MODE_OFF} instead.
- */
- @Deprecated
- @RepeatMode int REPEAT_MODE_OFF = Player.REPEAT_MODE_OFF;
- /**
- * @deprecated Use {@link Player#REPEAT_MODE_ONE} instead.
- */
- @Deprecated
- @RepeatMode int REPEAT_MODE_ONE = Player.REPEAT_MODE_ONE;
- /**
- * @deprecated Use {@link Player#REPEAT_MODE_ALL} instead.
- */
- @Deprecated
- @RepeatMode int REPEAT_MODE_ALL = Player.REPEAT_MODE_ALL;
-
/** Returns the {@link Looper} associated with the playback thread. */
Looper getPlaybackLooper();
@@ -196,18 +153,12 @@ public interface ExoPlayer extends Player {
/**
* Prepares the player to play the provided {@link MediaSource}. Equivalent to
* {@code prepare(mediaSource, true, true)}.
- *
- * Note: {@link MediaSource} instances are not designed to be re-used. If you want to prepare a
- * player more than once with the same piece of media, use a new instance each time.
*/
void prepare(MediaSource mediaSource);
/**
* Prepares the player to play the provided {@link MediaSource}, optionally resetting the playback
* position the default position in the first {@link Timeline.Window}.
- *
- * Note: {@link MediaSource} instances are not designed to be re-used. If you want to prepare a
- * player more than once with the same piece of media, use a new instance each time.
*
* @param mediaSource The {@link MediaSource} to play.
* @param resetPosition Whether the playback position should be reset to the default position in
@@ -252,4 +203,34 @@ public interface ExoPlayer extends Player {
/** Returns the currently active {@link SeekParameters} of the player. */
SeekParameters getSeekParameters();
+
+ /**
+ * Sets whether the player is allowed to keep holding limited resources such as video decoders,
+ * even when in the idle state. By doing so, the player may be able to reduce latency when
+ * starting to play another piece of content for which the same resources are required.
+ *
+ *
This mode should be used with caution, since holding limited resources may prevent other
+ * players of media components from acquiring them. It should only be enabled when both
+ * of the following conditions are true:
+ *
+ *
+ * - The application that owns the player is in the foreground.
+ *
- The player is used in a way that may benefit from foreground mode. For this to be true,
+ * the same player instance must be used to play multiple pieces of content, and there must
+ * be gaps between the playbacks (i.e. {@link #stop} is called to halt one playback, and
+ * {@link #prepare} is called some time later to start a new one).
+ *
+ *
+ * Note that foreground mode is not useful for switching between content without gaps
+ * between the playbacks. For this use case {@link #stop} does not need to be called, and simply
+ * calling {@link #prepare} for the new media will cause limited resources to be retained even if
+ * foreground mode is not enabled.
+ *
+ *
If foreground mode is enabled, it's the application's responsibility to disable it when the
+ * conditions described above no longer hold.
+ *
+ * @param foregroundMode Whether the player is allowed to keep limited resources even when in the
+ * idle state.
+ */
+ void setForegroundMode(boolean foregroundMode);
}
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 6c2a6f527c..59647feaa9 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
@@ -17,9 +17,8 @@ package com.google.android.exoplayer2;
import android.content.Context;
import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.analytics.AnalyticsCollector;
-import com.google.android.exoplayer2.audio.AudioAttributes;
import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
@@ -38,44 +37,6 @@ public final class ExoPlayerFactory {
private ExoPlayerFactory() {}
- /**
- * Creates a {@link SimpleExoPlayer} instance.
- *
- * @param context A {@link Context}.
- * @param trackSelector The {@link TrackSelector} that will be used by the instance.
- * @param loadControl The {@link LoadControl} that will be used by the instance.
- * @deprecated Use {@link #newSimpleInstance(Context, RenderersFactory, TrackSelector,
- * LoadControl)}.
- */
- @Deprecated
- public static SimpleExoPlayer newSimpleInstance(
- Context context, TrackSelector trackSelector, LoadControl loadControl) {
- RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
- return newSimpleInstance(context, renderersFactory, trackSelector, loadControl);
- }
-
- /**
- * Creates a {@link SimpleExoPlayer} instance. Available extension renderers are not used.
- *
- * @param context A {@link Context}.
- * @param trackSelector The {@link TrackSelector} that will be used by the instance.
- * @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.
- * @deprecated Use {@link #newSimpleInstance(Context, RenderersFactory, TrackSelector,
- * LoadControl)}.
- */
- @Deprecated
- public static SimpleExoPlayer newSimpleInstance(
- Context context,
- TrackSelector trackSelector,
- LoadControl loadControl,
- @Nullable DrmSessionManager drmSessionManager) {
- RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
- return newSimpleInstance(
- context, renderersFactory, trackSelector, loadControl, drmSessionManager);
- }
-
/**
* Creates a {@link SimpleExoPlayer} instance.
*
@@ -88,7 +49,7 @@ public final class ExoPlayerFactory {
* extension renderers are used. Note that extensions must be included in the application
* build for them to be considered available.
* @deprecated Use {@link #newSimpleInstance(Context, RenderersFactory, TrackSelector,
- * LoadControl)}.
+ * LoadControl, DrmSessionManager)}.
*/
@Deprecated
public static SimpleExoPlayer newSimpleInstance(
@@ -117,7 +78,7 @@ public final class ExoPlayerFactory {
* @param allowedVideoJoiningTimeMs The maximum duration for which a video renderer can attempt to
* seamlessly join an ongoing playback.
* @deprecated Use {@link #newSimpleInstance(Context, RenderersFactory, TrackSelector,
- * LoadControl)}.
+ * LoadControl, DrmSessionManager)}.
*/
@Deprecated
public static SimpleExoPlayer newSimpleInstance(
@@ -154,23 +115,6 @@ public final class ExoPlayerFactory {
return newSimpleInstance(context, new DefaultRenderersFactory(context), trackSelector);
}
- /**
- * Creates a {@link SimpleExoPlayer} instance.
- *
- * @param renderersFactory A factory for creating {@link Renderer}s to be used by the instance.
- * @param trackSelector The {@link TrackSelector} that will be used by the instance.
- * @deprecated Use {@link #newSimpleInstance(Context, RenderersFactory, TrackSelector)}. The use
- * of {@link SimpleExoPlayer#setAudioAttributes(AudioAttributes, boolean)} to manage audio
- * focus will be unavailable for the {@link SimpleExoPlayer} returned by this method.
- */
- @Deprecated
- @SuppressWarnings("nullness:argument.type.incompatible")
- public static SimpleExoPlayer newSimpleInstance(
- RenderersFactory renderersFactory, TrackSelector trackSelector) {
- return newSimpleInstance(
- /* context= */ null, renderersFactory, trackSelector, new DefaultLoadControl());
- }
-
/**
* Creates a {@link SimpleExoPlayer} instance.
*
@@ -183,6 +127,38 @@ public final class ExoPlayerFactory {
return newSimpleInstance(context, renderersFactory, trackSelector, new DefaultLoadControl());
}
+ /**
+ * Creates a {@link SimpleExoPlayer} instance.
+ *
+ * @param context A {@link Context}.
+ * @param trackSelector The {@link TrackSelector} that will be used by the instance.
+ * @param loadControl The {@link LoadControl} that will be used by the instance.
+ */
+ public static SimpleExoPlayer newSimpleInstance(
+ Context context, TrackSelector trackSelector, LoadControl loadControl) {
+ RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
+ return newSimpleInstance(context, renderersFactory, trackSelector, loadControl);
+ }
+
+ /**
+ * Creates a {@link SimpleExoPlayer} instance. Available extension renderers are not used.
+ *
+ * @param context A {@link Context}.
+ * @param trackSelector The {@link TrackSelector} that will be used by the instance.
+ * @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.
+ */
+ public static SimpleExoPlayer newSimpleInstance(
+ Context context,
+ TrackSelector trackSelector,
+ LoadControl loadControl,
+ @Nullable DrmSessionManager drmSessionManager) {
+ RenderersFactory renderersFactory = new DefaultRenderersFactory(context);
+ return newSimpleInstance(
+ context, renderersFactory, trackSelector, loadControl, drmSessionManager);
+ }
+
/**
* Creates a {@link SimpleExoPlayer} instance.
*
@@ -358,7 +334,7 @@ public final class ExoPlayerFactory {
trackSelector,
loadControl,
drmSessionManager,
- getDefaultBandwidthMeter(),
+ getDefaultBandwidthMeter(context),
analyticsCollectorFactory,
looper);
}
@@ -400,28 +376,32 @@ public final class ExoPlayerFactory {
/**
* Creates an {@link ExoPlayer} instance.
*
+ * @param context A {@link Context}.
* @param renderers The {@link Renderer}s that will be used by the instance.
* @param trackSelector The {@link TrackSelector} that will be used by the instance.
*/
- public static ExoPlayer newInstance(Renderer[] renderers, TrackSelector trackSelector) {
- return newInstance(renderers, trackSelector, new DefaultLoadControl());
+ public static ExoPlayer newInstance(
+ Context context, Renderer[] renderers, TrackSelector trackSelector) {
+ return newInstance(context, renderers, trackSelector, new DefaultLoadControl());
}
/**
* Creates an {@link ExoPlayer} instance.
*
+ * @param context A {@link Context}.
* @param renderers The {@link Renderer}s that will be used by the instance.
* @param trackSelector The {@link TrackSelector} that will be used by the instance.
* @param loadControl The {@link LoadControl} that will be used by the instance.
*/
- public static ExoPlayer newInstance(Renderer[] renderers, TrackSelector trackSelector,
- LoadControl loadControl) {
- return newInstance(renderers, trackSelector, loadControl, Util.getLooper());
+ public static ExoPlayer newInstance(
+ Context context, Renderer[] renderers, TrackSelector trackSelector, LoadControl loadControl) {
+ return newInstance(context, renderers, trackSelector, loadControl, Util.getLooper());
}
/**
* Creates an {@link ExoPlayer} instance.
*
+ * @param context A {@link Context}.
* @param renderers The {@link Renderer}s that will be used by the instance.
* @param trackSelector The {@link TrackSelector} that will be used by the instance.
* @param loadControl The {@link LoadControl} that will be used by the instance.
@@ -429,13 +409,19 @@ public final class ExoPlayerFactory {
* used to call listeners on.
*/
public static ExoPlayer newInstance(
- Renderer[] renderers, TrackSelector trackSelector, LoadControl loadControl, Looper looper) {
- return newInstance(renderers, trackSelector, loadControl, getDefaultBandwidthMeter(), looper);
+ Context context,
+ Renderer[] renderers,
+ TrackSelector trackSelector,
+ LoadControl loadControl,
+ Looper looper) {
+ return newInstance(
+ context, renderers, trackSelector, loadControl, getDefaultBandwidthMeter(context), looper);
}
/**
* Creates an {@link ExoPlayer} instance.
*
+ * @param context A {@link Context}.
* @param renderers The {@link Renderer}s that will be used by the instance.
* @param trackSelector The {@link TrackSelector} that will be used by the instance.
* @param loadControl The {@link LoadControl} that will be used by the instance.
@@ -443,7 +429,9 @@ public final class ExoPlayerFactory {
* @param looper The {@link Looper} which must be used for all calls to the player and which is
* used to call listeners on.
*/
+ @SuppressWarnings("unused")
public static ExoPlayer newInstance(
+ Context context,
Renderer[] renderers,
TrackSelector trackSelector,
LoadControl loadControl,
@@ -453,9 +441,9 @@ public final class ExoPlayerFactory {
renderers, trackSelector, loadControl, bandwidthMeter, Clock.DEFAULT, looper);
}
- private static synchronized BandwidthMeter getDefaultBandwidthMeter() {
+ private static synchronized BandwidthMeter getDefaultBandwidthMeter(Context context) {
if (singletonBandwidthMeter == null) {
- singletonBandwidthMeter = new DefaultBandwidthMeter.Builder().build();
+ singletonBandwidthMeter = new DefaultBandwidthMeter.Builder(context).build();
}
return singletonBandwidthMeter;
}
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 de6e867514..15deb8ea47 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
@@ -19,7 +19,7 @@ import android.annotation.SuppressLint;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.Pair;
import com.google.android.exoplayer2.PlayerMessage.Target;
import com.google.android.exoplayer2.source.MediaSource;
@@ -37,8 +37,7 @@ import com.google.android.exoplayer2.util.Util;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.CopyOnWriteArrayList;
/** An {@link ExoPlayer} implementation. Instances can be obtained from {@link ExoPlayerFactory}. */
/* package */ final class ExoPlayerImpl extends BasePlayer implements ExoPlayer {
@@ -49,7 +48,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
* This empty track selector result can only be used for {@link PlaybackInfo#trackSelectorResult}
* when the player does not have any track selection made (such as when player is reset, or when
* player seeks to an unprepared period). It will not be used as result of any {@link
- * TrackSelector#selectTracks(RendererCapabilities[], TrackGroupArray)} operation.
+ * TrackSelector#selectTracks(RendererCapabilities[], TrackGroupArray, MediaPeriodId, Timeline)}
+ * operation.
*/
/* package */ final TrackSelectorResult emptyTrackSelectorResult;
@@ -58,9 +58,9 @@ import java.util.concurrent.CopyOnWriteArraySet;
private final Handler eventHandler;
private final ExoPlayerImplInternal internalPlayer;
private final Handler internalPlayerHandler;
- private final CopyOnWriteArraySet listeners;
+ private final CopyOnWriteArrayList listeners;
private final Timeline.Period period;
- private final ArrayDeque pendingPlaybackInfoUpdates;
+ private final ArrayDeque pendingListenerNotifications;
private MediaSource mediaSource;
private boolean playWhenReady;
@@ -70,6 +70,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
private int pendingOperationAcks;
private boolean hasPendingPrepare;
private boolean hasPendingSeek;
+ private boolean foregroundMode;
private PlaybackParameters playbackParameters;
private SeekParameters seekParameters;
private @Nullable ExoPlaybackException playbackError;
@@ -109,7 +110,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
this.playWhenReady = false;
this.repeatMode = Player.REPEAT_MODE_OFF;
this.shuffleModeEnabled = false;
- this.listeners = new CopyOnWriteArraySet<>();
+ this.listeners = new CopyOnWriteArrayList<>();
emptyTrackSelectorResult =
new TrackSelectorResult(
new RendererConfiguration[renderers.length],
@@ -126,7 +127,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
}
};
playbackInfo = PlaybackInfo.createDummy(/* startPositionUs= */ 0, emptyTrackSelectorResult);
- pendingPlaybackInfoUpdates = new ArrayDeque<>();
+ pendingListenerNotifications = new ArrayDeque<>();
internalPlayer =
new ExoPlayerImplInternal(
renderers,
@@ -178,12 +179,17 @@ import java.util.concurrent.CopyOnWriteArraySet;
@Override
public void addListener(Player.EventListener listener) {
- listeners.add(listener);
+ listeners.addIfAbsent(new ListenerHolder(listener));
}
@Override
public void removeListener(Player.EventListener listener) {
- listeners.remove(listener);
+ for (ListenerHolder listenerHolder : listeners) {
+ if (listenerHolder.listener.equals(listener)) {
+ listenerHolder.release();
+ listeners.remove(listenerHolder);
+ }
+ }
}
@Override
@@ -228,8 +234,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
/* positionDiscontinuity= */ false,
/* ignored */ DISCONTINUITY_REASON_INTERNAL,
TIMELINE_CHANGE_REASON_RESET,
- /* seekProcessed= */ false,
- /* playWhenReadyChanged= */ false);
+ /* seekProcessed= */ false);
}
@Override
@@ -245,13 +250,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
}
if (this.playWhenReady != playWhenReady) {
this.playWhenReady = playWhenReady;
- updatePlaybackInfo(
- playbackInfo,
- /* positionDiscontinuity= */ false,
- /* ignored */ DISCONTINUITY_REASON_INTERNAL,
- /* ignored */ TIMELINE_CHANGE_REASON_RESET,
- /* seekProcessed= */ false,
- /* playWhenReadyChanged= */ true);
+ int playbackState = playbackInfo.playbackState;
+ notifyListeners(listener -> listener.onPlayerStateChanged(playWhenReady, playbackState));
}
}
@@ -265,9 +265,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
if (this.repeatMode != repeatMode) {
this.repeatMode = repeatMode;
internalPlayer.setRepeatMode(repeatMode);
- for (Player.EventListener listener : listeners) {
- listener.onRepeatModeChanged(repeatMode);
- }
+ notifyListeners(listener -> listener.onRepeatModeChanged(repeatMode));
}
}
@@ -281,9 +279,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
if (this.shuffleModeEnabled != shuffleModeEnabled) {
this.shuffleModeEnabled = shuffleModeEnabled;
internalPlayer.setShuffleModeEnabled(shuffleModeEnabled);
- for (Player.EventListener listener : listeners) {
- listener.onShuffleModeEnabledChanged(shuffleModeEnabled);
- }
+ notifyListeners(listener -> listener.onShuffleModeEnabledChanged(shuffleModeEnabled));
}
}
@@ -332,9 +328,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
maskingPeriodIndex = timeline.getIndexOfPeriod(periodUidAndPosition.first);
}
internalPlayer.seekTo(timeline, windowIndex, C.msToUs(positionMs));
- for (Player.EventListener listener : listeners) {
- listener.onPositionDiscontinuity(DISCONTINUITY_REASON_SEEK);
- }
+ notifyListeners(listener -> listener.onPositionDiscontinuity(DISCONTINUITY_REASON_SEEK));
}
@Override
@@ -366,6 +360,14 @@ import java.util.concurrent.CopyOnWriteArraySet;
return seekParameters;
}
+ @Override
+ public void setForegroundMode(boolean foregroundMode) {
+ if (this.foregroundMode != foregroundMode) {
+ this.foregroundMode = foregroundMode;
+ internalPlayer.setForegroundMode(foregroundMode);
+ }
+ }
+
@Override
public void stop(boolean reset) {
if (reset) {
@@ -388,8 +390,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
/* positionDiscontinuity= */ false,
/* ignored */ DISCONTINUITY_REASON_INTERNAL,
TIMELINE_CHANGE_REASON_RESET,
- /* seekProcessed= */ false,
- /* playWhenReadyChanged= */ false);
+ /* seekProcessed= */ false);
}
@Override
@@ -400,6 +401,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
mediaSource = null;
internalPlayer.release();
eventHandler.removeCallbacksAndMessages(null);
+ playbackInfo =
+ getResetPlaybackInfo(
+ /* resetPosition= */ false,
+ /* resetState= */ false,
+ /* playbackState= */ Player.STATE_IDLE);
}
@Override
@@ -599,17 +605,13 @@ import java.util.concurrent.CopyOnWriteArraySet;
PlaybackParameters playbackParameters = (PlaybackParameters) msg.obj;
if (!this.playbackParameters.equals(playbackParameters)) {
this.playbackParameters = playbackParameters;
- for (Player.EventListener listener : listeners) {
- listener.onPlaybackParametersChanged(playbackParameters);
- }
+ notifyListeners(listener -> listener.onPlaybackParametersChanged(playbackParameters));
}
break;
case ExoPlayerImplInternal.MSG_ERROR:
ExoPlaybackException playbackError = (ExoPlaybackException) msg.obj;
this.playbackError = playbackError;
- for (Player.EventListener listener : listeners) {
- listener.onPlayerError(playbackError);
- }
+ notifyListeners(listener -> listener.onPlayerError(playbackError));
break;
default:
throw new IllegalStateException();
@@ -629,8 +631,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
playbackInfo.resetToNewPosition(
playbackInfo.periodId, /* startPositionUs= */ 0, playbackInfo.contentPositionUs);
}
- if ((!this.playbackInfo.timeline.isEmpty() || hasPendingPrepare)
- && playbackInfo.timeline.isEmpty()) {
+ if (!this.playbackInfo.timeline.isEmpty() && playbackInfo.timeline.isEmpty()) {
// Update the masking variables, which are used when the timeline becomes empty.
maskingPeriodIndex = 0;
maskingWindowIndex = 0;
@@ -649,8 +650,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
positionDiscontinuity,
positionDiscontinuityReason,
timelineChangeReason,
- seekProcessed,
- /* playWhenReadyChanged= */ false);
+ seekProcessed);
}
}
@@ -665,6 +665,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
maskingPeriodIndex = getCurrentPeriodIndex();
maskingWindowPositionMs = getCurrentPosition();
}
+ // Also reset period-based PlaybackInfo positions if resetting the state.
+ resetPosition = resetPosition || resetState;
MediaPeriodId mediaPeriodId =
resetPosition
? playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window)
@@ -692,29 +694,37 @@ import java.util.concurrent.CopyOnWriteArraySet;
boolean positionDiscontinuity,
@Player.DiscontinuityReason int positionDiscontinuityReason,
@Player.TimelineChangeReason int timelineChangeReason,
- boolean seekProcessed,
- boolean playWhenReadyChanged) {
- boolean isRunningRecursiveListenerNotification = !pendingPlaybackInfoUpdates.isEmpty();
- pendingPlaybackInfoUpdates.addLast(
+ boolean seekProcessed) {
+ // Assign playback info immediately such that all getters return the right values.
+ PlaybackInfo previousPlaybackInfo = this.playbackInfo;
+ this.playbackInfo = playbackInfo;
+ notifyListeners(
new PlaybackInfoUpdate(
playbackInfo,
- /* previousPlaybackInfo= */ this.playbackInfo,
+ previousPlaybackInfo,
listeners,
trackSelector,
positionDiscontinuity,
positionDiscontinuityReason,
timelineChangeReason,
seekProcessed,
- playWhenReady,
- playWhenReadyChanged));
- // Assign playback info immediately such that all getters return the right values.
- this.playbackInfo = playbackInfo;
+ playWhenReady));
+ }
+
+ private void notifyListeners(ListenerInvocation listenerInvocation) {
+ CopyOnWriteArrayList listenerSnapshot = new CopyOnWriteArrayList<>(listeners);
+ notifyListeners(() -> invokeAll(listenerSnapshot, listenerInvocation));
+ }
+
+ private void notifyListeners(Runnable listenerNotificationRunnable) {
+ boolean isRunningRecursiveListenerNotification = !pendingListenerNotifications.isEmpty();
+ pendingListenerNotifications.addLast(listenerNotificationRunnable);
if (isRunningRecursiveListenerNotification) {
return;
}
- while (!pendingPlaybackInfoUpdates.isEmpty()) {
- pendingPlaybackInfoUpdates.peekFirst().notifyListeners();
- pendingPlaybackInfoUpdates.removeFirst();
+ while (!pendingListenerNotifications.isEmpty()) {
+ pendingListenerNotifications.peekFirst().run();
+ pendingListenerNotifications.removeFirst();
}
}
@@ -729,42 +739,40 @@ import java.util.concurrent.CopyOnWriteArraySet;
return playbackInfo.timeline.isEmpty() || pendingOperationAcks > 0;
}
- private static final class PlaybackInfoUpdate {
+ private static final class PlaybackInfoUpdate implements Runnable {
private final PlaybackInfo playbackInfo;
- private final Set listeners;
+ private final CopyOnWriteArrayList listenerSnapshot;
private final TrackSelector trackSelector;
private final boolean positionDiscontinuity;
private final @Player.DiscontinuityReason int positionDiscontinuityReason;
private final @Player.TimelineChangeReason int timelineChangeReason;
private final boolean seekProcessed;
- private final boolean playWhenReady;
- private final boolean playbackStateOrPlayWhenReadyChanged;
+ private final boolean playbackStateChanged;
private final boolean timelineOrManifestChanged;
private final boolean isLoadingChanged;
private final boolean trackSelectorResultChanged;
+ private final boolean playWhenReady;
public PlaybackInfoUpdate(
PlaybackInfo playbackInfo,
PlaybackInfo previousPlaybackInfo,
- Set listeners,
+ CopyOnWriteArrayList listeners,
TrackSelector trackSelector,
boolean positionDiscontinuity,
@Player.DiscontinuityReason int positionDiscontinuityReason,
@Player.TimelineChangeReason int timelineChangeReason,
boolean seekProcessed,
- boolean playWhenReady,
- boolean playWhenReadyChanged) {
+ boolean playWhenReady) {
this.playbackInfo = playbackInfo;
- this.listeners = listeners;
+ this.listenerSnapshot = new CopyOnWriteArrayList<>(listeners);
this.trackSelector = trackSelector;
this.positionDiscontinuity = positionDiscontinuity;
this.positionDiscontinuityReason = positionDiscontinuityReason;
this.timelineChangeReason = timelineChangeReason;
this.seekProcessed = seekProcessed;
this.playWhenReady = playWhenReady;
- playbackStateOrPlayWhenReadyChanged =
- playWhenReadyChanged || previousPlaybackInfo.playbackState != playbackInfo.playbackState;
+ playbackStateChanged = previousPlaybackInfo.playbackState != playbackInfo.playbackState;
timelineOrManifestChanged =
previousPlaybackInfo.timeline != playbackInfo.timeline
|| previousPlaybackInfo.manifest != playbackInfo.manifest;
@@ -773,40 +781,46 @@ import java.util.concurrent.CopyOnWriteArraySet;
previousPlaybackInfo.trackSelectorResult != playbackInfo.trackSelectorResult;
}
- public void notifyListeners() {
+ @Override
+ public void run() {
if (timelineOrManifestChanged || timelineChangeReason == TIMELINE_CHANGE_REASON_PREPARED) {
- for (Player.EventListener listener : listeners) {
- listener.onTimelineChanged(
- playbackInfo.timeline, playbackInfo.manifest, timelineChangeReason);
- }
+ invokeAll(
+ listenerSnapshot,
+ listener ->
+ listener.onTimelineChanged(
+ playbackInfo.timeline, playbackInfo.manifest, timelineChangeReason));
}
if (positionDiscontinuity) {
- for (Player.EventListener listener : listeners) {
- listener.onPositionDiscontinuity(positionDiscontinuityReason);
- }
+ invokeAll(
+ listenerSnapshot,
+ listener -> listener.onPositionDiscontinuity(positionDiscontinuityReason));
}
if (trackSelectorResultChanged) {
trackSelector.onSelectionActivated(playbackInfo.trackSelectorResult.info);
- for (Player.EventListener listener : listeners) {
- listener.onTracksChanged(
- playbackInfo.trackGroups, playbackInfo.trackSelectorResult.selections);
- }
+ invokeAll(
+ listenerSnapshot,
+ listener ->
+ listener.onTracksChanged(
+ playbackInfo.trackGroups, playbackInfo.trackSelectorResult.selections));
}
if (isLoadingChanged) {
- for (Player.EventListener listener : listeners) {
- listener.onLoadingChanged(playbackInfo.isLoading);
- }
+ invokeAll(listenerSnapshot, listener -> listener.onLoadingChanged(playbackInfo.isLoading));
}
- if (playbackStateOrPlayWhenReadyChanged) {
- for (Player.EventListener listener : listeners) {
- listener.onPlayerStateChanged(playWhenReady, playbackInfo.playbackState);
- }
+ if (playbackStateChanged) {
+ invokeAll(
+ listenerSnapshot,
+ listener -> listener.onPlayerStateChanged(playWhenReady, playbackInfo.playbackState));
}
if (seekProcessed) {
- for (Player.EventListener listener : listeners) {
- listener.onSeekProcessed();
- }
+ invokeAll(listenerSnapshot, EventListener::onSeekProcessed);
}
}
}
+
+ private static void invokeAll(
+ CopyOnWriteArrayList listeners, ListenerInvocation listenerInvocation) {
+ for (ListenerHolder listenerHolder : listeners) {
+ listenerHolder.invoke(listenerInvocation);
+ }
+ }
}
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 c31c6b75a5..37774bccb5 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
@@ -21,8 +21,8 @@ import android.os.Looper;
import android.os.Message;
import android.os.Process;
import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.util.Pair;
import com.google.android.exoplayer2.DefaultMediaClock.PlaybackParameterListener;
import com.google.android.exoplayer2.Player.DiscontinuityReason;
@@ -44,6 +44,7 @@ import com.google.android.exoplayer2.util.Util;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.concurrent.atomic.AtomicBoolean;
/** Implements the internal behavior of {@link ExoPlayerImpl}. */
/* package */ final class ExoPlayerImplInternal
@@ -76,9 +77,10 @@ import java.util.Collections;
private static final int MSG_TRACK_SELECTION_INVALIDATED = 11;
private static final int MSG_SET_REPEAT_MODE = 12;
private static final int MSG_SET_SHUFFLE_ENABLED = 13;
- private static final int MSG_SEND_MESSAGE = 14;
- private static final int MSG_SEND_MESSAGE_TO_TARGET_THREAD = 15;
- private static final int MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL = 16;
+ private static final int MSG_SET_FOREGROUND_MODE = 14;
+ private static final int MSG_SEND_MESSAGE = 15;
+ private static final int MSG_SEND_MESSAGE_TO_TARGET_THREAD = 16;
+ private static final int MSG_PLAYBACK_PARAMETERS_CHANGED_INTERNAL = 17;
private static final int PREPARING_SOURCE_INTERVAL_MS = 10;
private static final int RENDERING_INTERVAL_MS = 10;
@@ -114,6 +116,7 @@ import java.util.Collections;
private boolean rebuffering;
@Player.RepeatMode private int repeatMode;
private boolean shuffleModeEnabled;
+ private boolean foregroundMode;
private int pendingPrepareCount;
private SeekPosition pendingInitialSeekPosition;
@@ -215,6 +218,29 @@ import java.util.Collections;
handler.obtainMessage(MSG_SEND_MESSAGE, message).sendToTarget();
}
+ public synchronized void setForegroundMode(boolean foregroundMode) {
+ if (foregroundMode) {
+ handler.obtainMessage(MSG_SET_FOREGROUND_MODE, /* foregroundMode */ 1, 0).sendToTarget();
+ } else {
+ AtomicBoolean processedFlag = new AtomicBoolean();
+ handler
+ .obtainMessage(MSG_SET_FOREGROUND_MODE, /* foregroundMode */ 0, 0, processedFlag)
+ .sendToTarget();
+ boolean wasInterrupted = false;
+ while (!processedFlag.get() && !released) {
+ try {
+ wait();
+ } catch (InterruptedException e) {
+ wasInterrupted = true;
+ }
+ }
+ if (wasInterrupted) {
+ // Restore the interrupted status.
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+
public synchronized void release() {
if (released) {
return;
@@ -308,8 +334,15 @@ import java.util.Collections;
case MSG_SET_SEEK_PARAMETERS:
setSeekParametersInternal((SeekParameters) msg.obj);
break;
+ case MSG_SET_FOREGROUND_MODE:
+ setForegroundModeInternal(
+ /* foregroundMode= */ msg.arg1 != 0, /* processedFlag= */ (AtomicBoolean) msg.obj);
+ break;
case MSG_STOP:
- stopInternal(/* reset= */ msg.arg1 != 0, /* acknowledgeStop= */ true);
+ stopInternal(
+ /* forceResetRenderers= */ false,
+ /* resetPositionAndState= */ msg.arg1 != 0,
+ /* acknowledgeStop= */ true);
break;
case MSG_PERIOD_PREPARED:
handlePeriodPrepared((MediaPeriod) msg.obj);
@@ -342,19 +375,31 @@ import java.util.Collections;
maybeNotifyPlaybackInfoChanged();
} catch (ExoPlaybackException e) {
Log.e(TAG, "Playback error.", e);
- stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
eventHandler.obtainMessage(MSG_ERROR, e).sendToTarget();
+ stopInternal(
+ /* forceResetRenderers= */ true,
+ /* resetPositionAndState= */ false,
+ /* acknowledgeStop= */ false);
maybeNotifyPlaybackInfoChanged();
} catch (IOException e) {
Log.e(TAG, "Source error.", e);
- stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForSource(e)).sendToTarget();
+ stopInternal(
+ /* forceResetRenderers= */ false,
+ /* resetPositionAndState= */ false,
+ /* acknowledgeStop= */ false);
maybeNotifyPlaybackInfoChanged();
- } catch (RuntimeException e) {
+ } catch (RuntimeException | OutOfMemoryError e) {
Log.e(TAG, "Internal runtime error.", e);
- stopInternal(/* reset= */ false, /* acknowledgeStop= */ false);
- eventHandler.obtainMessage(MSG_ERROR, ExoPlaybackException.createForUnexpected(e))
- .sendToTarget();
+ ExoPlaybackException error =
+ e instanceof OutOfMemoryError
+ ? ExoPlaybackException.createForOutOfMemoryError((OutOfMemoryError) e)
+ : ExoPlaybackException.createForUnexpected((RuntimeException) e);
+ eventHandler.obtainMessage(MSG_ERROR, error).sendToTarget();
+ stopInternal(
+ /* forceResetRenderers= */ true,
+ /* resetPositionAndState= */ false,
+ /* acknowledgeStop= */ false);
maybeNotifyPlaybackInfoChanged();
}
return true;
@@ -391,7 +436,8 @@ import java.util.Collections;
private void prepareInternal(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
pendingPrepareCount++;
- resetInternal(/* releaseMediaSource= */ true, resetPosition, resetState);
+ resetInternal(
+ /* resetRenderers= */ false, /* releaseMediaSource= */ true, resetPosition, resetState);
loadControl.onPrepared();
this.mediaSource = mediaSource;
setState(Player.STATE_BUFFERING);
@@ -624,7 +670,10 @@ import java.util.Collections;
// End playback, as we didn't manage to find a valid seek position.
setState(Player.STATE_ENDED);
resetInternal(
- /* releaseMediaSource= */ false, /* resetPosition= */ true, /* resetState= */ false);
+ /* resetRenderers= */ false,
+ /* releaseMediaSource= */ false,
+ /* resetPosition= */ true,
+ /* resetState= */ false);
} else {
// Execute the seek in the current media periods.
long newPeriodPositionUs = periodPositionUs;
@@ -721,6 +770,7 @@ import java.util.Collections;
for (Renderer renderer : enabledRenderers) {
renderer.resetPosition(rendererPositionUs);
}
+ notifyTrackSelectionDiscontinuity();
}
private void setPlaybackParametersInternal(PlaybackParameters playbackParameters) {
@@ -731,9 +781,33 @@ import java.util.Collections;
this.seekParameters = seekParameters;
}
- private void stopInternal(boolean reset, boolean acknowledgeStop) {
+ private void setForegroundModeInternal(
+ boolean foregroundMode, @Nullable AtomicBoolean processedFlag) {
+ if (this.foregroundMode != foregroundMode) {
+ this.foregroundMode = foregroundMode;
+ if (!foregroundMode) {
+ for (Renderer renderer : renderers) {
+ if (renderer.getState() == Renderer.STATE_DISABLED) {
+ renderer.reset();
+ }
+ }
+ }
+ }
+ if (processedFlag != null) {
+ synchronized (this) {
+ processedFlag.set(true);
+ notifyAll();
+ }
+ }
+ }
+
+ private void stopInternal(
+ boolean forceResetRenderers, boolean resetPositionAndState, boolean acknowledgeStop) {
resetInternal(
- /* releaseMediaSource= */ true, /* resetPosition= */ reset, /* resetState= */ reset);
+ /* resetRenderers= */ forceResetRenderers || !foregroundMode,
+ /* releaseMediaSource= */ true,
+ /* resetPosition= */ resetPositionAndState,
+ /* resetState= */ resetPositionAndState);
playbackInfoUpdate.incrementPendingOperationAcks(
pendingPrepareCount + (acknowledgeStop ? 1 : 0));
pendingPrepareCount = 0;
@@ -743,7 +817,10 @@ import java.util.Collections;
private void releaseInternal() {
resetInternal(
- /* releaseMediaSource= */ true, /* resetPosition= */ true, /* resetState= */ true);
+ /* resetRenderers= */ true,
+ /* releaseMediaSource= */ true,
+ /* resetPosition= */ true,
+ /* resetState= */ true);
loadControl.onReleased();
setState(Player.STATE_IDLE);
internalPlaybackThread.quit();
@@ -754,7 +831,10 @@ import java.util.Collections;
}
private void resetInternal(
- boolean releaseMediaSource, boolean resetPosition, boolean resetState) {
+ boolean resetRenderers,
+ boolean releaseMediaSource,
+ boolean resetPosition,
+ boolean resetState) {
handler.removeMessages(MSG_DO_SOME_WORK);
rebuffering = false;
mediaClock.stop();
@@ -764,15 +844,37 @@ import java.util.Collections;
disableRenderer(renderer);
} catch (ExoPlaybackException | RuntimeException e) {
// There's nothing we can do.
- Log.e(TAG, "Stop failed.", e);
+ Log.e(TAG, "Disable failed.", e);
+ }
+ }
+ if (resetRenderers) {
+ for (Renderer renderer : renderers) {
+ try {
+ renderer.reset();
+ } catch (RuntimeException e) {
+ // There's nothing we can do.
+ Log.e(TAG, "Reset failed.", e);
+ }
}
}
enabledRenderers = new Renderer[0];
- queue.clear(/* keepFrontPeriodUid= */ !resetPosition);
- setIsLoading(false);
+
if (resetPosition) {
pendingInitialSeekPosition = null;
+ } else if (resetState) {
+ // When resetting the state, also reset the period-based PlaybackInfo position and convert
+ // existing position to initial seek instead.
+ resetPosition = true;
+ if (pendingInitialSeekPosition == null && !playbackInfo.timeline.isEmpty()) {
+ playbackInfo.timeline.getPeriodByUid(playbackInfo.periodId.periodUid, period);
+ long windowPositionUs = playbackInfo.positionUs + period.getPositionInWindowUs();
+ pendingInitialSeekPosition =
+ new SeekPosition(Timeline.EMPTY, period.windowIndex, windowPositionUs);
+ }
}
+
+ queue.clear(/* keepFrontPeriodUid= */ !resetPosition);
+ setIsLoading(false);
if (resetState) {
queue.setTimeline(Timeline.EMPTY);
for (PendingMessageInfo pendingMessageInfo : pendingMessages) {
@@ -986,12 +1088,14 @@ import java.util.Collections;
MediaPeriodHolder periodHolder = queue.getPlayingPeriod();
MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
boolean selectionsChangedForReadPeriod = true;
+ TrackSelectorResult newTrackSelectorResult;
while (true) {
if (periodHolder == null || !periodHolder.prepared) {
// The reselection did not change any prepared periods.
return;
}
- if (periodHolder.selectTracks(playbackSpeed)) {
+ newTrackSelectorResult = periodHolder.selectTracks(playbackSpeed, playbackInfo.timeline);
+ if (newTrackSelectorResult != null) {
// Selected tracks have changed for this period.
break;
}
@@ -999,7 +1103,7 @@ import java.util.Collections;
// The track reselection didn't affect any period that has been read.
selectionsChangedForReadPeriod = false;
}
- periodHolder = periodHolder.next;
+ periodHolder = periodHolder.getNext();
}
if (selectionsChangedForReadPeriod) {
@@ -1010,7 +1114,7 @@ import java.util.Collections;
boolean[] streamResetFlags = new boolean[renderers.length];
long periodPositionUs =
playingPeriodHolder.applyTrackSelection(
- playbackInfo.positionUs, recreateStreams, streamResetFlags);
+ newTrackSelectorResult, playbackInfo.positionUs, recreateStreams, streamResetFlags);
if (playbackInfo.playbackState != Player.STATE_ENDED
&& periodPositionUs != playbackInfo.positionUs) {
playbackInfo =
@@ -1044,7 +1148,7 @@ import java.util.Collections;
}
playbackInfo =
playbackInfo.copyWithTrackInfo(
- playingPeriodHolder.trackGroups, playingPeriodHolder.trackSelectorResult);
+ playingPeriodHolder.getTrackGroups(), playingPeriodHolder.getTrackSelectorResult());
enableRenderers(rendererWasEnabledFlags, enabledRendererCount);
} else {
// Release and re-prepare/buffer periods after the one whose selection changed.
@@ -1053,7 +1157,7 @@ import java.util.Collections;
long loadingPeriodPositionUs =
Math.max(
periodHolder.info.startPositionUs, periodHolder.toPeriodTime(rendererPositionUs));
- periodHolder.applyTrackSelection(loadingPeriodPositionUs, false);
+ periodHolder.applyTrackSelection(newTrackSelectorResult, loadingPeriodPositionUs, false);
}
}
handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ true);
@@ -1065,17 +1169,31 @@ import java.util.Collections;
}
private void updateTrackSelectionPlaybackSpeed(float playbackSpeed) {
+ MediaPeriodHolder periodHolder = queue.getFrontPeriod();
+ while (periodHolder != null && periodHolder.prepared) {
+ TrackSelection[] trackSelections = periodHolder.getTrackSelectorResult().selections.getAll();
+ for (TrackSelection trackSelection : trackSelections) {
+ if (trackSelection != null) {
+ trackSelection.onPlaybackSpeed(playbackSpeed);
+ }
+ }
+ periodHolder = periodHolder.getNext();
+ }
+ }
+
+ private void notifyTrackSelectionDiscontinuity() {
MediaPeriodHolder periodHolder = queue.getFrontPeriod();
while (periodHolder != null) {
- if (periodHolder.trackSelectorResult != null) {
- TrackSelection[] trackSelections = periodHolder.trackSelectorResult.selections.getAll();
+ TrackSelectorResult trackSelectorResult = periodHolder.getTrackSelectorResult();
+ if (trackSelectorResult != null) {
+ TrackSelection[] trackSelections = trackSelectorResult.selections.getAll();
for (TrackSelection trackSelection : trackSelections) {
if (trackSelection != null) {
- trackSelection.onPlaybackSpeed(playbackSpeed);
+ trackSelection.onDiscontinuity();
}
}
}
- periodHolder = periodHolder.next;
+ periodHolder = periodHolder.getNext();
}
}
@@ -1102,11 +1220,12 @@ import java.util.Collections;
private boolean isTimelineReady() {
MediaPeriodHolder playingPeriodHolder = queue.getPlayingPeriod();
+ MediaPeriodHolder nextPeriodHolder = playingPeriodHolder.getNext();
long playingPeriodDurationUs = playingPeriodHolder.info.durationUs;
return playingPeriodDurationUs == C.TIME_UNSET
|| playbackInfo.positionUs < playingPeriodDurationUs
- || (playingPeriodHolder.next != null
- && (playingPeriodHolder.next.prepared || playingPeriodHolder.next.info.id.isAd()));
+ || (nextPeriodHolder != null
+ && (nextPeriodHolder.prepared || nextPeriodHolder.info.id.isAd()));
}
private void maybeThrowSourceInfoRefreshError() throws IOException {
@@ -1125,8 +1244,9 @@ import java.util.Collections;
private void maybeThrowPeriodPrepareError() throws IOException {
MediaPeriodHolder loadingPeriodHolder = queue.getLoadingPeriod();
MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
- if (loadingPeriodHolder != null && !loadingPeriodHolder.prepared
- && (readingPeriodHolder == null || readingPeriodHolder.next == loadingPeriodHolder)) {
+ if (loadingPeriodHolder != null
+ && !loadingPeriodHolder.prepared
+ && (readingPeriodHolder == null || readingPeriodHolder.getNext() == loadingPeriodHolder)) {
for (Renderer renderer : enabledRenderers) {
if (!renderer.hasReadStreamToEnd()) {
return;
@@ -1142,6 +1262,8 @@ import java.util.Collections;
// Stale event.
return;
}
+ playbackInfoUpdate.incrementPendingOperationAcks(pendingPrepareCount);
+ pendingPrepareCount = 0;
Timeline oldTimeline = playbackInfo.timeline;
Timeline timeline = sourceRefreshInfo.timeline;
@@ -1150,138 +1272,107 @@ import java.util.Collections;
playbackInfo = playbackInfo.copyWithTimeline(timeline, manifest);
resolvePendingMessagePositions();
- if (pendingPrepareCount > 0) {
- playbackInfoUpdate.incrementPendingOperationAcks(pendingPrepareCount);
- pendingPrepareCount = 0;
- if (pendingInitialSeekPosition != null) {
- Pair periodPosition;
- try {
- periodPosition =
- resolveSeekPosition(pendingInitialSeekPosition, /* trySubsequentPeriods= */ true);
- } catch (IllegalSeekPositionException e) {
- MediaPeriodId firstMediaPeriodId =
- playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window);
- playbackInfo =
- playbackInfo.resetToNewPosition(
- firstMediaPeriodId,
- /* startPositionUs= */ C.TIME_UNSET,
- /* contentPositionUs= */ C.TIME_UNSET);
- throw e;
- }
- pendingInitialSeekPosition = null;
- if (periodPosition == null) {
- // The seek position was valid for the timeline that it was performed into, but the
- // timeline has changed and a suitable seek position could not be resolved in the new one.
- handleSourceInfoRefreshEndedPlayback();
- } else {
- Object periodUid = periodPosition.first;
- long positionUs = periodPosition.second;
- MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(periodUid, positionUs);
- playbackInfo =
- playbackInfo.resetToNewPosition(
- periodId, periodId.isAd() ? 0 : positionUs, /* contentPositionUs= */ positionUs);
- }
- } else if (playbackInfo.startPositionUs == C.TIME_UNSET) {
- if (timeline.isEmpty()) {
- handleSourceInfoRefreshEndedPlayback();
- } else {
- Pair defaultPosition =
- getPeriodPosition(
- timeline, timeline.getFirstWindowIndex(shuffleModeEnabled), C.TIME_UNSET);
- Object periodUid = defaultPosition.first;
- long startPositionUs = defaultPosition.second;
- MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(periodUid, startPositionUs);
- playbackInfo =
- playbackInfo.resetToNewPosition(
- periodId,
- periodId.isAd() ? 0 : startPositionUs,
- /* contentPositionUs= */ startPositionUs);
- }
+ MediaPeriodId newPeriodId = playbackInfo.periodId;
+ long oldContentPositionUs =
+ playbackInfo.periodId.isAd() ? playbackInfo.contentPositionUs : playbackInfo.positionUs;
+ long newContentPositionUs = oldContentPositionUs;
+ if (pendingInitialSeekPosition != null) {
+ // Resolve initial seek position.
+ Pair periodPosition =
+ resolveSeekPosition(pendingInitialSeekPosition, /* trySubsequentPeriods= */ true);
+ pendingInitialSeekPosition = null;
+ if (periodPosition == null) {
+ // The seek position was valid for the timeline that it was performed into, but the
+ // timeline has changed and a suitable seek position could not be resolved in the new one.
+ handleSourceInfoRefreshEndedPlayback();
+ return;
}
- return;
- }
-
- if (oldTimeline.isEmpty()) {
- // If the old timeline is empty, the period queue is also empty.
- if (!timeline.isEmpty()) {
- Pair defaultPosition =
- getPeriodPosition(
- timeline, timeline.getFirstWindowIndex(shuffleModeEnabled), C.TIME_UNSET);
- Object periodUid = defaultPosition.first;
- long startPositionUs = defaultPosition.second;
- MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(periodUid, startPositionUs);
- playbackInfo =
- playbackInfo.resetToNewPosition(
- periodId,
- /* startPositionUs= */ periodId.isAd() ? 0 : startPositionUs,
- /* contentPositionUs= */ startPositionUs);
- }
- return;
- }
- MediaPeriodHolder periodHolder = queue.getFrontPeriod();
- long contentPositionUs = playbackInfo.contentPositionUs;
- Object playingPeriodUid =
- periodHolder == null ? playbackInfo.periodId.periodUid : periodHolder.uid;
- int periodIndex = timeline.getIndexOfPeriod(playingPeriodUid);
- if (periodIndex == C.INDEX_UNSET) {
- // We didn't find the current period in the new timeline. Attempt to resolve a subsequent
- // period whose window we can restart from.
- Object newPeriodUid = resolveSubsequentPeriod(playingPeriodUid, oldTimeline, timeline);
+ newContentPositionUs = periodPosition.second;
+ newPeriodId = queue.resolveMediaPeriodIdForAds(periodPosition.first, newContentPositionUs);
+ } else if (oldContentPositionUs == C.TIME_UNSET && !timeline.isEmpty()) {
+ // Resolve unset start position to default position.
+ Pair defaultPosition =
+ getPeriodPosition(
+ timeline, timeline.getFirstWindowIndex(shuffleModeEnabled), C.TIME_UNSET);
+ newContentPositionUs = defaultPosition.second;
+ newPeriodId = queue.resolveMediaPeriodIdForAds(defaultPosition.first, newContentPositionUs);
+ } 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.
+ Object newPeriodUid = resolveSubsequentPeriod(newPeriodId.periodUid, oldTimeline, timeline);
if (newPeriodUid == null) {
// We failed to resolve a suitable restart position.
handleSourceInfoRefreshEndedPlayback();
return;
}
- // We resolved a subsequent period. Seek to the default position in the corresponding window.
+ // We resolved a subsequent period. Start at the default position in the corresponding window.
Pair defaultPosition =
getPeriodPosition(
timeline, timeline.getPeriodByUid(newPeriodUid, period).windowIndex, C.TIME_UNSET);
- newPeriodUid = defaultPosition.first;
- contentPositionUs = defaultPosition.second;
- MediaPeriodId periodId = queue.resolveMediaPeriodIdForAds(newPeriodUid, contentPositionUs);
+ newContentPositionUs = defaultPosition.second;
+ newPeriodId = queue.resolveMediaPeriodIdForAds(defaultPosition.first, newContentPositionUs);
+ } else if (newPeriodId.isAd()) {
+ // Recheck if the current ad still needs to be played.
+ newPeriodId = queue.resolveMediaPeriodIdForAds(newPeriodId.periodUid, newContentPositionUs);
+ }
+
+ if (playbackInfo.periodId.equals(newPeriodId) && oldContentPositionUs == newContentPositionUs) {
+ // We can keep the current playing period. Update the rest of the queued periods.
+ if (!queue.updateQueuedPeriods(rendererPositionUs, getMaxRendererReadPositionUs())) {
+ seekToCurrentPosition(/* sendDiscontinuity= */ false);
+ }
+ } else {
+ // Something changed. Seek to new start position.
+ MediaPeriodHolder periodHolder = queue.getFrontPeriod();
if (periodHolder != null) {
// Update the new playing media period info if it already exists.
- while (periodHolder.next != null) {
- periodHolder = periodHolder.next;
- if (periodHolder.info.id.equals(periodId)) {
+ while (periodHolder.getNext() != null) {
+ periodHolder = periodHolder.getNext();
+ if (periodHolder.info.id.equals(newPeriodId)) {
periodHolder.info = queue.getUpdatedMediaPeriodInfo(periodHolder.info);
}
}
}
// Actually do the seek.
- long seekPositionUs = seekToPeriodPosition(periodId, periodId.isAd() ? 0 : contentPositionUs);
+ long newPositionUs = newPeriodId.isAd() ? 0 : newContentPositionUs;
+ long seekedToPositionUs = seekToPeriodPosition(newPeriodId, newPositionUs);
playbackInfo =
playbackInfo.copyWithNewPosition(
- periodId, seekPositionUs, contentPositionUs, getTotalBufferedDurationUs());
- return;
- }
-
- MediaPeriodId playingPeriodId = playbackInfo.periodId;
- if (playingPeriodId.isAd()) {
- MediaPeriodId periodId =
- queue.resolveMediaPeriodIdForAds(playingPeriodUid, contentPositionUs);
- if (!periodId.equals(playingPeriodId)) {
- // The previously playing ad should no longer be played, so skip it.
- long seekPositionUs =
- seekToPeriodPosition(periodId, periodId.isAd() ? 0 : contentPositionUs);
- playbackInfo =
- playbackInfo.copyWithNewPosition(
- periodId, seekPositionUs, contentPositionUs, getTotalBufferedDurationUs());
- return;
- }
- }
-
- if (!queue.updateQueuedPeriods(playingPeriodId, rendererPositionUs)) {
- seekToCurrentPosition(/* sendDiscontinuity= */ false);
+ newPeriodId, seekedToPositionUs, newContentPositionUs, getTotalBufferedDurationUs());
}
handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
}
+ private long getMaxRendererReadPositionUs() {
+ MediaPeriodHolder readingHolder = queue.getReadingPeriod();
+ if (readingHolder == null) {
+ return 0;
+ }
+ long maxReadPositionUs = readingHolder.getRendererOffset();
+ for (int i = 0; i < renderers.length; i++) {
+ if (renderers[i].getState() == Renderer.STATE_DISABLED
+ || renderers[i].getStream() != readingHolder.sampleStreams[i]) {
+ // Ignore disabled renderers and renderers with sample streams from previous periods.
+ continue;
+ }
+ long readingPositionUs = renderers[i].getReadingPositionUs();
+ if (readingPositionUs == C.TIME_END_OF_SOURCE) {
+ return C.TIME_END_OF_SOURCE;
+ } else {
+ maxReadPositionUs = Math.max(readingPositionUs, maxReadPositionUs);
+ }
+ }
+ return maxReadPositionUs;
+ }
+
private void handleSourceInfoRefreshEndedPlayback() {
setState(Player.STATE_ENDED);
// Reset, but retain the source so that it can still be used should a seek occur.
resetInternal(
- /* releaseMediaSource= */ false, /* resetPosition= */ true, /* resetState= */ false);
+ /* resetRenderers= */ false,
+ /* releaseMediaSource= */ false,
+ /* resetPosition= */ true,
+ /* resetState= */ false);
}
/**
@@ -1342,8 +1433,7 @@ import java.util.Collections;
seekPosition.windowPositionUs);
} catch (IndexOutOfBoundsException e) {
// The window index of the seek position was outside the bounds of the timeline.
- throw new IllegalSeekPositionException(timeline, seekPosition.windowIndex,
- seekPosition.windowPositionUs);
+ return null;
}
if (timeline == seekTimeline) {
// Our internal timeline is the seek timeline, so the mapped position is correct.
@@ -1408,7 +1498,7 @@ import java.util.Collections;
boolean advancedPlayingPeriod = false;
while (playWhenReady
&& playingPeriodHolder != readingPeriodHolder
- && rendererPositionUs >= playingPeriodHolder.next.getStartPositionRendererTime()) {
+ && 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) {
@@ -1448,7 +1538,7 @@ import java.util.Collections;
}
// Advance the reading period if necessary.
- if (readingPeriodHolder.next == null) {
+ if (readingPeriodHolder.getNext() == null) {
// We don't have a successor to advance the reading period to.
return;
}
@@ -1463,15 +1553,15 @@ import java.util.Collections;
}
}
- if (!readingPeriodHolder.next.prepared) {
+ if (!readingPeriodHolder.getNext().prepared) {
// The successor is not prepared yet.
maybeThrowPeriodPrepareError();
return;
}
- TrackSelectorResult oldTrackSelectorResult = readingPeriodHolder.trackSelectorResult;
+ TrackSelectorResult oldTrackSelectorResult = readingPeriodHolder.getTrackSelectorResult();
readingPeriodHolder = queue.advanceReadingPeriod();
- TrackSelectorResult newTrackSelectorResult = readingPeriodHolder.trackSelectorResult;
+ TrackSelectorResult newTrackSelectorResult = readingPeriodHolder.getTrackSelectorResult();
boolean initialDiscontinuity =
readingPeriodHolder.mediaPeriod.readDiscontinuity() != C.TIME_UNSET;
@@ -1539,9 +1629,10 @@ import java.util.Collections;
return;
}
MediaPeriodHolder loadingPeriodHolder = queue.getLoadingPeriod();
- loadingPeriodHolder.handlePrepared(mediaClock.getPlaybackParameters().speed);
+ loadingPeriodHolder.handlePrepared(
+ mediaClock.getPlaybackParameters().speed, playbackInfo.timeline);
updateLoadControlTrackSelection(
- loadingPeriodHolder.trackGroups, loadingPeriodHolder.trackSelectorResult);
+ loadingPeriodHolder.getTrackGroups(), loadingPeriodHolder.getTrackSelectorResult());
if (!queue.hasPlayingPeriod()) {
// This is the first prepared period, so start playing it.
MediaPeriodHolder playingPeriodHolder = queue.advancePlayingPeriod();
@@ -1601,11 +1692,11 @@ import java.util.Collections;
for (int i = 0; i < renderers.length; i++) {
Renderer renderer = renderers[i];
rendererWasEnabledFlags[i] = renderer.getState() != Renderer.STATE_DISABLED;
- if (newPlayingPeriodHolder.trackSelectorResult.isRendererEnabled(i)) {
+ if (newPlayingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)) {
enabledRendererCount++;
}
if (rendererWasEnabledFlags[i]
- && (!newPlayingPeriodHolder.trackSelectorResult.isRendererEnabled(i)
+ && (!newPlayingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)
|| (renderer.isCurrentStreamFinal()
&& renderer.getStream() == oldPlayingPeriodHolder.sampleStreams[i]))) {
// The renderer should be disabled before playing the next period, either because it's not
@@ -1616,7 +1707,8 @@ import java.util.Collections;
}
playbackInfo =
playbackInfo.copyWithTrackInfo(
- newPlayingPeriodHolder.trackGroups, newPlayingPeriodHolder.trackSelectorResult);
+ newPlayingPeriodHolder.getTrackGroups(),
+ newPlayingPeriodHolder.getTrackSelectorResult());
enableRenderers(rendererWasEnabledFlags, enabledRendererCount);
}
@@ -1624,9 +1716,17 @@ import java.util.Collections;
throws ExoPlaybackException {
enabledRenderers = new Renderer[totalEnabledRendererCount];
int enabledRendererCount = 0;
- MediaPeriodHolder playingPeriodHolder = queue.getPlayingPeriod();
+ TrackSelectorResult trackSelectorResult = queue.getPlayingPeriod().getTrackSelectorResult();
+ // Reset all disabled renderers before enabling any new ones. This makes sure resources released
+ // by the disabled renderers will be available to renderers that are being enabled.
for (int i = 0; i < renderers.length; i++) {
- if (playingPeriodHolder.trackSelectorResult.isRendererEnabled(i)) {
+ if (!trackSelectorResult.isRendererEnabled(i)) {
+ renderers[i].reset();
+ }
+ }
+ // Enable the renderers.
+ for (int i = 0; i < renderers.length; i++) {
+ if (trackSelectorResult.isRendererEnabled(i)) {
enableRenderer(i, rendererWasEnabledFlags[i], enabledRendererCount++);
}
}
@@ -1639,10 +1739,10 @@ import java.util.Collections;
Renderer renderer = renderers[rendererIndex];
enabledRenderers[enabledRendererIndex] = renderer;
if (renderer.getState() == Renderer.STATE_DISABLED) {
+ TrackSelectorResult trackSelectorResult = playingPeriodHolder.getTrackSelectorResult();
RendererConfiguration rendererConfiguration =
- playingPeriodHolder.trackSelectorResult.rendererConfigurations[rendererIndex];
- TrackSelection newSelection = playingPeriodHolder.trackSelectorResult.selections.get(
- rendererIndex);
+ trackSelectorResult.rendererConfigurations[rendererIndex];
+ TrackSelection newSelection = trackSelectorResult.selections.get(rendererIndex);
Format[] formats = getFormats(newSelection);
// The renderer needs enabling with its new track selection.
boolean playing = playWhenReady && playbackInfo.playbackState == Player.STATE_READY;
@@ -1662,8 +1762,8 @@ import java.util.Collections;
private boolean rendererWaitingForNextStream(Renderer renderer) {
MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
- return readingPeriodHolder.next != null && readingPeriodHolder.next.prepared
- && renderer.hasReadStreamToEnd();
+ MediaPeriodHolder nextPeriodHolder = readingPeriodHolder.getNext();
+ return nextPeriodHolder != null && nextPeriodHolder.prepared && renderer.hasReadStreamToEnd();
}
private void handleLoadingMediaPeriodChanged(boolean loadingTrackSelectionChanged) {
@@ -1684,7 +1784,8 @@ import java.util.Collections;
&& loadingMediaPeriodHolder != null
&& loadingMediaPeriodHolder.prepared) {
updateLoadControlTrackSelection(
- loadingMediaPeriodHolder.trackGroups, loadingMediaPeriodHolder.trackSelectorResult);
+ loadingMediaPeriodHolder.getTrackGroups(),
+ loadingMediaPeriodHolder.getTrackSelectorResult());
}
}
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 b389ec742f..72760db31b 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.9.6";
+ public static final String VERSION = "2.10.0";
/** 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.9.6";
+ public static final String VERSION_SLASHY = "ExoPlayerLib/2.10.0";
/**
* 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 = 2009006;
+ public static final int VERSION_INT = 2010000;
/**
* 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 d40ae6eccd..dcb7a83dca 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
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.util.MimeTypes;
@@ -48,7 +48,10 @@ public final class Format implements Parcelable {
public final @Nullable String id;
/** The human readable label, or null if unknown or not applicable. */
public final @Nullable String label;
-
+ /** Track selection flags. */
+ @C.SelectionFlags public final int selectionFlags;
+ /** Track role flags. */
+ @C.RoleFlags public final int roleFlags;
/**
* The average bandwidth in bits per second, or {@link #NO_VALUE} if unknown or not applicable.
*/
@@ -153,15 +156,8 @@ public final class Format implements Parcelable {
// Audio and text specific.
- /**
- * Track selection flags.
- */
- @C.SelectionFlags
- public final int selectionFlags;
-
- /** The language, or null if unknown or not applicable. */
+ /** The language as an IETF BCP 47 conformant tag, or null if unknown or not applicable. */
public final @Nullable String language;
-
/**
* The Accessibility channel, or {@link #NO_VALUE} if not known or applicable.
*/
@@ -195,7 +191,8 @@ public final class Format implements Parcelable {
height,
frameRate,
initializationData,
- selectionFlags);
+ selectionFlags,
+ /* roleFlags= */ 0);
}
public static Format createVideoContainerFormat(
@@ -209,15 +206,22 @@ public final class Format implements Parcelable {
int height,
float frameRate,
@Nullable List initializationData,
- @C.SelectionFlags int selectionFlags) {
+ @C.SelectionFlags int selectionFlags,
+ @C.RoleFlags int roleFlags) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ /* metadata= */ null,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
/* maxInputSize= */ NO_VALUE,
+ initializationData,
+ /* drmInitData= */ null,
+ OFFSET_SAMPLE_RELATIVE,
width,
height,
frameRate,
@@ -231,13 +235,8 @@ public final class Format implements Parcelable {
/* pcmEncoding= */ NO_VALUE,
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
- selectionFlags,
/* language= */ null,
- /* accessibilityChannel= */ NO_VALUE,
- OFFSET_SAMPLE_RELATIVE,
- initializationData,
- /* drmInitData= */ null,
- /* metadata= */ null);
+ /* accessibilityChannel= */ NO_VALUE);
}
public static Format createVideoSampleFormat(
@@ -316,11 +315,17 @@ public final class Format implements Parcelable {
return new Format(
id,
/* label= */ null,
+ /* selectionFlags= */ 0,
+ /* roleFlags= */ 0,
+ bitrate,
+ codecs,
+ /* metadata= */ null,
/* containerMimeType= */ null,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ OFFSET_SAMPLE_RELATIVE,
width,
height,
frameRate,
@@ -334,13 +339,8 @@ public final class Format implements Parcelable {
/* pcmEncoding= */ NO_VALUE,
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
- /* selectionFlags= */ 0,
/* language= */ null,
- /* accessibilityChannel= */ NO_VALUE,
- OFFSET_SAMPLE_RELATIVE,
- initializationData,
- drmInitData,
- /* metadata= */ null);
+ /* accessibilityChannel= */ NO_VALUE);
}
// Audio.
@@ -368,6 +368,7 @@ public final class Format implements Parcelable {
sampleRate,
initializationData,
selectionFlags,
+ /* roleFlags= */ 0,
language);
}
@@ -382,15 +383,22 @@ public final class Format implements Parcelable {
int sampleRate,
@Nullable List initializationData,
@C.SelectionFlags int selectionFlags,
+ @C.RoleFlags int roleFlags,
@Nullable String language) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ /* metadata= */ null,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
/* maxInputSize= */ NO_VALUE,
+ initializationData,
+ /* drmInitData= */ null,
+ OFFSET_SAMPLE_RELATIVE,
/* width= */ NO_VALUE,
/* height= */ NO_VALUE,
/* frameRate= */ NO_VALUE,
@@ -404,13 +412,8 @@ public final class Format implements Parcelable {
/* pcmEncoding= */ NO_VALUE,
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
- selectionFlags,
language,
- /* accessibilityChannel= */ NO_VALUE,
- OFFSET_SAMPLE_RELATIVE,
- initializationData,
- /* drmInitData= */ null,
- /* metadata= */ null);
+ /* accessibilityChannel= */ NO_VALUE);
}
public static Format createAudioSampleFormat(
@@ -490,11 +493,17 @@ public final class Format implements Parcelable {
return new Format(
id,
/* label= */ null,
+ selectionFlags,
+ /* roleFlags= */ 0,
+ bitrate,
+ codecs,
+ metadata,
/* containerMimeType= */ null,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ OFFSET_SAMPLE_RELATIVE,
/* width= */ NO_VALUE,
/* height= */ NO_VALUE,
/* frameRate= */ NO_VALUE,
@@ -508,37 +517,12 @@ public final class Format implements Parcelable {
pcmEncoding,
encoderDelay,
encoderPadding,
- selectionFlags,
language,
- /* accessibilityChannel= */ NO_VALUE,
- OFFSET_SAMPLE_RELATIVE,
- initializationData,
- drmInitData,
- metadata);
+ /* accessibilityChannel= */ NO_VALUE);
}
// Text.
- @Deprecated
- public static Format createTextContainerFormat(
- @Nullable String id,
- @Nullable String containerMimeType,
- @Nullable String sampleMimeType,
- @Nullable String codecs,
- int bitrate,
- @C.SelectionFlags int selectionFlags,
- @Nullable String language) {
- return createTextContainerFormat(
- id,
- /* label= */ null,
- containerMimeType,
- sampleMimeType,
- codecs,
- bitrate,
- selectionFlags,
- language);
- }
-
public static Format createTextContainerFormat(
@Nullable String id,
@Nullable String label,
@@ -547,6 +531,7 @@ public final class Format implements Parcelable {
@Nullable String codecs,
int bitrate,
@C.SelectionFlags int selectionFlags,
+ @C.RoleFlags int roleFlags,
@Nullable String language) {
return createTextContainerFormat(
id,
@@ -556,6 +541,7 @@ public final class Format implements Parcelable {
codecs,
bitrate,
selectionFlags,
+ roleFlags,
language,
/* accessibilityChannel= */ NO_VALUE);
}
@@ -568,16 +554,23 @@ public final class Format implements Parcelable {
@Nullable String codecs,
int bitrate,
@C.SelectionFlags int selectionFlags,
+ @C.RoleFlags int roleFlags,
@Nullable String language,
int accessibilityChannel) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ /* metadata= */ null,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
/* maxInputSize= */ NO_VALUE,
+ /* initializationData= */ null,
+ /* drmInitData= */ null,
+ OFFSET_SAMPLE_RELATIVE,
/* width= */ NO_VALUE,
/* height= */ NO_VALUE,
/* frameRate= */ NO_VALUE,
@@ -591,13 +584,8 @@ public final class Format implements Parcelable {
/* pcmEncoding= */ NO_VALUE,
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
- selectionFlags,
language,
- accessibilityChannel,
- OFFSET_SAMPLE_RELATIVE,
- /* initializationData= */ null,
- /* drmInitData= */ null,
- /* metadata= */ null);
+ accessibilityChannel);
}
public static Format createTextSampleFormat(
@@ -685,11 +673,17 @@ public final class Format implements Parcelable {
return new Format(
id,
/* label= */ null,
+ selectionFlags,
+ /* roleFlags= */ 0,
+ bitrate,
+ codecs,
+ /* metadata= */ null,
/* containerMimeType= */ null,
sampleMimeType,
- codecs,
- bitrate,
/* maxInputSize= */ NO_VALUE,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
/* width= */ NO_VALUE,
/* height= */ NO_VALUE,
/* frameRate= */ NO_VALUE,
@@ -703,13 +697,8 @@ public final class Format implements Parcelable {
/* pcmEncoding= */ NO_VALUE,
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
- selectionFlags,
language,
- accessibilityChannel,
- subsampleOffsetUs,
- initializationData,
- drmInitData,
- /* metadata= */ null);
+ accessibilityChannel);
}
// Image.
@@ -726,11 +715,17 @@ public final class Format implements Parcelable {
return new Format(
id,
/* label= */ null,
+ selectionFlags,
+ /* roleFlags= */ 0,
+ bitrate,
+ codecs,
+ /* metadata=*/ null,
/* containerMimeType= */ null,
sampleMimeType,
- codecs,
- bitrate,
/* maxInputSize= */ NO_VALUE,
+ initializationData,
+ drmInitData,
+ OFFSET_SAMPLE_RELATIVE,
/* width= */ NO_VALUE,
/* height= */ NO_VALUE,
/* frameRate= */ NO_VALUE,
@@ -744,13 +739,8 @@ public final class Format implements Parcelable {
/* pcmEncoding= */ NO_VALUE,
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
- selectionFlags,
language,
- /* accessibilityChannel= */ NO_VALUE,
- OFFSET_SAMPLE_RELATIVE,
- initializationData,
- drmInitData,
- /* metadata=*/ null);
+ /* accessibilityChannel= */ NO_VALUE);
}
// Generic.
@@ -772,6 +762,7 @@ public final class Format implements Parcelable {
codecs,
bitrate,
selectionFlags,
+ /* roleFlags= */ 0,
language);
}
@@ -783,15 +774,22 @@ public final class Format implements Parcelable {
@Nullable String codecs,
int bitrate,
@C.SelectionFlags int selectionFlags,
+ @C.RoleFlags int roleFlags,
@Nullable String language) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ /* metadata= */ null,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
/* maxInputSize= */ NO_VALUE,
+ /* initializationData= */ null,
+ /* drmInitData= */ null,
+ OFFSET_SAMPLE_RELATIVE,
/* width= */ NO_VALUE,
/* height= */ NO_VALUE,
/* frameRate= */ NO_VALUE,
@@ -805,13 +803,8 @@ public final class Format implements Parcelable {
/* pcmEncoding= */ NO_VALUE,
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
- selectionFlags,
language,
- /* accessibilityChannel= */ NO_VALUE,
- OFFSET_SAMPLE_RELATIVE,
- /* initializationData= */ null,
- /* drmInitData= */ null,
- /* metadata= */ null);
+ /* accessibilityChannel= */ NO_VALUE);
}
public static Format createSampleFormat(
@@ -819,11 +812,17 @@ public final class Format implements Parcelable {
return new Format(
id,
/* label= */ null,
+ /* selectionFlags= */ 0,
+ /* roleFlags= */ 0,
+ /* bitrate= */ NO_VALUE,
+ /* codecs= */ null,
+ /* metadata= */ null,
/* containerMimeType= */ null,
sampleMimeType,
- /* codecs= */ null,
- /* bitrate= */ NO_VALUE,
/* maxInputSize= */ NO_VALUE,
+ /* initializationData= */ null,
+ /* drmInitData= */ null,
+ subsampleOffsetUs,
/* width= */ NO_VALUE,
/* height= */ NO_VALUE,
/* frameRate= */ NO_VALUE,
@@ -837,13 +836,8 @@ public final class Format implements Parcelable {
/* pcmEncoding= */ NO_VALUE,
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
- /* selectionFlags= */ 0,
/* language= */ null,
- /* accessibilityChannel= */ NO_VALUE,
- subsampleOffsetUs,
- /* initializationData= */ null,
- /* drmInitData= */ null,
- /* metadata= */ null);
+ /* accessibilityChannel= */ NO_VALUE);
}
public static Format createSampleFormat(
@@ -855,11 +849,17 @@ public final class Format implements Parcelable {
return new Format(
id,
/* label= */ null,
+ /* selectionFlags= */ 0,
+ /* roleFlags= */ 0,
+ bitrate,
+ codecs,
+ /* metadata= */ null,
/* containerMimeType= */ null,
sampleMimeType,
- codecs,
- bitrate,
/* maxInputSize= */ NO_VALUE,
+ /* initializationData= */ null,
+ drmInitData,
+ OFFSET_SAMPLE_RELATIVE,
/* width= */ NO_VALUE,
/* height= */ NO_VALUE,
/* frameRate= */ NO_VALUE,
@@ -873,23 +873,27 @@ public final class Format implements Parcelable {
/* pcmEncoding= */ NO_VALUE,
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
- /* selectionFlags= */ 0,
/* language= */ null,
- /* accessibilityChannel= */ NO_VALUE,
- OFFSET_SAMPLE_RELATIVE,
- /* initializationData= */ null,
- drmInitData,
- /* metadata= */ null);
+ /* accessibilityChannel= */ NO_VALUE);
}
/* package */ Format(
@Nullable String id,
@Nullable String label,
- @Nullable String containerMimeType,
- @Nullable String sampleMimeType,
- @Nullable String codecs,
+ @C.SelectionFlags int selectionFlags,
+ @C.RoleFlags int roleFlags,
int bitrate,
+ @Nullable String codecs,
+ @Nullable Metadata metadata,
+ // Container specific.
+ @Nullable String containerMimeType,
+ // Elementary stream specific.
+ @Nullable String sampleMimeType,
int maxInputSize,
+ @Nullable List initializationData,
+ @Nullable DrmInitData drmInitData,
+ long subsampleOffsetUs,
+ // Video specific.
int width,
int height,
float frameRate,
@@ -898,25 +902,32 @@ public final class Format implements Parcelable {
@Nullable byte[] projectionData,
@C.StereoMode int stereoMode,
@Nullable ColorInfo colorInfo,
+ // Audio specific.
int channelCount,
int sampleRate,
@C.PcmEncoding int pcmEncoding,
int encoderDelay,
int encoderPadding,
- @C.SelectionFlags int selectionFlags,
+ // Audio and text specific.
@Nullable String language,
- int accessibilityChannel,
- long subsampleOffsetUs,
- @Nullable List initializationData,
- @Nullable DrmInitData drmInitData,
- @Nullable Metadata metadata) {
+ int accessibilityChannel) {
this.id = id;
this.label = label;
- this.containerMimeType = containerMimeType;
- this.sampleMimeType = sampleMimeType;
- this.codecs = codecs;
+ this.selectionFlags = selectionFlags;
+ this.roleFlags = roleFlags;
this.bitrate = bitrate;
+ this.codecs = codecs;
+ this.metadata = metadata;
+ // Container specific.
+ this.containerMimeType = containerMimeType;
+ // Elementary stream specific.
+ this.sampleMimeType = sampleMimeType;
this.maxInputSize = maxInputSize;
+ this.initializationData =
+ initializationData == null ? Collections.emptyList() : initializationData;
+ this.drmInitData = drmInitData;
+ this.subsampleOffsetUs = subsampleOffsetUs;
+ // Video specific.
this.width = width;
this.height = height;
this.frameRate = frameRate;
@@ -926,30 +937,39 @@ public final class Format implements Parcelable {
this.projectionData = projectionData;
this.stereoMode = stereoMode;
this.colorInfo = colorInfo;
+ // Audio specific.
this.channelCount = channelCount;
this.sampleRate = sampleRate;
this.pcmEncoding = pcmEncoding;
this.encoderDelay = encoderDelay == Format.NO_VALUE ? 0 : encoderDelay;
this.encoderPadding = encoderPadding == Format.NO_VALUE ? 0 : encoderPadding;
- this.selectionFlags = selectionFlags;
- this.language = language;
+ // Audio and text specific.
+ this.language = Util.normalizeLanguageCode(language);
this.accessibilityChannel = accessibilityChannel;
- this.subsampleOffsetUs = subsampleOffsetUs;
- this.initializationData =
- initializationData == null ? Collections.emptyList() : initializationData;
- this.drmInitData = drmInitData;
- this.metadata = metadata;
}
@SuppressWarnings("ResourceType")
/* package */ Format(Parcel in) {
id = in.readString();
label = in.readString();
- containerMimeType = in.readString();
- sampleMimeType = in.readString();
- codecs = in.readString();
+ selectionFlags = in.readInt();
+ roleFlags = in.readInt();
bitrate = in.readInt();
+ codecs = in.readString();
+ metadata = in.readParcelable(Metadata.class.getClassLoader());
+ // Container specific.
+ containerMimeType = in.readString();
+ // Elementary stream specific.
+ sampleMimeType = in.readString();
maxInputSize = in.readInt();
+ int initializationDataSize = in.readInt();
+ initializationData = new ArrayList<>(initializationDataSize);
+ for (int i = 0; i < initializationDataSize; i++) {
+ initializationData.add(in.createByteArray());
+ }
+ drmInitData = in.readParcelable(DrmInitData.class.getClassLoader());
+ subsampleOffsetUs = in.readLong();
+ // Video specific.
width = in.readInt();
height = in.readInt();
frameRate = in.readFloat();
@@ -959,33 +979,32 @@ public final class Format implements Parcelable {
projectionData = hasProjectionData ? in.createByteArray() : null;
stereoMode = in.readInt();
colorInfo = in.readParcelable(ColorInfo.class.getClassLoader());
+ // Audio specific.
channelCount = in.readInt();
sampleRate = in.readInt();
pcmEncoding = in.readInt();
encoderDelay = in.readInt();
encoderPadding = in.readInt();
- selectionFlags = in.readInt();
+ // Audio and text specific.
language = in.readString();
accessibilityChannel = in.readInt();
- subsampleOffsetUs = in.readLong();
- int initializationDataSize = in.readInt();
- initializationData = new ArrayList<>(initializationDataSize);
- for (int i = 0; i < initializationDataSize; i++) {
- initializationData.add(in.createByteArray());
- }
- drmInitData = in.readParcelable(DrmInitData.class.getClassLoader());
- metadata = in.readParcelable(Metadata.class.getClassLoader());
}
public Format copyWithMaxInputSize(int maxInputSize) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
width,
height,
frameRate,
@@ -999,24 +1018,25 @@ public final class Format implements Parcelable {
pcmEncoding,
encoderDelay,
encoderPadding,
- selectionFlags,
language,
- accessibilityChannel,
- subsampleOffsetUs,
- initializationData,
- drmInitData,
- metadata);
+ accessibilityChannel);
}
public Format copyWithSubsampleOffsetUs(long subsampleOffsetUs) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
width,
height,
frameRate,
@@ -1030,13 +1050,8 @@ public final class Format implements Parcelable {
pcmEncoding,
encoderDelay,
encoderPadding,
- selectionFlags,
language,
- accessibilityChannel,
- subsampleOffsetUs,
- initializationData,
- drmInitData,
- metadata);
+ accessibilityChannel);
}
public Format copyWithContainerInfo(
@@ -1044,19 +1059,32 @@ public final class Format implements Parcelable {
@Nullable String label,
@Nullable String sampleMimeType,
@Nullable String codecs,
+ @Nullable Metadata metadata,
int bitrate,
int width,
int height,
+ int channelCount,
@C.SelectionFlags int selectionFlags,
@Nullable String language) {
+
+ if (this.metadata != null) {
+ metadata = this.metadata.copyWithAppendedEntriesFrom(metadata);
+ }
+
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
width,
height,
frameRate,
@@ -1070,13 +1098,8 @@ public final class Format implements Parcelable {
pcmEncoding,
encoderDelay,
encoderPadding,
- selectionFlags,
language,
- accessibilityChannel,
- subsampleOffsetUs,
- initializationData,
- drmInitData,
- metadata);
+ accessibilityChannel);
}
@SuppressWarnings("ReferenceEquality")
@@ -1110,6 +1133,12 @@ public final class Format implements Parcelable {
codecs = codecsOfType;
}
}
+
+ Metadata metadata =
+ this.metadata == null
+ ? manifestFormat.metadata
+ : this.metadata.copyWithAppendedEntriesFrom(manifestFormat.metadata);
+
float frameRate = this.frameRate;
if (frameRate == NO_VALUE && trackType == C.TRACK_TYPE_VIDEO) {
frameRate = manifestFormat.frameRate;
@@ -1117,17 +1146,24 @@ public final class Format implements Parcelable {
// Merge manifest and sample format values.
@C.SelectionFlags int selectionFlags = this.selectionFlags | manifestFormat.selectionFlags;
+ @C.RoleFlags int roleFlags = this.roleFlags | manifestFormat.roleFlags;
DrmInitData drmInitData =
DrmInitData.createSessionCreationData(manifestFormat.drmInitData, this.drmInitData);
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
width,
height,
frameRate,
@@ -1141,24 +1177,25 @@ public final class Format implements Parcelable {
pcmEncoding,
encoderDelay,
encoderPadding,
- selectionFlags,
language,
- accessibilityChannel,
- subsampleOffsetUs,
- initializationData,
- drmInitData,
- metadata);
+ accessibilityChannel);
}
public Format copyWithGaplessInfo(int encoderDelay, int encoderPadding) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
width,
height,
frameRate,
@@ -1172,24 +1209,25 @@ public final class Format implements Parcelable {
pcmEncoding,
encoderDelay,
encoderPadding,
- selectionFlags,
language,
- accessibilityChannel,
- subsampleOffsetUs,
- initializationData,
- drmInitData,
- metadata);
+ accessibilityChannel);
}
public Format copyWithFrameRate(float frameRate) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
width,
height,
frameRate,
@@ -1203,24 +1241,25 @@ public final class Format implements Parcelable {
pcmEncoding,
encoderDelay,
encoderPadding,
- selectionFlags,
language,
- accessibilityChannel,
- subsampleOffsetUs,
- initializationData,
- drmInitData,
- metadata);
+ accessibilityChannel);
}
public Format copyWithDrmInitData(@Nullable DrmInitData drmInitData) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
width,
height,
frameRate,
@@ -1234,24 +1273,25 @@ public final class Format implements Parcelable {
pcmEncoding,
encoderDelay,
encoderPadding,
- selectionFlags,
language,
- accessibilityChannel,
- subsampleOffsetUs,
- initializationData,
- drmInitData,
- metadata);
+ accessibilityChannel);
}
public Format copyWithMetadata(@Nullable Metadata metadata) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
width,
height,
frameRate,
@@ -1265,24 +1305,25 @@ public final class Format implements Parcelable {
pcmEncoding,
encoderDelay,
encoderPadding,
- selectionFlags,
language,
- accessibilityChannel,
- subsampleOffsetUs,
- initializationData,
- drmInitData,
- metadata);
+ accessibilityChannel);
}
public Format copyWithRotationDegrees(int rotationDegrees) {
return new Format(
id,
label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
containerMimeType,
sampleMimeType,
- codecs,
- bitrate,
maxInputSize,
+ initializationData,
+ drmInitData,
+ subsampleOffsetUs,
width,
height,
frameRate,
@@ -1296,13 +1337,40 @@ public final class Format implements Parcelable {
pcmEncoding,
encoderDelay,
encoderPadding,
- selectionFlags,
language,
- accessibilityChannel,
- subsampleOffsetUs,
+ accessibilityChannel);
+ }
+
+ public Format copyWithBitrate(int bitrate) {
+ return new Format(
+ id,
+ label,
+ selectionFlags,
+ roleFlags,
+ bitrate,
+ codecs,
+ metadata,
+ containerMimeType,
+ sampleMimeType,
+ maxInputSize,
initializationData,
drmInitData,
- metadata);
+ subsampleOffsetUs,
+ width,
+ height,
+ frameRate,
+ rotationDegrees,
+ pixelWidthHeightRatio,
+ projectionData,
+ stereoMode,
+ colorInfo,
+ channelCount,
+ sampleRate,
+ pcmEncoding,
+ encoderDelay,
+ encoderPadding,
+ language,
+ accessibilityChannel);
}
/**
@@ -1346,32 +1414,41 @@ public final class Format implements Parcelable {
@Override
public int hashCode() {
if (hashCode == 0) {
+ // Some fields for which hashing is expensive are deliberately omitted.
int result = 17;
result = 31 * result + (id == null ? 0 : id.hashCode());
- result = 31 * result + (containerMimeType == null ? 0 : containerMimeType.hashCode());
- result = 31 * result + (sampleMimeType == null ? 0 : sampleMimeType.hashCode());
- result = 31 * result + (codecs == null ? 0 : codecs.hashCode());
+ result = 31 * result + (label != null ? label.hashCode() : 0);
+ result = 31 * result + selectionFlags;
+ result = 31 * result + roleFlags;
result = 31 * result + bitrate;
+ result = 31 * result + (codecs == null ? 0 : codecs.hashCode());
+ result = 31 * result + (metadata == null ? 0 : metadata.hashCode());
+ // Container specific.
+ result = 31 * result + (containerMimeType == null ? 0 : containerMimeType.hashCode());
+ // Elementary stream specific.
+ result = 31 * result + (sampleMimeType == null ? 0 : sampleMimeType.hashCode());
+ result = 31 * result + maxInputSize;
+ // [Omitted] initializationData.
+ // [Omitted] drmInitData.
+ result = 31 * result + (int) subsampleOffsetUs;
+ // Video specific.
result = 31 * result + width;
result = 31 * result + height;
+ result = 31 * result + Float.floatToIntBits(frameRate);
+ result = 31 * result + rotationDegrees;
+ result = 31 * result + Float.floatToIntBits(pixelWidthHeightRatio);
+ // [Omitted] projectionData.
+ result = 31 * result + stereoMode;
+ // [Omitted] colorInfo.
+ // Audio specific.
result = 31 * result + channelCount;
result = 31 * result + sampleRate;
- result = 31 * result + (language == null ? 0 : language.hashCode());
- result = 31 * result + accessibilityChannel;
- result = 31 * result + (drmInitData == null ? 0 : drmInitData.hashCode());
- result = 31 * result + (metadata == null ? 0 : metadata.hashCode());
- result = 31 * result + (label != null ? label.hashCode() : 0);
- result = 31 * result + maxInputSize;
- result = 31 * result + (int) subsampleOffsetUs;
- result = 31 * result + Float.floatToIntBits(frameRate);
- result = 31 * result + Float.floatToIntBits(pixelWidthHeightRatio);
- result = 31 * result + rotationDegrees;
- result = 31 * result + stereoMode;
result = 31 * result + pcmEncoding;
result = 31 * result + encoderDelay;
result = 31 * result + encoderPadding;
- result = 31 * result + selectionFlags;
- // Not all of the fields are included to keep the calculation quick enough.
+ // Audio and text specific.
+ result = 31 * result + (language == null ? 0 : language.hashCode());
+ result = 31 * result + accessibilityChannel;
hashCode = result;
}
return hashCode;
@@ -1389,32 +1466,34 @@ public final class Format implements Parcelable {
if (hashCode != 0 && other.hashCode != 0 && hashCode != other.hashCode) {
return false;
}
- return bitrate == other.bitrate
+ // Field equality checks ordered by type, with the cheapest checks first.
+ return selectionFlags == other.selectionFlags
+ && roleFlags == other.roleFlags
+ && bitrate == other.bitrate
&& maxInputSize == other.maxInputSize
+ && subsampleOffsetUs == other.subsampleOffsetUs
&& width == other.width
&& height == other.height
- && Float.compare(frameRate, other.frameRate) == 0
&& rotationDegrees == other.rotationDegrees
- && Float.compare(pixelWidthHeightRatio, other.pixelWidthHeightRatio) == 0
&& stereoMode == other.stereoMode
&& channelCount == other.channelCount
&& sampleRate == other.sampleRate
&& pcmEncoding == other.pcmEncoding
&& encoderDelay == other.encoderDelay
&& encoderPadding == other.encoderPadding
- && subsampleOffsetUs == other.subsampleOffsetUs
- && selectionFlags == other.selectionFlags
+ && accessibilityChannel == other.accessibilityChannel
+ && Float.compare(frameRate, other.frameRate) == 0
+ && Float.compare(pixelWidthHeightRatio, other.pixelWidthHeightRatio) == 0
&& Util.areEqual(id, other.id)
&& Util.areEqual(label, other.label)
- && Util.areEqual(language, other.language)
- && accessibilityChannel == other.accessibilityChannel
+ && Util.areEqual(codecs, other.codecs)
&& Util.areEqual(containerMimeType, other.containerMimeType)
&& Util.areEqual(sampleMimeType, other.sampleMimeType)
- && Util.areEqual(codecs, other.codecs)
- && Util.areEqual(drmInitData, other.drmInitData)
+ && Util.areEqual(language, other.language)
+ && Arrays.equals(projectionData, other.projectionData)
&& Util.areEqual(metadata, other.metadata)
&& Util.areEqual(colorInfo, other.colorInfo)
- && Arrays.equals(projectionData, other.projectionData)
+ && Util.areEqual(drmInitData, other.drmInitData)
&& initializationDataEquals(other);
}
@@ -1485,11 +1564,24 @@ public final class Format implements Parcelable {
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(id);
dest.writeString(label);
- dest.writeString(containerMimeType);
- dest.writeString(sampleMimeType);
- dest.writeString(codecs);
+ dest.writeInt(selectionFlags);
+ dest.writeInt(roleFlags);
dest.writeInt(bitrate);
+ dest.writeString(codecs);
+ dest.writeParcelable(metadata, 0);
+ // Container specific.
+ dest.writeString(containerMimeType);
+ // Elementary stream specific.
+ dest.writeString(sampleMimeType);
dest.writeInt(maxInputSize);
+ int initializationDataSize = initializationData.size();
+ dest.writeInt(initializationDataSize);
+ for (int i = 0; i < initializationDataSize; i++) {
+ dest.writeByteArray(initializationData.get(i));
+ }
+ dest.writeParcelable(drmInitData, 0);
+ dest.writeLong(subsampleOffsetUs);
+ // Video specific.
dest.writeInt(width);
dest.writeInt(height);
dest.writeFloat(frameRate);
@@ -1501,22 +1593,15 @@ public final class Format implements Parcelable {
}
dest.writeInt(stereoMode);
dest.writeParcelable(colorInfo, flags);
+ // Audio specific.
dest.writeInt(channelCount);
dest.writeInt(sampleRate);
dest.writeInt(pcmEncoding);
dest.writeInt(encoderDelay);
dest.writeInt(encoderPadding);
- dest.writeInt(selectionFlags);
+ // Audio and text specific.
dest.writeString(language);
dest.writeInt(accessibilityChannel);
- dest.writeLong(subsampleOffsetUs);
- int initializationDataSize = initializationData.size();
- dest.writeInt(initializationDataSize);
- for (int i = 0; i < initializationDataSize; i++) {
- dest.writeByteArray(initializationData.get(i));
- }
- dest.writeParcelable(drmInitData, 0);
- dest.writeParcelable(metadata, 0);
}
public static final Creator CREATOR = new Creator() {
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 8c7ba1eb91..5da8d0f9f5 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
@@ -15,13 +15,25 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.drm.DecryptionResource;
/**
* Holds a {@link Format}.
*/
public final class FormatHolder {
+ /**
+ * Whether the object expected to populate {@link #format} is also expected to populate {@link
+ * #decryptionResource}.
+ */
+ // TODO: Remove once all Renderers and MediaSources have migrated to the new DRM model [Internal
+ // ref: b/129764794].
+ public boolean decryptionResourceIsProvided;
+
+ /** An accompanying context for decrypting samples in the format. */
+ @Nullable public DecryptionResource decryptionResource;
+
/** The held {@link Format}. */
- public @Nullable Format 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 8e51740c56..5950bc627f 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
@@ -15,10 +15,12 @@
*/
package com.google.android.exoplayer2;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.source.ClippingMediaPeriod;
import com.google.android.exoplayer2.source.EmptySampleStream;
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.SampleStream;
import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.trackselection.TrackSelection;
@@ -28,30 +30,38 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
import com.google.android.exoplayer2.upstream.Allocator;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Log;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
/** Holds a {@link MediaPeriod} with information required to play it as part of a timeline. */
/* package */ final class MediaPeriodHolder {
private static final String TAG = "MediaPeriodHolder";
+ /** The {@link MediaPeriod} wrapped by this class. */
public final MediaPeriod mediaPeriod;
+ /** The unique timeline period identifier the media period belongs to. */
public final Object uid;
- public final SampleStream[] sampleStreams;
- public final boolean[] mayRetainStreamFlags;
+ /**
+ * The sample streams for each renderer associated with this period. May contain null elements.
+ */
+ public final @NullableType SampleStream[] sampleStreams;
+ /** Whether the media period has finished preparing. */
public boolean prepared;
+ /** Whether any of the tracks of this media period are enabled. */
public boolean hasEnabledTracks;
+ /** {@link MediaPeriodInfo} about this media period. */
public MediaPeriodInfo info;
- public MediaPeriodHolder next;
- public TrackGroupArray trackGroups;
- public TrackSelectorResult trackSelectorResult;
+ private final boolean[] mayRetainStreamFlags;
private final RendererCapabilities[] rendererCapabilities;
private final TrackSelector trackSelector;
private final MediaSource mediaSource;
+ @Nullable private MediaPeriodHolder next;
+ @Nullable private TrackGroupArray trackGroups;
+ @Nullable private TrackSelectorResult trackSelectorResult;
private long rendererPositionOffsetUs;
- private TrackSelectorResult periodTrackSelectorResult;
/**
* Creates a new holder with information required to play it as part of a timeline.
@@ -75,47 +85,47 @@ import com.google.android.exoplayer2.util.Log;
this.rendererPositionOffsetUs = rendererPositionOffsetUs - info.startPositionUs;
this.trackSelector = trackSelector;
this.mediaSource = mediaSource;
- this.uid = Assertions.checkNotNull(info.id.periodUid);
+ this.uid = info.id.periodUid;
this.info = info;
sampleStreams = new SampleStream[rendererCapabilities.length];
mayRetainStreamFlags = new boolean[rendererCapabilities.length];
- MediaPeriod mediaPeriod = mediaSource.createPeriod(info.id, allocator, info.startPositionUs);
- if (info.id.endPositionUs != C.TIME_END_OF_SOURCE) {
- mediaPeriod =
- new ClippingMediaPeriod(
- mediaPeriod,
- /* enableInitialDiscontinuity= */ true,
- /* startUs= */ 0,
- info.id.endPositionUs);
- }
- this.mediaPeriod = mediaPeriod;
+ mediaPeriod =
+ createMediaPeriod(
+ info.id, mediaSource, allocator, info.startPositionUs, info.endPositionUs);
}
+ /**
+ * Converts time relative to the start of the period to the respective renderer time using {@link
+ * #getRendererOffset()}, in microseconds.
+ */
public long toRendererTime(long periodTimeUs) {
return periodTimeUs + getRendererOffset();
}
+ /**
+ * Converts renderer time to the respective time relative to the start of the period using {@link
+ * #getRendererOffset()}, in microseconds.
+ */
public long toPeriodTime(long rendererTimeUs) {
return rendererTimeUs - getRendererOffset();
}
+ /** Returns the renderer time of the start of the period, in microseconds. */
public long getRendererOffset() {
return rendererPositionOffsetUs;
}
+ /** Returns start position of period in renderer time. */
public long getStartPositionRendererTime() {
return info.startPositionUs + rendererPositionOffsetUs;
}
+ /** Returns whether the period is fully buffered. */
public boolean isFullyBuffered() {
return prepared
&& (!hasEnabledTracks || mediaPeriod.getBufferedPositionUs() == C.TIME_END_OF_SOURCE);
}
- public long getDurationUs() {
- return info.durationUs;
- }
-
/**
* Returns the buffered position in microseconds. If the period is buffered to the end, then the
* period duration is returned.
@@ -131,63 +141,132 @@ import com.google.android.exoplayer2.util.Log;
return bufferedPositionUs == C.TIME_END_OF_SOURCE ? info.durationUs : bufferedPositionUs;
}
+ /**
+ * Returns the next load time relative to the start of the period, or {@link C#TIME_END_OF_SOURCE}
+ * if loading has finished.
+ */
public long getNextLoadPositionUs() {
return !prepared ? 0 : mediaPeriod.getNextLoadPositionUs();
}
- public void handlePrepared(float playbackSpeed) throws ExoPlaybackException {
+ /**
+ * Handles period preparation.
+ *
+ * @param playbackSpeed The current playback speed.
+ * @param timeline The current {@link Timeline}.
+ * @throws ExoPlaybackException If an error occurs during track selection.
+ */
+ public void handlePrepared(float playbackSpeed, Timeline timeline) throws ExoPlaybackException {
prepared = true;
trackGroups = mediaPeriod.getTrackGroups();
- selectTracks(playbackSpeed);
- long newStartPositionUs = applyTrackSelection(info.startPositionUs, false);
+ TrackSelectorResult selectorResult =
+ Assertions.checkNotNull(selectTracks(playbackSpeed, timeline));
+ long newStartPositionUs =
+ applyTrackSelection(
+ selectorResult, info.startPositionUs, /* forceRecreateStreams= */ false);
rendererPositionOffsetUs += info.startPositionUs - newStartPositionUs;
info = info.copyWithStartPositionUs(newStartPositionUs);
}
+ /**
+ * Reevaluates the buffer of the media period at the given renderer position. Should only be
+ * called if this is the loading media period.
+ *
+ * @param rendererPositionUs The playing position in renderer time, in microseconds.
+ */
public void reevaluateBuffer(long rendererPositionUs) {
+ Assertions.checkState(isLoadingMediaPeriod());
if (prepared) {
mediaPeriod.reevaluateBuffer(toPeriodTime(rendererPositionUs));
}
}
+ /**
+ * Continues loading the media period at the given renderer position. Should only be called if
+ * this is the loading media period.
+ *
+ * @param rendererPositionUs The load position in renderer time, in microseconds.
+ */
public void continueLoading(long rendererPositionUs) {
+ Assertions.checkState(isLoadingMediaPeriod());
long loadingPeriodPositionUs = toPeriodTime(rendererPositionUs);
mediaPeriod.continueLoading(loadingPeriodPositionUs);
}
- public boolean selectTracks(float playbackSpeed) throws ExoPlaybackException {
+ /**
+ * Selects tracks for the period and returns the new result if the selection changed. Must only be
+ * called if {@link #prepared} is {@code true}.
+ *
+ * @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.
+ * @throws ExoPlaybackException If an error occurs during track selection.
+ */
+ @Nullable
+ public TrackSelectorResult selectTracks(float playbackSpeed, Timeline timeline)
+ throws ExoPlaybackException {
TrackSelectorResult selectorResult =
- trackSelector.selectTracks(rendererCapabilities, trackGroups);
- if (selectorResult.isEquivalent(periodTrackSelectorResult)) {
- return false;
+ trackSelector.selectTracks(rendererCapabilities, getTrackGroups(), info.id, timeline);
+ if (selectorResult.isEquivalent(trackSelectorResult)) {
+ return null;
}
- trackSelectorResult = selectorResult;
- for (TrackSelection trackSelection : trackSelectorResult.selections.getAll()) {
+ for (TrackSelection trackSelection : selectorResult.selections.getAll()) {
if (trackSelection != null) {
trackSelection.onPlaybackSpeed(playbackSpeed);
}
}
- return true;
- }
-
- public long applyTrackSelection(long positionUs, boolean forceRecreateStreams) {
- return applyTrackSelection(
- positionUs, forceRecreateStreams, new boolean[rendererCapabilities.length]);
+ return selectorResult;
}
+ /**
+ * Applies a {@link TrackSelectorResult} to the period.
+ *
+ * @param trackSelectorResult The {@link TrackSelectorResult} to apply.
+ * @param positionUs The position relative to the start of the period at which to apply the new
+ * track selections, in microseconds.
+ * @param forceRecreateStreams Whether all streams are forced to be recreated.
+ * @return The actual position relative to the start of the period at which the new track
+ * selections are applied.
+ */
public long applyTrackSelection(
- long positionUs, boolean forceRecreateStreams, boolean[] streamResetFlags) {
- for (int i = 0; i < trackSelectorResult.length; i++) {
+ TrackSelectorResult trackSelectorResult, long positionUs, boolean forceRecreateStreams) {
+ return applyTrackSelection(
+ trackSelectorResult,
+ positionUs,
+ forceRecreateStreams,
+ new boolean[rendererCapabilities.length]);
+ }
+
+ /**
+ * Applies a {@link TrackSelectorResult} to the period.
+ *
+ * @param newTrackSelectorResult The {@link TrackSelectorResult} to apply.
+ * @param positionUs The position relative to the start of the period at which to apply the new
+ * track selections, in microseconds.
+ * @param forceRecreateStreams Whether all streams are forced to be recreated.
+ * @param streamResetFlags Will be populated to indicate which streams have been reset or were
+ * newly created.
+ * @return The actual position relative to the start of the period at which the new track
+ * selections are applied.
+ */
+ public long applyTrackSelection(
+ TrackSelectorResult newTrackSelectorResult,
+ long positionUs,
+ boolean forceRecreateStreams,
+ boolean[] streamResetFlags) {
+ for (int i = 0; i < newTrackSelectorResult.length; i++) {
mayRetainStreamFlags[i] =
- !forceRecreateStreams && trackSelectorResult.isEquivalent(periodTrackSelectorResult, i);
+ !forceRecreateStreams && newTrackSelectorResult.isEquivalent(trackSelectorResult, i);
}
// Undo the effect of previous call to associate no-sample renderers with empty tracks
// so the mediaPeriod receives back whatever it sent us before.
disassociateNoSampleRenderersWithEmptySampleStream(sampleStreams);
- updatePeriodTrackSelectorResult(trackSelectorResult);
+ disableTrackSelectionsInResult();
+ trackSelectorResult = newTrackSelectorResult;
+ enableTrackSelectionsInResult();
// Disable streams on the period and get new streams for updated/newly-enabled tracks.
- TrackSelectionArray trackSelections = trackSelectorResult.selections;
+ TrackSelectionArray trackSelections = newTrackSelectorResult.selections;
positionUs =
mediaPeriod.selectTracks(
trackSelections.getAll(),
@@ -201,7 +280,7 @@ import com.google.android.exoplayer2.util.Log;
hasEnabledTracks = false;
for (int i = 0; i < sampleStreams.length; i++) {
if (sampleStreams[i] != null) {
- Assertions.checkState(trackSelectorResult.isRendererEnabled(i));
+ Assertions.checkState(newTrackSelectorResult.isRendererEnabled(i));
// hasEnabledTracks should be true only when non-empty streams exists.
if (rendererCapabilities[i].getTrackType() != C.TRACK_TYPE_NONE) {
hasEnabledTracks = true;
@@ -213,31 +292,58 @@ import com.google.android.exoplayer2.util.Log;
return positionUs;
}
+ /** Releases the media period. No other method should be called after the release. */
public void release() {
- updatePeriodTrackSelectorResult(null);
- try {
- if (info.id.endPositionUs != C.TIME_END_OF_SOURCE) {
- mediaSource.releasePeriod(((ClippingMediaPeriod) mediaPeriod).mediaPeriod);
- } else {
- mediaSource.releasePeriod(mediaPeriod);
- }
- } catch (RuntimeException e) {
- // There's nothing we can do.
- Log.e(TAG, "Period release failed.", e);
- }
+ disableTrackSelectionsInResult();
+ trackSelectorResult = null;
+ releaseMediaPeriod(info.endPositionUs, mediaSource, mediaPeriod);
}
- private void updatePeriodTrackSelectorResult(TrackSelectorResult trackSelectorResult) {
- if (periodTrackSelectorResult != null) {
- disableTrackSelectionsInResult(periodTrackSelectorResult);
- }
- periodTrackSelectorResult = trackSelectorResult;
- if (periodTrackSelectorResult != null) {
- enableTrackSelectionsInResult(periodTrackSelectorResult);
+ /**
+ * Sets the next media period holder in the queue.
+ *
+ * @param nextMediaPeriodHolder The next holder, or null if this will be the new loading media
+ * period holder at the end of the queue.
+ */
+ public void setNext(@Nullable MediaPeriodHolder nextMediaPeriodHolder) {
+ if (nextMediaPeriodHolder == next) {
+ return;
}
+ disableTrackSelectionsInResult();
+ next = nextMediaPeriodHolder;
+ enableTrackSelectionsInResult();
}
- private void enableTrackSelectionsInResult(TrackSelectorResult trackSelectorResult) {
+ /**
+ * Returns the next media period holder in the queue, or null if this is the last media period
+ * (and thus the loading media period).
+ */
+ @Nullable
+ public MediaPeriodHolder getNext() {
+ return next;
+ }
+
+ /**
+ * Returns the {@link TrackGroupArray} exposed by this media period. Must only be called if {@link
+ * #prepared} is {@code true}.
+ */
+ public TrackGroupArray getTrackGroups() {
+ return Assertions.checkNotNull(trackGroups);
+ }
+
+ /**
+ * Returns the {@link TrackSelectorResult} which is currently applied. Must only be called if
+ * {@link #prepared} is {@code true}.
+ */
+ public TrackSelectorResult getTrackSelectorResult() {
+ return Assertions.checkNotNull(trackSelectorResult);
+ }
+
+ private void enableTrackSelectionsInResult() {
+ TrackSelectorResult trackSelectorResult = this.trackSelectorResult;
+ if (!isLoadingMediaPeriod() || trackSelectorResult == null) {
+ return;
+ }
for (int i = 0; i < trackSelectorResult.length; i++) {
boolean rendererEnabled = trackSelectorResult.isRendererEnabled(i);
TrackSelection trackSelection = trackSelectorResult.selections.get(i);
@@ -247,7 +353,11 @@ import com.google.android.exoplayer2.util.Log;
}
}
- private void disableTrackSelectionsInResult(TrackSelectorResult trackSelectorResult) {
+ private void disableTrackSelectionsInResult() {
+ TrackSelectorResult trackSelectorResult = this.trackSelectorResult;
+ if (!isLoadingMediaPeriod() || trackSelectorResult == null) {
+ return;
+ }
for (int i = 0; i < trackSelectorResult.length; i++) {
boolean rendererEnabled = trackSelectorResult.isRendererEnabled(i);
TrackSelection trackSelection = trackSelectorResult.selections.get(i);
@@ -261,7 +371,8 @@ import com.google.android.exoplayer2.util.Log;
* For each renderer of type {@link C#TRACK_TYPE_NONE}, we will remove the dummy {@link
* EmptySampleStream} that was associated with it.
*/
- private void disassociateNoSampleRenderersWithEmptySampleStream(SampleStream[] sampleStreams) {
+ private void disassociateNoSampleRenderersWithEmptySampleStream(
+ @NullableType SampleStream[] sampleStreams) {
for (int i = 0; i < rendererCapabilities.length; i++) {
if (rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE) {
sampleStreams[i] = null;
@@ -273,7 +384,9 @@ import com.google.android.exoplayer2.util.Log;
* For each renderer of type {@link C#TRACK_TYPE_NONE} that was enabled, we will associate it with
* a dummy {@link EmptySampleStream}.
*/
- private void associateNoSampleRenderersWithEmptySampleStream(SampleStream[] sampleStreams) {
+ 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)) {
@@ -281,4 +394,39 @@ import com.google.android.exoplayer2.util.Log;
}
}
}
+
+ private boolean isLoadingMediaPeriod() {
+ return next == null;
+ }
+
+ /** Returns a media period corresponding to the given {@code id}. */
+ private static MediaPeriod createMediaPeriod(
+ MediaPeriodId id,
+ MediaSource mediaSource,
+ Allocator allocator,
+ long startPositionUs,
+ long endPositionUs) {
+ MediaPeriod mediaPeriod = mediaSource.createPeriod(id, allocator, startPositionUs);
+ if (endPositionUs != C.TIME_UNSET && endPositionUs != C.TIME_END_OF_SOURCE) {
+ mediaPeriod =
+ new ClippingMediaPeriod(
+ mediaPeriod, /* enableInitialDiscontinuity= */ true, /* startUs= */ 0, endPositionUs);
+ }
+ return mediaPeriod;
+ }
+
+ /** Releases the given {@code mediaPeriod}, logging and suppressing any errors. */
+ private static void releaseMediaPeriod(
+ long endPositionUs, MediaSource mediaSource, MediaPeriod mediaPeriod) {
+ try {
+ if (endPositionUs != C.TIME_UNSET && endPositionUs != C.TIME_END_OF_SOURCE) {
+ mediaSource.releasePeriod(((ClippingMediaPeriod) mediaPeriod).mediaPeriod);
+ } else {
+ mediaSource.releasePeriod(mediaPeriod);
+ }
+ } catch (RuntimeException e) {
+ // There's nothing we can do.
+ Log.e(TAG, "Period release failed.", e);
+ }
+ }
}
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 ba19b54c3f..bc1ea7b1e1 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
@@ -15,8 +15,10 @@
*/
package com.google.android.exoplayer2;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.source.MediaPeriod;
import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.util.Util;
/** Stores the information required to load and play a {@link MediaPeriod}. */
/* package */ final class MediaPeriodInfo {
@@ -31,9 +33,16 @@ import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
*/
public final long contentPositionUs;
/**
- * The duration of the media period, like {@link MediaPeriodId#endPositionUs} but with {@link
- * C#TIME_END_OF_SOURCE} resolved to the timeline period duration. May be {@link C#TIME_UNSET} if
- * the end position is not known.
+ * The end position to which the media period's content is clipped in order to play a following ad
+ * group, in microseconds, or {@link C#TIME_UNSET} if there is no following ad group or if this
+ * media period is an ad. The value {@link C#TIME_END_OF_SOURCE} indicates that a postroll ad
+ * follows at the end of this content media period.
+ */
+ public final long endPositionUs;
+ /**
+ * The duration of the media period, like {@link #endPositionUs} but with {@link
+ * C#TIME_END_OF_SOURCE} and {@link C#TIME_UNSET} resolved to the timeline period duration if
+ * known.
*/
public final long durationUs;
/**
@@ -51,25 +60,81 @@ import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
MediaPeriodId id,
long startPositionUs,
long contentPositionUs,
+ long endPositionUs,
long durationUs,
boolean isLastInTimelinePeriod,
boolean isFinal) {
this.id = id;
this.startPositionUs = startPositionUs;
this.contentPositionUs = contentPositionUs;
+ this.endPositionUs = endPositionUs;
this.durationUs = durationUs;
this.isLastInTimelinePeriod = isLastInTimelinePeriod;
this.isFinal = isFinal;
}
- /** Returns a copy of this instance with the start position set to the specified value. */
+ /**
+ * Returns a copy of this instance with the start position set to the specified value. May return
+ * the same instance if nothing changed.
+ */
public MediaPeriodInfo copyWithStartPositionUs(long startPositionUs) {
- return new MediaPeriodInfo(
- id,
- startPositionUs,
- contentPositionUs,
- durationUs,
- isLastInTimelinePeriod,
- isFinal);
+ return startPositionUs == this.startPositionUs
+ ? this
+ : new MediaPeriodInfo(
+ id,
+ startPositionUs,
+ contentPositionUs,
+ endPositionUs,
+ durationUs,
+ isLastInTimelinePeriod,
+ isFinal);
+ }
+
+ /**
+ * Returns a copy of this instance with the content position set to the specified value. May
+ * return the same instance if nothing changed.
+ */
+ public MediaPeriodInfo copyWithContentPositionUs(long contentPositionUs) {
+ return contentPositionUs == this.contentPositionUs
+ ? this
+ : new MediaPeriodInfo(
+ id,
+ startPositionUs,
+ contentPositionUs,
+ endPositionUs,
+ durationUs,
+ isLastInTimelinePeriod,
+ isFinal);
+ }
+
+ @Override
+ public boolean equals(@Nullable Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ MediaPeriodInfo that = (MediaPeriodInfo) o;
+ return startPositionUs == that.startPositionUs
+ && contentPositionUs == that.contentPositionUs
+ && endPositionUs == that.endPositionUs
+ && durationUs == that.durationUs
+ && isLastInTimelinePeriod == that.isLastInTimelinePeriod
+ && isFinal == that.isFinal
+ && Util.areEqual(id, that.id);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = 17;
+ result = 31 * result + id.hashCode();
+ result = 31 * result + (int) startPositionUs;
+ result = 31 * result + (int) contentPositionUs;
+ result = 31 * result + (int) endPositionUs;
+ result = 31 * result + (int) durationUs;
+ result = 31 * result + (isLastInTimelinePeriod ? 1 : 0);
+ result = 31 * result + (isFinal ? 1 : 0);
+ return result;
}
}
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 c51c1cc149..249548340e 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.Pair;
import com.google.android.exoplayer2.Player.RepeatMode;
import com.google.android.exoplayer2.source.MediaPeriod;
@@ -61,8 +61,8 @@ import com.google.android.exoplayer2.util.Assertions;
}
/**
- * Sets the {@link Timeline}. Call {@link #updateQueuedPeriods(MediaPeriodId, long)} to update the
- * queued media periods to take into account the new timeline.
+ * Sets the {@link Timeline}. Call {@link #updateQueuedPeriods(long, long)} to update the queued
+ * media periods to take into account the new timeline.
*/
public void setTimeline(Timeline timeline) {
this.timeline = timeline;
@@ -156,7 +156,7 @@ import com.google.android.exoplayer2.util.Assertions;
info);
if (loading != null) {
Assertions.checkState(hasPlayingPeriod());
- loading.next = newPeriodHolder;
+ loading.setNext(newPeriodHolder);
}
oldFrontPeriodUid = null;
loading = newPeriodHolder;
@@ -207,8 +207,8 @@ import com.google.android.exoplayer2.util.Assertions;
* @return The updated reading period holder.
*/
public MediaPeriodHolder advanceReadingPeriod() {
- Assertions.checkState(reading != null && reading.next != null);
- reading = reading.next;
+ Assertions.checkState(reading != null && reading.getNext() != null);
+ reading = reading.getNext();
return reading;
}
@@ -222,7 +222,7 @@ import com.google.android.exoplayer2.util.Assertions;
public MediaPeriodHolder advancePlayingPeriod() {
if (playing != null) {
if (playing == reading) {
- reading = playing.next;
+ reading = playing.getNext();
}
playing.release();
length--;
@@ -231,7 +231,7 @@ import com.google.android.exoplayer2.util.Assertions;
oldFrontPeriodUid = playing.uid;
oldFrontPeriodWindowSequenceNumber = playing.info.id.windowSequenceNumber;
}
- playing = playing.next;
+ playing = playing.getNext();
} else {
playing = loading;
reading = loading;
@@ -251,8 +251,8 @@ import com.google.android.exoplayer2.util.Assertions;
Assertions.checkState(mediaPeriodHolder != null);
boolean removedReading = false;
loading = mediaPeriodHolder;
- while (mediaPeriodHolder.next != null) {
- mediaPeriodHolder = mediaPeriodHolder.next;
+ while (mediaPeriodHolder.getNext() != null) {
+ mediaPeriodHolder = mediaPeriodHolder.getNext();
if (mediaPeriodHolder == reading) {
reading = playing;
removedReading = true;
@@ -260,7 +260,7 @@ import com.google.android.exoplayer2.util.Assertions;
mediaPeriodHolder.release();
length--;
}
- loading.next = null;
+ loading.setNext(null);
return removedReading;
}
@@ -292,52 +292,60 @@ import com.google.android.exoplayer2.util.Assertions;
* current playback position. The method assumes that the first media period in the queue is still
* consistent with the new timeline.
*
- * @param playingPeriodId The current playing media period identifier.
* @param rendererPositionUs The current renderer position in microseconds.
+ * @param maxRendererReadPositionUs The maximum renderer position up to which renderers have read
+ * the current reading media period in microseconds, or {@link C#TIME_END_OF_SOURCE} if they
+ * have read to the end.
* @return Whether the timeline change has been handled completely.
*/
- public boolean updateQueuedPeriods(MediaPeriodId playingPeriodId, long rendererPositionUs) {
+ public boolean updateQueuedPeriods(long rendererPositionUs, long maxRendererReadPositionUs) {
// TODO: Merge this into setTimeline so that the queue gets updated as soon as the new timeline
// is set, once all cases handled by ExoPlayerImplInternal.handleSourceInfoRefreshed can be
// handled here.
- int periodIndex = timeline.getIndexOfPeriod(playingPeriodId.periodUid);
- // The front period is either playing now, or is being loaded and will become the playing
- // period.
MediaPeriodHolder previousPeriodHolder = null;
MediaPeriodHolder periodHolder = getFrontPeriod();
while (periodHolder != null) {
+ MediaPeriodInfo oldPeriodInfo = periodHolder.info;
+
+ // Get period info based on new timeline.
+ MediaPeriodInfo newPeriodInfo;
if (previousPeriodHolder == null) {
- periodHolder.info = getUpdatedMediaPeriodInfo(periodHolder.info);
+ // The id and start position of the first period have already been verified by
+ // ExoPlayerImplInternal.handleSourceInfoRefreshed. Just update duration, isLastInTimeline
+ // and isLastInPeriod flags.
+ newPeriodInfo = getUpdatedMediaPeriodInfo(oldPeriodInfo);
} else {
- // Check this period holder still follows the previous one, based on the new timeline.
- if (periodIndex == C.INDEX_UNSET
- || !periodHolder.uid.equals(timeline.getUidOfPeriod(periodIndex))) {
- // The holder uid is inconsistent with the new timeline.
- return !removeAfter(previousPeriodHolder);
- }
- MediaPeriodInfo periodInfo =
- getFollowingMediaPeriodInfo(previousPeriodHolder, rendererPositionUs);
- if (periodInfo == null) {
+ newPeriodInfo = getFollowingMediaPeriodInfo(previousPeriodHolder, rendererPositionUs);
+ if (newPeriodInfo == null) {
// We've loaded a next media period that is not in the new timeline.
return !removeAfter(previousPeriodHolder);
}
- // Update the period holder.
- periodHolder.info = getUpdatedMediaPeriodInfo(periodHolder.info);
- // Check the media period information matches the new timeline.
- if (!canKeepMediaPeriodHolder(periodHolder, periodInfo)) {
+ if (!canKeepMediaPeriodHolder(oldPeriodInfo, newPeriodInfo)) {
+ // The new media period has a different id or start position.
return !removeAfter(previousPeriodHolder);
}
}
- if (periodHolder.info.isLastInTimelinePeriod) {
- // Move on to the next timeline period index, if there is one.
- periodIndex =
- timeline.getNextPeriodIndex(
- periodIndex, period, window, repeatMode, shuffleModeEnabled);
+ // Use new period info, but keep old content position.
+ periodHolder.info = newPeriodInfo.copyWithContentPositionUs(oldPeriodInfo.contentPositionUs);
+
+ if (!areDurationsCompatible(oldPeriodInfo.durationUs, newPeriodInfo.durationUs)) {
+ // The period duration changed. Remove all subsequent periods and check whether we read
+ // beyond the new duration.
+ long newDurationInRendererTime =
+ newPeriodInfo.durationUs == C.TIME_UNSET
+ ? Long.MAX_VALUE
+ : periodHolder.toRendererTime(newPeriodInfo.durationUs);
+ boolean isReadingAndReadBeyondNewDuration =
+ periodHolder == reading
+ && (maxRendererReadPositionUs == C.TIME_END_OF_SOURCE
+ || maxRendererReadPositionUs >= newDurationInRendererTime);
+ boolean readingPeriodRemoved = removeAfter(periodHolder);
+ return !readingPeriodRemoved && !isReadingAndReadBeyondNewDuration;
}
previousPeriodHolder = periodHolder;
- periodHolder = periodHolder.next;
+ periodHolder = periodHolder.getNext();
}
return true;
}
@@ -351,19 +359,21 @@ import com.google.android.exoplayer2.util.Assertions;
* @return The updated media period info for the current timeline.
*/
public MediaPeriodInfo getUpdatedMediaPeriodInfo(MediaPeriodInfo info) {
- boolean isLastInPeriod = isLastInPeriod(info.id);
- boolean isLastInTimeline = isLastInTimeline(info.id, isLastInPeriod);
+ MediaPeriodId id = info.id;
+ boolean isLastInPeriod = isLastInPeriod(id);
+ boolean isLastInTimeline = isLastInTimeline(id, isLastInPeriod);
timeline.getPeriodByUid(info.id.periodUid, period);
long durationUs =
- info.id.isAd()
- ? period.getAdDurationUs(info.id.adGroupIndex, info.id.adIndexInAdGroup)
- : (info.id.endPositionUs == C.TIME_END_OF_SOURCE
+ id.isAd()
+ ? period.getAdDurationUs(id.adGroupIndex, id.adIndexInAdGroup)
+ : (info.endPositionUs == C.TIME_UNSET || info.endPositionUs == C.TIME_END_OF_SOURCE
? period.getDurationUs()
- : info.id.endPositionUs);
+ : info.endPositionUs);
return new MediaPeriodInfo(
- info.id,
+ id,
info.startPositionUs,
info.contentPositionUs,
+ info.endPositionUs,
durationUs,
isLastInPeriod,
isLastInTimeline);
@@ -402,11 +412,7 @@ import com.google.android.exoplayer2.util.Assertions;
int adGroupIndex = period.getAdGroupIndexForPositionUs(positionUs);
if (adGroupIndex == C.INDEX_UNSET) {
int nextAdGroupIndex = period.getAdGroupIndexAfterPositionUs(positionUs);
- long endPositionUs =
- nextAdGroupIndex == C.INDEX_UNSET
- ? C.TIME_END_OF_SOURCE
- : period.getAdGroupTimeUs(nextAdGroupIndex);
- return new MediaPeriodId(periodUid, windowSequenceNumber, endPositionUs);
+ return new MediaPeriodId(periodUid, windowSequenceNumber, nextAdGroupIndex);
} else {
int adIndexInAdGroup = period.getFirstAdIndexToPlay(adGroupIndex);
return new MediaPeriodId(periodUid, adGroupIndex, adIndexInAdGroup, windowSequenceNumber);
@@ -439,7 +445,7 @@ import com.google.android.exoplayer2.util.Assertions;
// Reuse window sequence number of first exact period match.
return mediaPeriodHolder.info.id.windowSequenceNumber;
}
- mediaPeriodHolder = mediaPeriodHolder.next;
+ mediaPeriodHolder = mediaPeriodHolder.getNext();
}
mediaPeriodHolder = getFrontPeriod();
while (mediaPeriodHolder != null) {
@@ -451,20 +457,25 @@ import com.google.android.exoplayer2.util.Assertions;
return mediaPeriodHolder.info.id.windowSequenceNumber;
}
}
- mediaPeriodHolder = mediaPeriodHolder.next;
+ mediaPeriodHolder = mediaPeriodHolder.getNext();
}
// If no match is found, create new sequence number.
return nextWindowSequenceNumber++;
}
/**
- * Returns whether {@code periodHolder} can be kept for playing the media period described by
- * {@code info}.
+ * Returns whether a period described by {@code oldInfo} can be kept for playing the media period
+ * described by {@code newInfo}.
*/
- private boolean canKeepMediaPeriodHolder(MediaPeriodHolder periodHolder, MediaPeriodInfo info) {
- MediaPeriodInfo periodHolderInfo = periodHolder.info;
- return periodHolderInfo.startPositionUs == info.startPositionUs
- && periodHolderInfo.id.equals(info.id);
+ private boolean canKeepMediaPeriodHolder(MediaPeriodInfo oldInfo, MediaPeriodInfo newInfo) {
+ return oldInfo.startPositionUs == newInfo.startPositionUs && oldInfo.id.equals(newInfo.id);
+ }
+
+ /**
+ * Returns whether a duration change of a period is compatible with keeping the following periods.
+ */
+ private boolean areDurationsCompatible(long previousDurationUs, long newDurationUs) {
+ return previousDurationUs == C.TIME_UNSET || previousDurationUs == newDurationUs;
}
/**
@@ -482,19 +493,20 @@ import com.google.android.exoplayer2.util.Assertions;
int nextPeriodIndex =
timeline.getNextPeriodIndex(
currentPeriodIndex, period, window, repeatMode, shuffleModeEnabled);
- while (lastValidPeriodHolder.next != null
+ while (lastValidPeriodHolder.getNext() != null
&& !lastValidPeriodHolder.info.isLastInTimelinePeriod) {
- lastValidPeriodHolder = lastValidPeriodHolder.next;
+ lastValidPeriodHolder = lastValidPeriodHolder.getNext();
}
- if (nextPeriodIndex == C.INDEX_UNSET || lastValidPeriodHolder.next == null) {
+ MediaPeriodHolder nextMediaPeriodHolder = lastValidPeriodHolder.getNext();
+ if (nextPeriodIndex == C.INDEX_UNSET || nextMediaPeriodHolder == null) {
break;
}
- int nextPeriodHolderPeriodIndex = timeline.getIndexOfPeriod(lastValidPeriodHolder.next.uid);
+ int nextPeriodHolderPeriodIndex = timeline.getIndexOfPeriod(nextMediaPeriodHolder.uid);
if (nextPeriodHolderPeriodIndex != nextPeriodIndex) {
break;
}
- lastValidPeriodHolder = lastValidPeriodHolder.next;
+ lastValidPeriodHolder = nextMediaPeriodHolder;
currentPeriodIndex = nextPeriodIndex;
}
@@ -568,8 +580,9 @@ import com.google.android.exoplayer2.util.Assertions;
}
nextPeriodUid = defaultPosition.first;
startPositionUs = defaultPosition.second;
- if (mediaPeriodHolder.next != null && mediaPeriodHolder.next.uid.equals(nextPeriodUid)) {
- windowSequenceNumber = mediaPeriodHolder.next.info.id.windowSequenceNumber;
+ MediaPeriodHolder nextMediaPeriodHolder = mediaPeriodHolder.getNext();
+ if (nextMediaPeriodHolder != null && nextMediaPeriodHolder.uid.equals(nextPeriodUid)) {
+ windowSequenceNumber = nextMediaPeriodHolder.info.id.windowSequenceNumber;
} else {
windowSequenceNumber = nextWindowSequenceNumber++;
}
@@ -578,7 +591,8 @@ import com.google.android.exoplayer2.util.Assertions;
}
MediaPeriodId periodId =
resolveMediaPeriodIdForAds(nextPeriodUid, startPositionUs, windowSequenceNumber);
- return getMediaPeriodInfo(periodId, startPositionUs, startPositionUs);
+ return getMediaPeriodInfo(
+ periodId, /* contentPositionUs= */ startPositionUs, startPositionUs);
}
MediaPeriodId currentPeriodId = mediaPeriodInfo.id;
@@ -624,14 +638,14 @@ import com.google.android.exoplayer2.util.Assertions;
return getMediaPeriodInfoForContent(
currentPeriodId.periodUid, startPositionUs, currentPeriodId.windowSequenceNumber);
}
- } else if (mediaPeriodInfo.id.endPositionUs != C.TIME_END_OF_SOURCE) {
+ } else {
// Play the next ad group if it's available.
- int nextAdGroupIndex = period.getAdGroupIndexForPositionUs(mediaPeriodInfo.id.endPositionUs);
+ int nextAdGroupIndex = period.getAdGroupIndexForPositionUs(mediaPeriodInfo.endPositionUs);
if (nextAdGroupIndex == C.INDEX_UNSET) {
- // The next ad group can't be played. Play content from the ad group position instead.
+ // The next ad group can't be played. Play content from the previous end position instead.
return getMediaPeriodInfoForContent(
currentPeriodId.periodUid,
- mediaPeriodInfo.id.endPositionUs,
+ /* startPositionUs= */ mediaPeriodInfo.durationUs,
currentPeriodId.windowSequenceNumber);
}
int adIndexInAdGroup = period.getFirstAdIndexToPlay(nextAdGroupIndex);
@@ -641,30 +655,8 @@ import com.google.android.exoplayer2.util.Assertions;
currentPeriodId.periodUid,
nextAdGroupIndex,
adIndexInAdGroup,
- mediaPeriodInfo.id.endPositionUs,
+ /* contentPositionUs= */ mediaPeriodInfo.durationUs,
currentPeriodId.windowSequenceNumber);
- } else {
- // Check if the postroll ad should be played.
- int adGroupCount = period.getAdGroupCount();
- if (adGroupCount == 0) {
- return null;
- }
- int adGroupIndex = adGroupCount - 1;
- if (period.getAdGroupTimeUs(adGroupIndex) != C.TIME_END_OF_SOURCE
- || period.hasPlayedAdGroup(adGroupIndex)) {
- return null;
- }
- int adIndexInAdGroup = period.getFirstAdIndexToPlay(adGroupIndex);
- if (!period.isAdAvailable(adGroupIndex, adIndexInAdGroup)) {
- return null;
- }
- long contentDurationUs = period.getDurationUs();
- return getMediaPeriodInfoForAd(
- currentPeriodId.periodUid,
- adGroupIndex,
- adIndexInAdGroup,
- contentDurationUs,
- currentPeriodId.windowSequenceNumber);
}
}
@@ -694,8 +686,6 @@ import com.google.android.exoplayer2.util.Assertions;
long windowSequenceNumber) {
MediaPeriodId id =
new MediaPeriodId(periodUid, adGroupIndex, adIndexInAdGroup, windowSequenceNumber);
- boolean isLastInPeriod = isLastInPeriod(id);
- boolean isLastInTimeline = isLastInTimeline(id, isLastInPeriod);
long durationUs =
timeline
.getPeriodByUid(id.periodUid, period)
@@ -708,50 +698,38 @@ import com.google.android.exoplayer2.util.Assertions;
id,
startPositionUs,
contentPositionUs,
+ /* endPositionUs= */ C.TIME_UNSET,
durationUs,
- isLastInPeriod,
- isLastInTimeline);
+ /* isLastInTimelinePeriod= */ false,
+ /* isFinal= */ false);
}
private MediaPeriodInfo getMediaPeriodInfoForContent(
Object periodUid, long startPositionUs, long windowSequenceNumber) {
int nextAdGroupIndex = period.getAdGroupIndexAfterPositionUs(startPositionUs);
- long endPositionUs =
- nextAdGroupIndex == C.INDEX_UNSET
- ? C.TIME_END_OF_SOURCE
- : period.getAdGroupTimeUs(nextAdGroupIndex);
- MediaPeriodId id = new MediaPeriodId(periodUid, windowSequenceNumber, endPositionUs);
- timeline.getPeriodByUid(id.periodUid, period);
+ MediaPeriodId id = new MediaPeriodId(periodUid, windowSequenceNumber, nextAdGroupIndex);
boolean isLastInPeriod = isLastInPeriod(id);
boolean isLastInTimeline = isLastInTimeline(id, isLastInPeriod);
+ long endPositionUs =
+ nextAdGroupIndex != C.INDEX_UNSET
+ ? period.getAdGroupTimeUs(nextAdGroupIndex)
+ : C.TIME_UNSET;
long durationUs =
- endPositionUs == C.TIME_END_OF_SOURCE ? period.getDurationUs() : endPositionUs;
+ endPositionUs == C.TIME_UNSET || endPositionUs == C.TIME_END_OF_SOURCE
+ ? period.durationUs
+ : endPositionUs;
return new MediaPeriodInfo(
- id, startPositionUs, C.TIME_UNSET, durationUs, isLastInPeriod, isLastInTimeline);
+ id,
+ startPositionUs,
+ /* contentPositionUs= */ C.TIME_UNSET,
+ endPositionUs,
+ durationUs,
+ isLastInPeriod,
+ isLastInTimeline);
}
private boolean isLastInPeriod(MediaPeriodId id) {
- int adGroupCount = timeline.getPeriodByUid(id.periodUid, period).getAdGroupCount();
- if (adGroupCount == 0) {
- return true;
- }
-
- int lastAdGroupIndex = adGroupCount - 1;
- boolean isAd = id.isAd();
- if (period.getAdGroupTimeUs(lastAdGroupIndex) != C.TIME_END_OF_SOURCE) {
- // There's no postroll ad.
- return !isAd && id.endPositionUs == C.TIME_END_OF_SOURCE;
- }
-
- int postrollAdCount = period.getAdCountInAdGroup(lastAdGroupIndex);
- if (postrollAdCount == C.LENGTH_UNSET) {
- // We won't know if this is the last ad until we know how many postroll ads there are.
- return false;
- }
-
- boolean isLastAd =
- isAd && id.adGroupIndex == lastAdGroupIndex && id.adIndexInAdGroup == postrollAdCount - 1;
- return isLastAd || (!isAd && period.getFirstAdIndexToPlay(lastAdGroupIndex) == postrollAdCount);
+ return !id.isAd() && id.nextAdGroupIndex == C.INDEX_UNSET;
}
private boolean isLastInTimeline(MediaPeriodId id, boolean isLastMediaPeriodInPeriod) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
index 45d6537b84..e901025a07 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.source.SampleStream;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.MediaClock;
@@ -122,6 +122,11 @@ public abstract class NoSampleRenderer implements Renderer, RendererCapabilities
return true;
}
+ @Override
+ public long getReadingPositionUs() {
+ return C.TIME_END_OF_SOURCE;
+ }
+
@Override
public final void setCurrentStreamFinal() {
streamIsFinal = true;
@@ -158,6 +163,12 @@ public abstract class NoSampleRenderer implements Renderer, RendererCapabilities
onDisabled();
}
+ @Override
+ public final void reset() {
+ Assertions.checkState(state == STATE_DISABLED);
+ onReset();
+ }
+
@Override
public boolean isReady() {
return true;
@@ -260,6 +271,15 @@ public abstract class NoSampleRenderer implements Renderer, RendererCapabilities
// Do nothing.
}
+ /**
+ * Called when the renderer is reset.
+ *
+ * The default implementation is a no-op.
+ */
+ protected void onReset() {
+ // Do nothing.
+ }
+
// Methods to be called by subclasses.
/**
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 4333f51bf7..0792bf0c7d 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
@@ -15,8 +15,8 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.CheckResult;
-import android.support.annotation.Nullable;
+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;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
index 6f2db4ff5e..057cb371e5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.util.Assertions;
/**
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 e3441fb2a7..8885be2e02 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
@@ -16,8 +16,8 @@
package com.google.android.exoplayer2;
import android.os.Looper;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
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 d60d428563..7904942c1b 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
@@ -16,7 +16,7 @@
package com.google.android.exoplayer2;
import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.util.Assertions;
/**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
index c6456e5f7f..9f52e8d9de 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import com.google.android.exoplayer2.source.SampleStream;
import com.google.android.exoplayer2.util.MediaClock;
import java.io.IOException;
@@ -44,12 +44,16 @@ public interface Renderer extends PlayerMessage.Target {
@IntDef({STATE_DISABLED, STATE_ENABLED, STATE_STARTED})
@interface State {}
/**
- * The renderer is disabled.
+ * The renderer is disabled. A renderer in this state may hold resources that it requires for
+ * rendering (e.g. media decoders), for use if it's subsequently enabled. {@link #reset()} can be
+ * called to force the renderer to release these resources.
*/
int STATE_DISABLED = 0;
/**
- * The renderer is enabled but not started. A renderer in this state is not actively rendering
- * media, but will typically hold resources that it requires for rendering (e.g. media decoders).
+ * The renderer is enabled but not started. A renderer in this state may render media at the
+ * current position (e.g. an initial video frame), but the position will not advance. A renderer
+ * in this state will typically hold resources that it requires for rendering (e.g. media
+ * decoders).
*/
int STATE_ENABLED = 1;
/**
@@ -156,6 +160,16 @@ public interface Renderer extends PlayerMessage.Target {
*/
boolean hasReadStreamToEnd();
+ /**
+ * Returns the playback position up to which the renderer has read samples from the current {@link
+ * SampleStream}, in microseconds, or {@link C#TIME_END_OF_SOURCE} if the renderer has read the
+ * current {@link SampleStream} to the end.
+ *
+ *
This method may be called when the renderer is in the following states: {@link
+ * #STATE_ENABLED}, {@link #STATE_STARTED}.
+ */
+ long getReadingPositionUs();
+
/**
* Signals to the renderer that the current {@link SampleStream} will be the final one supplied
* before it is next disabled or reset.
@@ -279,4 +293,12 @@ public interface Renderer extends PlayerMessage.Target {
*/
void disable();
+ /**
+ * Forces the renderer to give up any resources (e.g. media decoders) that it may be holding. If
+ * the renderer is not holding any resources, the call is a no-op.
+ *
+ *
This method may be called when the renderer is in the following states: {@link
+ * #STATE_DISABLED}.
+ */
+ void reset();
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java b/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java
index 684072efc6..bc8c6ff633 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
/**
* The configuration of a {@link Renderer}.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
index e221898471..6f0d125bcf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
@@ -16,7 +16,7 @@
package com.google.android.exoplayer2;
import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.audio.AudioRendererEventListener;
import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java b/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java
index ca0433f96d..7a0ad67a28 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.util.Assertions;
/**
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 eba02b0c0a..910404a875 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
@@ -23,7 +23,7 @@ import android.media.MediaCodec;
import android.media.PlaybackParams;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
@@ -48,8 +48,10 @@ import com.google.android.exoplayer2.text.TextOutput;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.trackselection.TrackSelector;
import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.PriorityTaskManager;
import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoRendererEventListener;
@@ -63,7 +65,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
* An {@link ExoPlayer} implementation that uses default {@link Renderer} components. Instances can
* be obtained from {@link ExoPlayerFactory}.
*/
-@TargetApi(16)
public class SimpleExoPlayer extends BasePlayer
implements ExoPlayer,
Player.AudioComponent,
@@ -114,6 +115,8 @@ public class SimpleExoPlayer extends BasePlayer
@Nullable private VideoFrameMetadataListener videoFrameMetadataListener;
@Nullable private CameraMotionListener cameraMotionListener;
private boolean hasNotifiedFullWrongThreadWarning;
+ @Nullable private PriorityTaskManager priorityTaskManager;
+ private boolean isPriorityTaskManagerRegistered;
/**
* @param context A {@link Context}.
@@ -234,6 +237,7 @@ public class SimpleExoPlayer extends BasePlayer
new ExoPlayerImpl(renderers, trackSelector, loadControl, bandwidthMeter, clock, looper);
analyticsCollector = analyticsCollectorFactory.createAnalyticsCollector(player, clock);
addListener(analyticsCollector);
+ addListener(componentListener);
videoDebugListeners.add(analyticsCollector);
videoListeners.add(analyticsCollector);
audioDebugListeners.add(analyticsCollector);
@@ -539,6 +543,31 @@ public class SimpleExoPlayer extends BasePlayer
analyticsCollector.removeListener(listener);
}
+ /**
+ * Sets a {@link PriorityTaskManager}, or null to clear a previously set priority task manager.
+ *
+ *
The priority {@link C#PRIORITY_PLAYBACK} will be set while the player is loading.
+ *
+ * @param priorityTaskManager The {@link PriorityTaskManager}, or null to clear a previously set
+ * priority task manager.
+ */
+ public void setPriorityTaskManager(@Nullable PriorityTaskManager priorityTaskManager) {
+ verifyApplicationThread();
+ if (Util.areEqual(this.priorityTaskManager, priorityTaskManager)) {
+ return;
+ }
+ if (isPriorityTaskManagerRegistered) {
+ Assertions.checkNotNull(this.priorityTaskManager).remove(C.PRIORITY_PLAYBACK);
+ }
+ if (priorityTaskManager != null && isLoading()) {
+ priorityTaskManager.add(C.PRIORITY_PLAYBACK);
+ isPriorityTaskManagerRegistered = true;
+ } else {
+ isPriorityTaskManagerRegistered = false;
+ }
+ this.priorityTaskManager = priorityTaskManager;
+ }
+
/**
* Sets the {@link PlaybackParams} governing audio playback.
*
@@ -959,6 +988,11 @@ public class SimpleExoPlayer extends BasePlayer
return player.getSeekParameters();
}
+ @Override
+ public void setForegroundMode(boolean foregroundMode) {
+ player.setForegroundMode(foregroundMode);
+ }
+
@Override
public void stop(boolean reset) {
verifyApplicationThread();
@@ -976,6 +1010,7 @@ public class SimpleExoPlayer extends BasePlayer
@Override
public void release() {
+ verifyApplicationThread();
audioFocusManager.handleStop();
player.release();
removeSurfaceCallbacks();
@@ -989,6 +1024,10 @@ public class SimpleExoPlayer extends BasePlayer
mediaSource.removeEventListener(analyticsCollector);
mediaSource = null;
}
+ if (isPriorityTaskManagerRegistered) {
+ Assertions.checkNotNull(priorityTaskManager).remove(C.PRIORITY_PLAYBACK);
+ isPriorityTaskManagerRegistered = false;
+ }
bandwidthMeter.removeEventListener(analyticsCollector);
currentCues = Collections.emptyList();
}
@@ -1192,7 +1231,7 @@ public class SimpleExoPlayer extends BasePlayer
Log.w(
TAG,
"Player is accessed on the wrong thread. See "
- + "https://google.github.io/ExoPlayer/faqs.html#"
+ + "https://exoplayer.dev/faqs.html#"
+ "what-do-player-is-accessed-on-the-wrong-thread-warnings-mean",
hasNotifiedFullWrongThreadWarning ? null : new IllegalStateException());
hasNotifiedFullWrongThreadWarning = true;
@@ -1206,7 +1245,8 @@ public class SimpleExoPlayer extends BasePlayer
MetadataOutput,
SurfaceHolder.Callback,
TextureView.SurfaceTextureListener,
- AudioFocusManager.PlayerControl {
+ AudioFocusManager.PlayerControl,
+ Player.EventListener {
// VideoRendererEventListener implementation
@@ -1416,5 +1456,20 @@ public class SimpleExoPlayer extends BasePlayer
public void executePlayerCommand(@AudioFocusManager.PlayerCommand int playerCommand) {
updatePlayWhenReady(getPlayWhenReady(), playerCommand);
}
+
+ // Player.EventListener implementation.
+
+ @Override
+ public void onLoadingChanged(boolean isLoading) {
+ if (priorityTaskManager != null) {
+ if (isLoading && !isPriorityTaskManagerRegistered) {
+ priorityTaskManager.add(C.PRIORITY_PLAYBACK);
+ isPriorityTaskManagerRegistered = true;
+ } else if (!isLoading && isPriorityTaskManagerRegistered) {
+ priorityTaskManager.remove(C.PRIORITY_PLAYBACK);
+ isPriorityTaskManagerRegistered = false;
+ }
+ }
+ }
}
}
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 bb7f027726..9c26b546bd 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.Pair;
import com.google.android.exoplayer2.source.ads.AdPlaybackState;
import com.google.android.exoplayer2.util.Assertions;
@@ -120,7 +120,7 @@ public abstract class Timeline {
public static final class Window {
/** A tag for the window. Not necessarily unique. */
- public @Nullable Object tag;
+ @Nullable public Object tag;
/**
* The start time of the presentation to which this window belongs in milliseconds since the
@@ -267,14 +267,15 @@ public abstract class Timeline {
public static final class Period {
/**
- * An identifier for the period. Not necessarily unique.
+ * An identifier for the period. Not necessarily unique. May be null if the ids of the period
+ * are not required.
*/
- public Object id;
+ @Nullable public Object id;
/**
- * A unique identifier for the period.
+ * A unique identifier for the period. May be null if the ids of the period are not required.
*/
- public Object uid;
+ @Nullable public Object uid;
/**
* The index of the window to which this period belongs.
@@ -289,11 +290,18 @@ public abstract class Timeline {
private long positionInWindowUs;
private AdPlaybackState adPlaybackState;
+ /** Creates a new instance with no ad playback state. */
+ public Period() {
+ adPlaybackState = AdPlaybackState.NONE;
+ }
+
/**
* Sets the data held by this period.
*
- * @param id An identifier for the period. Not necessarily unique.
- * @param uid A unique identifier for the period.
+ * @param id An identifier for the period. Not necessarily unique. May be null if the ids of the
+ * period are not required.
+ * @param uid A unique identifier for the period. May be null if the ids of the period are not
+ * required.
* @param windowIndex The index of the window to which this period belongs.
* @param durationUs The duration of this period in microseconds, or {@link C#TIME_UNSET} if
* unknown.
@@ -302,7 +310,11 @@ public abstract class Timeline {
* period is not within the window.
* @return This period, for convenience.
*/
- public Period set(Object id, Object uid, int windowIndex, long durationUs,
+ public Period set(
+ @Nullable Object id,
+ @Nullable Object uid,
+ int windowIndex,
+ long durationUs,
long positionInWindowUs) {
return set(id, uid, windowIndex, durationUs, positionInWindowUs, AdPlaybackState.NONE);
}
@@ -310,8 +322,10 @@ public abstract class Timeline {
/**
* Sets the data held by this period.
*
- * @param id An identifier for the period. Not necessarily unique.
- * @param uid A unique identifier for the period.
+ * @param id An identifier for the period. Not necessarily unique. May be null if the ids of the
+ * period are not required.
+ * @param uid A unique identifier for the period. May be null if the ids of the period are not
+ * required.
* @param windowIndex The index of the window to which this period belongs.
* @param durationUs The duration of this period in microseconds, or {@link C#TIME_UNSET} if
* unknown.
@@ -323,8 +337,8 @@ public abstract class Timeline {
* @return This period, for convenience.
*/
public Period set(
- Object id,
- Object uid,
+ @Nullable Object id,
+ @Nullable Object uid,
int windowIndex,
long durationUs,
long positionInWindowUs,
@@ -444,7 +458,7 @@ public abstract class Timeline {
* @return The index of the ad group, or {@link C#INDEX_UNSET}.
*/
public int getAdGroupIndexAfterPositionUs(long positionUs) {
- return adPlaybackState.getAdGroupIndexAfterPositionUs(positionUs);
+ return adPlaybackState.getAdGroupIndexAfterPositionUs(positionUs, durationUs);
}
/**
@@ -707,7 +721,9 @@ public abstract class Timeline {
*/
public final Pair getPeriodPosition(
Window window, Period period, int windowIndex, long windowPositionUs) {
- return getPeriodPosition(window, period, windowIndex, windowPositionUs, 0);
+ return Assertions.checkNotNull(
+ getPeriodPosition(
+ window, period, windowIndex, windowPositionUs, /* defaultPositionProjectionUs= */ 0));
}
/**
@@ -724,6 +740,7 @@ public abstract class Timeline {
* is {@link C#TIME_UNSET}, {@code defaultPositionProjectionUs} is non-zero, and the window's
* position could not be projected by {@code defaultPositionProjectionUs}.
*/
+ @Nullable
public final Pair getPeriodPosition(
Window window,
Period period,
@@ -746,7 +763,7 @@ public abstract class Timeline {
periodPositionUs -= periodDurationUs;
periodDurationUs = getPeriod(++periodIndex, period, /* setIds= */ true).getDurationUs();
}
- return Pair.create(period.uid, periodPositionUs);
+ return Pair.create(Assertions.checkNotNull(period.uid), periodPositionUs);
}
/**
@@ -761,8 +778,8 @@ public abstract class Timeline {
}
/**
- * Populates a {@link Period} with data for the period at the specified index. Does not populate
- * {@link Period#id} and {@link Period#uid}.
+ * Populates a {@link Period} with data for the period at the specified index. {@link Period#id}
+ * and {@link Period#uid} will be set to null.
*
* @param periodIndex The index of the period.
* @param period The {@link Period} to populate. Must not be null.
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 55031e2d12..c0d96e8e88 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2.analytics;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.view.Surface;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException;
@@ -129,12 +129,13 @@ public class AnalyticsCollector
/**
* Sets the player for which data will be collected. Must only be called if no player has been set
- * yet.
+ * yet or the current player is idle.
*
* @param player The {@link Player} for which data will be collected.
*/
public void setPlayer(Player player) {
- Assertions.checkState(this.player == null);
+ Assertions.checkState(
+ this.player == null || mediaPeriodQueueTracker.mediaPeriodInfoQueue.isEmpty());
this.player = Assertions.checkNotNull(player);
}
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 e5ed530268..7f74216cc8 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2.analytics;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.view.Surface;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
index 230b96d01f..4e4964e817 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
@@ -15,7 +15,8 @@
*/
package com.google.android.exoplayer2.audio;
-import android.support.annotation.IntDef;
+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.audio.Ac3Util.SyncFrameInfo.StreamType;
@@ -55,10 +56,10 @@ public final class Ac3Util {
public static final int STREAM_TYPE_TYPE2 = 2;
/**
- * The sample mime type of the bitstream. One of {@link MimeTypes#AUDIO_AC3} and
- * {@link MimeTypes#AUDIO_E_AC3}.
+ * The sample mime type of the bitstream. One of {@link MimeTypes#AUDIO_AC3} and {@link
+ * MimeTypes#AUDIO_E_AC3}.
*/
- public final String mimeType;
+ @Nullable public final String mimeType;
/**
* The type of the stream if {@link #mimeType} is {@link MimeTypes#AUDIO_E_AC3}, or {@link
* #STREAM_TYPE_UNDEFINED} otherwise.
@@ -82,7 +83,7 @@ public final class Ac3Util {
public final int sampleCount;
private SyncFrameInfo(
- String mimeType,
+ @Nullable String mimeType,
@StreamType int streamType,
int channelCount,
int sampleRate,
@@ -433,6 +434,11 @@ public final class Ac3Util {
mimeType = MimeTypes.AUDIO_AC3;
data.skipBits(16 + 16); // syncword, crc1
int fscod = data.readBits(2);
+ if (fscod == 3) {
+ // fscod '11' indicates that the decoder should not attempt to decode audio. We invalidate
+ // the mime type to prevent association with a renderer.
+ mimeType = null;
+ }
int frmsizecod = data.readBits(6);
frameSize = getAc3SyncframeSize(fscod, frmsizecod);
data.skipBits(5 + 3); // bsid, bsmod
@@ -446,7 +452,8 @@ public final class Ac3Util {
if (acmod == 2) {
data.skipBits(2); // dsurmod
}
- sampleRate = SAMPLE_RATE_BY_FSCOD[fscod];
+ sampleRate =
+ fscod < SAMPLE_RATE_BY_FSCOD.length ? SAMPLE_RATE_BY_FSCOD[fscod] : Format.NO_VALUE;
sampleCount = AC3_SYNCFRAME_AUDIO_SAMPLE_COUNT;
lfeon = data.readBit();
channelCount = CHANNEL_COUNT_BY_ACMOD[acmod] + (lfeon ? 1 : 0);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
new file mode 100644
index 0000000000..74bd5bfe98
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
@@ -0,0 +1,244 @@
+/*
+ * 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.audio;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.ParsableBitArray;
+import com.google.android.exoplayer2.util.ParsableByteArray;
+import java.nio.ByteBuffer;
+
+/** Utility methods for parsing AC-4 frames, which are access units in AC-4 bitstreams. */
+public final class Ac4Util {
+
+ /** Holds sample format information as presented by a syncframe header. */
+ public static final class SyncFrameInfo {
+
+ /** The bitstream version. */
+ public final int bitstreamVersion;
+ /** The audio sampling rate in Hz. */
+ public final int sampleRate;
+ /** The number of audio channels */
+ public final int channelCount;
+ /** The size of the frame. */
+ public final int frameSize;
+ /** Number of audio samples in the frame. */
+ public final int sampleCount;
+
+ private SyncFrameInfo(
+ int bitstreamVersion, int channelCount, int sampleRate, int frameSize, int sampleCount) {
+ this.bitstreamVersion = bitstreamVersion;
+ this.channelCount = channelCount;
+ this.sampleRate = sampleRate;
+ this.frameSize = frameSize;
+ this.sampleCount = sampleCount;
+ }
+ }
+
+ public static final int AC40_SYNCWORD = 0xAC40;
+ public static final int AC41_SYNCWORD = 0xAC41;
+
+ /** The channel count of AC-4 stream. */
+ // TODO: Parse AC-4 stream channel count.
+ private static final int CHANNEL_COUNT_2 = 2;
+ /**
+ * The header size for AC-4 parser. Only needs to be as big as we need to read, not the full
+ * header size.
+ */
+ public static final int HEADER_SIZE_FOR_PARSER = 16;
+ /**
+ * Number of audio samples in the frame. Defined in IEC61937-14:2017 table 5 and 6. This table
+ * provides the number of samples per frame at the playback sampling frequency of 48 kHz. For 44.1
+ * kHz, only frame_rate_index(13) is valid and corresponding sample count is 2048.
+ */
+ private static final int[] SAMPLE_COUNT =
+ new int[] {
+ /* [ 0] 23.976 fps */ 2002,
+ /* [ 1] 24 fps */ 2000,
+ /* [ 2] 25 fps */ 1920,
+ /* [ 3] 29.97 fps */ 1601, // 1601 | 1602 | 1601 | 1602 | 1602
+ /* [ 4] 30 fps */ 1600,
+ /* [ 5] 47.95 fps */ 1001,
+ /* [ 6] 48 fps */ 1000,
+ /* [ 7] 50 fps */ 960,
+ /* [ 8] 59.94 fps */ 800, // 800 | 801 | 801 | 801 | 801
+ /* [ 9] 60 fps */ 800,
+ /* [10] 100 fps */ 480,
+ /* [11] 119.88 fps */ 400, // 400 | 400 | 401 | 400 | 401
+ /* [12] 120 fps */ 400,
+ /* [13] 23.438 fps */ 2048
+ };
+
+ /**
+ * Returns the AC-4 format given {@code data} containing the AC4SpecificBox according to ETSI TS
+ * 103 190-1 Annex E. The reading position of {@code data} will be modified.
+ *
+ * @param data The AC4SpecificBox to parse.
+ * @param trackId The track identifier to set on the format.
+ * @param language The language to set on the format.
+ * @param drmInitData {@link DrmInitData} to be included in the format.
+ * @return The AC-4 format parsed from data in the header.
+ */
+ public static Format parseAc4AnnexEFormat(
+ ParsableByteArray data, String trackId, String language, DrmInitData drmInitData) {
+ data.skipBytes(1); // ac4_dsi_version, bitstream_version[0:5]
+ int sampleRate = ((data.readUnsignedByte() & 0x20) >> 5 == 1) ? 48000 : 44100;
+ return Format.createAudioSampleFormat(
+ trackId,
+ MimeTypes.AUDIO_AC4,
+ /* codecs= */ null,
+ /* bitrate= */ Format.NO_VALUE,
+ /* maxInputSize= */ Format.NO_VALUE,
+ CHANNEL_COUNT_2,
+ sampleRate,
+ /* initializationData= */ null,
+ drmInitData,
+ /* selectionFlags= */ 0,
+ language);
+ }
+
+ /**
+ * Returns AC-4 format information given {@code data} containing a syncframe. The reading position
+ * of {@code data} will be modified.
+ *
+ * @param data The data to parse, positioned at the start of the syncframe.
+ * @return The AC-4 format data parsed from the header.
+ */
+ public static SyncFrameInfo parseAc4SyncframeInfo(ParsableBitArray data) {
+ int headerSize = 0;
+ int syncWord = data.readBits(16);
+ headerSize += 2;
+ int frameSize = data.readBits(16);
+ headerSize += 2;
+ if (frameSize == 0xFFFF) {
+ frameSize = data.readBits(24);
+ headerSize += 3; // Extended frame_size
+ }
+ frameSize += headerSize;
+ if (syncWord == AC41_SYNCWORD) {
+ frameSize += 2; // crc_word
+ }
+ int bitstreamVersion = data.readBits(2);
+ if (bitstreamVersion == 3) {
+ bitstreamVersion += readVariableBits(data, /* bitsPerRead= */ 2);
+ }
+ int sequenceCounter = data.readBits(10);
+ if (data.readBit()) { // b_wait_frames
+ if (data.readBits(3) > 0) { // wait_frames
+ data.skipBits(2); // reserved
+ }
+ }
+ int sampleRate = data.readBit() ? 48000 : 44100;
+ int frameRateIndex = data.readBits(4);
+ int sampleCount = 0;
+ if (sampleRate == 44100 && frameRateIndex == 13) {
+ sampleCount = SAMPLE_COUNT[frameRateIndex];
+ } else if (sampleRate == 48000 && frameRateIndex < SAMPLE_COUNT.length) {
+ sampleCount = SAMPLE_COUNT[frameRateIndex];
+ switch (sequenceCounter % 5) {
+ case 1: // fall through
+ case 3:
+ if (frameRateIndex == 3 || frameRateIndex == 8) {
+ sampleCount++;
+ }
+ break;
+ case 2:
+ if (frameRateIndex == 8 || frameRateIndex == 11) {
+ sampleCount++;
+ }
+ break;
+ case 4:
+ if (frameRateIndex == 3 || frameRateIndex == 8 || frameRateIndex == 11) {
+ sampleCount++;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ return new SyncFrameInfo(bitstreamVersion, CHANNEL_COUNT_2, sampleRate, frameSize, sampleCount);
+ }
+
+ /**
+ * Returns the size in bytes of the given AC-4 syncframe.
+ *
+ * @param data The syncframe to parse.
+ * @param syncword The syncword value for the syncframe.
+ * @return The syncframe size in bytes, or {@link C#LENGTH_UNSET} if the input is invalid.
+ */
+ public static int parseAc4SyncframeSize(byte[] data, int syncword) {
+ if (data.length < 7) {
+ return C.LENGTH_UNSET;
+ }
+ int headerSize = 2; // syncword
+ int frameSize = ((data[2] & 0xFF) << 8) | (data[3] & 0xFF);
+ headerSize += 2;
+ if (frameSize == 0xFFFF) {
+ frameSize = ((data[4] & 0xFF) << 16) | ((data[5] & 0xFF) << 8) | (data[6] & 0xFF);
+ headerSize += 3;
+ }
+ if (syncword == AC41_SYNCWORD) {
+ headerSize += 2;
+ }
+ frameSize += headerSize;
+ return frameSize;
+ }
+
+ /**
+ * Reads the number of audio samples represented by the given AC-4 syncframe. The buffer's
+ * position is not modified.
+ *
+ * @param buffer The {@link ByteBuffer} from which to read the syncframe.
+ * @return The number of audio samples represented by the syncframe.
+ */
+ public static int parseAc4SyncframeAudioSampleCount(ByteBuffer buffer) {
+ byte[] bufferBytes = new byte[HEADER_SIZE_FOR_PARSER];
+ int position = buffer.position();
+ buffer.get(bufferBytes);
+ buffer.position(position);
+ return parseAc4SyncframeInfo(new ParsableBitArray(bufferBytes)).sampleCount;
+ }
+
+ /** Populates {@code buffer} with an AC-4 sample header for a sample of the specified size. */
+ public static void getAc4SampleHeader(int size, ParsableByteArray buffer) {
+ // See ETSI TS 103 190-1 V1.3.1, Annex G.
+ buffer.reset(/* limit= */ 7);
+ buffer.data[0] = (byte) 0xAC;
+ buffer.data[1] = 0x40;
+ buffer.data[2] = (byte) 0xFF;
+ buffer.data[3] = (byte) 0xFF;
+ buffer.data[4] = (byte) ((size >> 16) & 0xFF);
+ buffer.data[5] = (byte) ((size >> 8) & 0xFF);
+ buffer.data[6] = (byte) (size & 0xFF);
+ }
+
+ private static int readVariableBits(ParsableBitArray data, int bitsPerRead) {
+ int value = 0;
+ while (true) {
+ value += data.readBits(bitsPerRead);
+ if (!data.readBit()) {
+ break;
+ }
+ value++;
+ value <<= bitsPerRead;
+ }
+ return value;
+ }
+
+ private Ac4Util() {}
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
index 848b3ee10c..9c63eb42c6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.audio;
import android.annotation.TargetApi;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
/**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
index 6a5e58ef2a..25c0e70ae5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
@@ -22,7 +22,10 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.media.AudioFormat;
import android.media.AudioManager;
-import android.support.annotation.Nullable;
+import android.net.Uri;
+import android.provider.Settings.Global;
+import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.util.Util;
import java.util.Arrays;
/** Represents the set of audio formats that a device is capable of playing. */
@@ -35,6 +38,17 @@ public final class AudioCapabilities {
public static final AudioCapabilities DEFAULT_AUDIO_CAPABILITIES =
new AudioCapabilities(new int[] {AudioFormat.ENCODING_PCM_16BIT}, DEFAULT_MAX_CHANNEL_COUNT);
+ /** Audio capabilities when the device specifies external surround sound. */
+ private static final AudioCapabilities EXTERNAL_SURROUND_SOUND_CAPABILITIES =
+ new AudioCapabilities(
+ new int[] {
+ AudioFormat.ENCODING_PCM_16BIT, AudioFormat.ENCODING_AC3, AudioFormat.ENCODING_E_AC3
+ },
+ DEFAULT_MAX_CHANNEL_COUNT);
+
+ /** Global settings key for devices that can specify external surround sound. */
+ private static final String EXTERNAL_SURROUND_SOUND_KEY = "external_surround_sound_enabled";
+
/**
* Returns the current audio capabilities for the device.
*
@@ -43,12 +57,18 @@ public final class AudioCapabilities {
*/
@SuppressWarnings("InlinedApi")
public static AudioCapabilities getCapabilities(Context context) {
- return getCapabilities(
- context.registerReceiver(null, new IntentFilter(AudioManager.ACTION_HDMI_AUDIO_PLUG)));
+ Intent intent =
+ context.registerReceiver(
+ /* receiver= */ null, new IntentFilter(AudioManager.ACTION_HDMI_AUDIO_PLUG));
+ return getCapabilities(context, intent);
}
@SuppressLint("InlinedApi")
- /* package */ static AudioCapabilities getCapabilities(@Nullable Intent intent) {
+ /* package */ static AudioCapabilities getCapabilities(Context context, @Nullable Intent intent) {
+ if (deviceMaySetExternalSurroundSoundGlobalSetting()
+ && Global.getInt(context.getContentResolver(), EXTERNAL_SURROUND_SOUND_KEY, 0) == 1) {
+ return EXTERNAL_SURROUND_SOUND_CAPABILITIES;
+ }
if (intent == null || intent.getIntExtra(AudioManager.EXTRA_AUDIO_PLUG_STATE, 0) == 0) {
return DEFAULT_AUDIO_CAPABILITIES;
}
@@ -58,6 +78,17 @@ public final class AudioCapabilities {
AudioManager.EXTRA_MAX_CHANNEL_COUNT, /* defaultValue= */ DEFAULT_MAX_CHANNEL_COUNT));
}
+ /**
+ * Returns the global settings {@link Uri} used by the device to specify external surround sound,
+ * or null if the device does not support this functionality.
+ */
+ @Nullable
+ /* package */ static Uri getExternalSurroundSoundGlobalSettingUri() {
+ return deviceMaySetExternalSurroundSoundGlobalSetting()
+ ? Global.getUriFor(EXTERNAL_SURROUND_SOUND_KEY)
+ : null;
+ }
+
private final int[] supportedEncodings;
private final int maxChannelCount;
@@ -124,4 +155,7 @@ public final class AudioCapabilities {
+ ", supportedEncodings=" + Arrays.toString(supportedEncodings) + "]";
}
+ private static boolean deviceMaySetExternalSurroundSoundGlobalSetting() {
+ return Util.SDK_INT >= 17 && "Amazon".equals(Util.MANUFACTURER);
+ }
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
index aa610db8b1..fe84c49656 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
@@ -16,12 +16,15 @@
package com.google.android.exoplayer2.audio;
import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.database.ContentObserver;
import android.media.AudioManager;
+import android.net.Uri;
import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util;
@@ -46,31 +49,30 @@ public final class AudioCapabilitiesReceiver {
}
private final Context context;
- private final @Nullable Handler handler;
private final Listener listener;
- private final @Nullable BroadcastReceiver receiver;
+ private final Handler handler;
+ @Nullable private final BroadcastReceiver receiver;
+ @Nullable private final ExternalSurroundSoundSettingObserver externalSurroundSoundSettingObserver;
/* package */ @Nullable AudioCapabilities audioCapabilities;
+ private boolean registered;
/**
* @param context A context for registering the receiver.
* @param listener The listener to notify when audio capabilities change.
*/
public AudioCapabilitiesReceiver(Context context, Listener listener) {
- this(context, /* handler= */ null, listener);
- }
-
- /**
- * @param context A context for registering the receiver.
- * @param handler The handler to which {@link Listener} events will be posted. If null, listener
- * methods are invoked on the main thread.
- * @param listener The listener to notify when audio capabilities change.
- */
- public AudioCapabilitiesReceiver(Context context, @Nullable Handler handler, Listener listener) {
- this.context = Assertions.checkNotNull(context);
- this.handler = handler;
+ context = context.getApplicationContext();
+ this.context = context;
this.listener = Assertions.checkNotNull(listener);
- this.receiver = Util.SDK_INT >= 21 ? new HdmiAudioPlugBroadcastReceiver() : null;
+ handler = new Handler(Util.getLooper());
+ receiver = Util.SDK_INT >= 21 ? new HdmiAudioPlugBroadcastReceiver() : null;
+ Uri externalSurroundSoundUri = AudioCapabilities.getExternalSurroundSoundGlobalSettingUri();
+ externalSurroundSoundSettingObserver =
+ externalSurroundSoundUri != null
+ ? new ExternalSurroundSoundSettingObserver(
+ handler, context.getContentResolver(), externalSurroundSoundUri)
+ : null;
}
/**
@@ -82,18 +84,21 @@ public final class AudioCapabilitiesReceiver {
*/
@SuppressWarnings("InlinedApi")
public AudioCapabilities register() {
+ if (registered) {
+ return Assertions.checkNotNull(audioCapabilities);
+ }
+ registered = true;
+ if (externalSurroundSoundSettingObserver != null) {
+ externalSurroundSoundSettingObserver.register();
+ }
Intent stickyIntent = null;
if (receiver != null) {
IntentFilter intentFilter = new IntentFilter(AudioManager.ACTION_HDMI_AUDIO_PLUG);
- if (handler != null) {
- stickyIntent =
- context.registerReceiver(
- receiver, intentFilter, /* broadcastPermission= */ null, handler);
- } else {
- stickyIntent = context.registerReceiver(receiver, intentFilter);
- }
+ stickyIntent =
+ context.registerReceiver(
+ receiver, intentFilter, /* broadcastPermission= */ null, handler);
}
- audioCapabilities = AudioCapabilities.getCapabilities(stickyIntent);
+ audioCapabilities = AudioCapabilities.getCapabilities(context, stickyIntent);
return audioCapabilities;
}
@@ -102,9 +107,24 @@ public final class AudioCapabilitiesReceiver {
* changes occur.
*/
public void unregister() {
+ if (!registered) {
+ return;
+ }
+ audioCapabilities = null;
if (receiver != null) {
context.unregisterReceiver(receiver);
}
+ if (externalSurroundSoundSettingObserver != null) {
+ externalSurroundSoundSettingObserver.unregister();
+ }
+ registered = false;
+ }
+
+ private void onNewAudioCapabilities(AudioCapabilities newAudioCapabilities) {
+ if (registered && !newAudioCapabilities.equals(audioCapabilities)) {
+ audioCapabilities = newAudioCapabilities;
+ listener.onAudioCapabilitiesChanged(newAudioCapabilities);
+ }
}
private final class HdmiAudioPlugBroadcastReceiver extends BroadcastReceiver {
@@ -112,14 +132,35 @@ public final class AudioCapabilitiesReceiver {
@Override
public void onReceive(Context context, Intent intent) {
if (!isInitialStickyBroadcast()) {
- AudioCapabilities newAudioCapabilities = AudioCapabilities.getCapabilities(intent);
- if (!newAudioCapabilities.equals(audioCapabilities)) {
- audioCapabilities = newAudioCapabilities;
- listener.onAudioCapabilitiesChanged(newAudioCapabilities);
- }
+ onNewAudioCapabilities(AudioCapabilities.getCapabilities(context, intent));
}
}
+ }
+ private final class ExternalSurroundSoundSettingObserver extends ContentObserver {
+
+ private final ContentResolver resolver;
+ private final Uri settingUri;
+
+ public ExternalSurroundSoundSettingObserver(
+ Handler handler, ContentResolver resolver, Uri settingUri) {
+ super(handler);
+ this.resolver = resolver;
+ this.settingUri = settingUri;
+ }
+
+ public void register() {
+ resolver.registerContentObserver(settingUri, /* notifyForDescendants= */ false, this);
+ }
+
+ public void unregister() {
+ resolver.unregisterContentObserver(this);
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ onNewAudioCapabilities(AudioCapabilities.getCapabilities(context));
+ }
}
}
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 7146426a4a..3cc05e87df 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
@@ -18,9 +18,10 @@ package com.google.android.exoplayer2.audio;
import android.content.Context;
import android.media.AudioFocusRequest;
import android.media.AudioManager;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.Player;
@@ -99,7 +100,7 @@ public final class AudioFocusManager {
private static final float VOLUME_MULTIPLIER_DUCK = 0.2f;
private static final float VOLUME_MULTIPLIER_DEFAULT = 1.0f;
- private final @Nullable AudioManager audioManager;
+ private final AudioManager audioManager;
private final AudioFocusListener focusListener;
private final PlayerControl playerControl;
private @Nullable AudioAttributes audioAttributes;
@@ -117,12 +118,9 @@ public final class AudioFocusManager {
* @param context The current context.
* @param playerControl A {@link PlayerControl} to handle commands from this instance.
*/
- public AudioFocusManager(@Nullable Context context, PlayerControl playerControl) {
+ public AudioFocusManager(Context context, PlayerControl playerControl) {
this.audioManager =
- context == null
- ? null
- : (AudioManager)
- context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
+ (AudioManager) context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
this.playerControl = playerControl;
this.focusListener = new AudioFocusListener();
this.audioFocusState = AUDIO_FOCUS_STATE_NO_FOCUS;
@@ -142,14 +140,9 @@ public final class AudioFocusManager {
* @param playerState The current player state; {@link ExoPlayer#getPlaybackState()}.
* @return A {@link PlayerCommand} to execute on the player.
*/
- public @PlayerCommand int setAudioAttributes(
+ @PlayerCommand
+ public int setAudioAttributes(
@Nullable AudioAttributes audioAttributes, boolean playWhenReady, int playerState) {
- if (this.audioAttributes == null && audioAttributes == null) {
- return playWhenReady ? PLAYER_COMMAND_PLAY_WHEN_READY : PLAYER_COMMAND_DO_NOT_PLAY;
- }
-
- Assertions.checkNotNull(
- audioManager, "SimpleExoPlayer must be created with a context to handle audio focus.");
if (!Util.areEqual(this.audioAttributes, audioAttributes)) {
this.audioAttributes = audioAttributes;
focusGain = convertAudioAttributesToFocusGain(audioAttributes);
@@ -174,11 +167,8 @@ public final class AudioFocusManager {
* @param playWhenReady The current state of {@link ExoPlayer#getPlayWhenReady()}.
* @return A {@link PlayerCommand} to execute on the player.
*/
- public @PlayerCommand int handlePrepare(boolean playWhenReady) {
- if (audioManager == null) {
- return PLAYER_COMMAND_PLAY_WHEN_READY;
- }
-
+ @PlayerCommand
+ public int handlePrepare(boolean playWhenReady) {
return playWhenReady ? requestAudioFocus() : PLAYER_COMMAND_DO_NOT_PLAY;
}
@@ -189,11 +179,8 @@ public final class AudioFocusManager {
* @param playerState The current state of the player.
* @return A {@link PlayerCommand} to execute on the player.
*/
- public @PlayerCommand int handleSetPlayWhenReady(boolean playWhenReady, int playerState) {
- if (audioManager == null) {
- return PLAYER_COMMAND_PLAY_WHEN_READY;
- }
-
+ @PlayerCommand
+ public int handleSetPlayWhenReady(boolean playWhenReady, int playerState) {
if (!playWhenReady) {
abandonAudioFocus();
return PLAYER_COMMAND_DO_NOT_PLAY;
@@ -204,21 +191,23 @@ public final class AudioFocusManager {
/** Called by the player as part of {@link ExoPlayer#stop(boolean)}. */
public void handleStop() {
- if (audioManager == null) {
- return;
- }
-
abandonAudioFocus(/* forceAbandon= */ true);
}
// Internal methods.
+ @VisibleForTesting
+ /* package */ AudioManager.OnAudioFocusChangeListener getFocusListener() {
+ return focusListener;
+ }
+
@PlayerCommand
private int handleIdle(boolean playWhenReady) {
return playWhenReady ? PLAYER_COMMAND_PLAY_WHEN_READY : PLAYER_COMMAND_DO_NOT_PLAY;
}
- private @PlayerCommand int requestAudioFocus() {
+ @PlayerCommand
+ private int requestAudioFocus() {
int focusRequestResult;
if (focusGain == C.AUDIOFOCUS_NONE) {
@@ -271,7 +260,6 @@ public final class AudioFocusManager {
}
private int requestAudioFocusDefault() {
- AudioManager audioManager = Assertions.checkNotNull(this.audioManager);
return audioManager.requestAudioFocus(
focusListener,
Util.getStreamTypeForAudioUsage(Assertions.checkNotNull(audioAttributes).usage),
@@ -296,17 +284,17 @@ public final class AudioFocusManager {
rebuildAudioFocusRequest = false;
}
- return Assertions.checkNotNull(audioManager).requestAudioFocus(audioFocusRequest);
+ return audioManager.requestAudioFocus(audioFocusRequest);
}
private void abandonAudioFocusDefault() {
- Assertions.checkNotNull(audioManager).abandonAudioFocus(focusListener);
+ audioManager.abandonAudioFocus(focusListener);
}
@RequiresApi(26)
private void abandonAudioFocusV26() {
if (audioFocusRequest != null) {
- Assertions.checkNotNull(audioManager).abandonAudioFocusRequest(audioFocusRequest);
+ audioManager.abandonAudioFocusRequest(audioFocusRequest);
}
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
index f82be31f72..1bf141cb43 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
@@ -24,11 +24,10 @@ import java.nio.ByteOrder;
* modifying its channel count, encoding and/or sample rate.
*
* Call {@link #configure(int, int, int)} to configure the processor to receive input audio, then
- * call {@link #isActive()} to determine whether the processor is active. {@link
- * #queueInput(ByteBuffer)}, {@link #queueEndOfStream()}, {@link #getOutput()}, {@link #isEnded()},
- * {@link #getOutputChannelCount()}, {@link #getOutputEncoding()} and {@link
- * #getOutputSampleRateHz()} may only be called if the processor is active. Call {@link #reset()} to
- * reset the processor to its unconfigured state and release any resources.
+ * call {@link #isActive()} to determine whether the processor is active in the new configuration.
+ * {@link #queueInput(ByteBuffer)}, {@link #getOutputChannelCount()}, {@link #getOutputEncoding()}
+ * and {@link #getOutputSampleRateHz()} may only be called if the processor is active. Call {@link
+ * #reset()} to reset the processor to its unconfigured state and release any resources.
*
*
In addition to being able to modify the format of audio, implementations may allow parameters
* to be set that affect the output audio and whether the processor is active/inactive.
@@ -38,7 +37,8 @@ public interface AudioProcessor {
/** Exception thrown when a processor can't be configured for a given input audio format. */
final class UnhandledFormatException extends Exception {
- public UnhandledFormatException(int sampleRateHz, int channelCount, @C.Encoding int encoding) {
+ public UnhandledFormatException(
+ int sampleRateHz, int channelCount, @C.PcmEncoding int encoding) {
super("Unhandled format: " + sampleRateHz + " Hz, " + channelCount + " channels in encoding "
+ encoding);
}
@@ -49,18 +49,24 @@ public interface AudioProcessor {
ByteBuffer EMPTY_BUFFER = ByteBuffer.allocateDirect(0).order(ByteOrder.nativeOrder());
/**
- * Configures the processor to process input audio with the specified format and returns whether
- * to {@link #flush()} it. After calling this method, if the processor is active, {@link
- * #getOutputSampleRateHz()}, {@link #getOutputChannelCount()} and {@link #getOutputEncoding()}
- * return its output format.
+ * Configures the processor to process input audio with the specified format. After calling this
+ * method, call {@link #isActive()} to determine whether the audio processor is active.
+ *
+ *
If the audio processor is active after configuration, call {@link #getOutputSampleRateHz()},
+ * {@link #getOutputChannelCount()} and {@link #getOutputEncoding()} to get its new output format.
+ *
+ *
If this method returns {@code true}, it is necessary to {@link #flush()} the processor
+ * before queueing more data, but you can (optionally) first drain output in the previous
+ * configuration by calling {@link #queueEndOfStream()} and {@link #getOutput()}. If this method
+ * returns {@code false}, it is safe to queue new input immediately.
*
* @param sampleRateHz The sample rate of input audio in Hz.
* @param channelCount The number of interleaved channels in input audio.
* @param encoding The encoding of input audio.
- * @return Whether to {@link #flush()} the processor.
+ * @return Whether the processor must be {@link #flush() flushed} before queueing more input.
* @throws UnhandledFormatException Thrown if the specified format can't be handled as input.
*/
- boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding)
+ boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
throws UnhandledFormatException;
/** Returns whether the processor is configured and will process input buffers. */
@@ -68,23 +74,20 @@ public interface AudioProcessor {
/**
* Returns the number of audio channels in the data output by the processor. The value may change
- * as a result of calling {@link #configure(int, int, int)} and is undefined if the instance is
- * not active.
+ * as a result of calling {@link #configure(int, int, int)}.
*/
int getOutputChannelCount();
/**
* Returns the audio encoding used in the data output by the processor. The value may change as a
- * result of calling {@link #configure(int, int, int)} and is undefined if the instance is not
- * active.
+ * result of calling {@link #configure(int, int, int)}.
*/
- @C.Encoding
+ @C.PcmEncoding
int getOutputEncoding();
/**
* Returns the sample rate of audio output by the processor, in hertz. The value may change as a
- * result of calling {@link #configure(int, int, int)} and is undefined if the instance is not
- * active.
+ * result of calling {@link #configure(int, int, int)}.
*/
int getOutputSampleRateHz();
@@ -123,7 +126,10 @@ public interface AudioProcessor {
*/
boolean isEnded();
- /** Clears any state in preparation for receiving a new stream of input buffers. */
+ /**
+ * Clears any buffered data and pending output. If the audio processor is active, also prepares
+ * the audio processor to receive a new stream of input in the last configured (pending) format.
+ */
void flush();
/** Resets the processor to its unconfigured state. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
index eff7bc8de2..042738b4f6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.audio;
import android.os.Handler;
import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.Renderer;
@@ -147,6 +147,7 @@ public interface AudioRendererEventListener {
* Invokes {@link AudioRendererEventListener#onAudioDisabled(DecoderCounters)}.
*/
public void disabled(final DecoderCounters counters) {
+ counters.ensureUpdated();
if (listener != null) {
handler.post(
() -> {
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 24d218bf3c..393380453c 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
@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.audio;
import android.media.AudioTrack;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.PlaybackParameters;
@@ -24,29 +24,30 @@ import java.nio.ByteBuffer;
/**
* A sink that consumes audio data.
- *
- * Before starting playback, specify the input audio format by calling
- * {@link #configure(int, int, int, int, int[], int, int)}.
- *
- * Call {@link #handleBuffer(ByteBuffer, long)} to write data, and {@link #handleDiscontinuity()}
+ *
+ *
Before starting playback, specify the input audio format by calling {@link #configure(int,
+ * int, int, int, int[], int, int)}.
+ *
+ *
Call {@link #handleBuffer(ByteBuffer, long)} to write data, and {@link #handleDiscontinuity()}
* when the data being fed is discontinuous. Call {@link #play()} to start playing the written data.
- *
- * Call {@link #configure(int, int, int, int, int[], int, int)} whenever the input format changes.
- * The sink will be reinitialized on the next call to {@link #handleBuffer(ByteBuffer, long)}.
- *
- * Call {@link #reset()} to prepare the sink to receive audio data from a new playback position.
- *
- * Call {@link #playToEndOfStream()} repeatedly to play out all data when no more input buffers will
- * be provided via {@link #handleBuffer(ByteBuffer, long)} until the next {@link #reset()}. Call
- * {@link #release()} when the instance is no longer required.
- *
- * The implementation may be backed by a platform {@link AudioTrack}. In this case,
- * {@link #setAudioSessionId(int)}, {@link #setAudioAttributes(AudioAttributes)},
- * {@link #enableTunnelingV21(int)} and/or {@link #disableTunneling()} may be called before writing
- * data to the sink. These methods may also be called after writing data to the sink, in which case
- * it will be reinitialized as required. For implementations that are not based on platform
- * {@link AudioTrack}s, calling methods relating to audio sessions, audio attributes, and tunneling
- * may have no effect.
+ *
+ *
Call {@link #configure(int, int, int, int, int[], int, int)} whenever the input format
+ * changes. The sink will be reinitialized on the next call to {@link #handleBuffer(ByteBuffer,
+ * long)}.
+ *
+ *
Call {@link #flush()} to prepare the sink to receive audio data from a new playback position.
+ *
+ *
Call {@link #playToEndOfStream()} repeatedly to play out all data when no more input buffers
+ * will be provided via {@link #handleBuffer(ByteBuffer, long)} until the next {@link #flush()}.
+ * Call {@link #reset()} when the instance is no longer required.
+ *
+ *
The implementation may be backed by a platform {@link AudioTrack}. In this case, {@link
+ * #setAudioSessionId(int)}, {@link #setAudioAttributes(AudioAttributes)}, {@link
+ * #enableTunnelingV21(int)} and/or {@link #disableTunneling()} may be called before writing data to
+ * the sink. These methods may also be called after writing data to the sink, in which case it will
+ * be reinitialized as required. For implementations that are not based on platform {@link
+ * AudioTrack}s, calling methods relating to audio sessions, audio attributes, and tunneling may
+ * have no effect.
*/
public interface AudioSink {
@@ -199,7 +200,7 @@ public interface AudioSink {
* @param trimStartFrames The number of audio frames to trim from the start of data written to the
* sink after this call.
* @param trimEndFrames The number of audio frames to trim from data written to the sink
- * immediately preceding the next call to {@link #reset()} or this method.
+ * immediately preceding the next call to {@link #flush()} or this method.
* @throws ConfigurationException If an error occurs configuring the sink.
*/
void configure(
@@ -225,11 +226,11 @@ public interface AudioSink {
* ending at its limit (exclusive). The position of the {@link ByteBuffer} is advanced by the
* number of bytes that were handled. {@link Listener#onPositionDiscontinuity()} will be called if
* {@code presentationTimeUs} is discontinuous with the last buffer handled since the last reset.
- *
- * Returns whether the data was handled in full. If the data was not handled in full then the same
- * {@link ByteBuffer} must be provided to subsequent calls until it has been fully consumed,
- * except in the case of an intervening call to {@link #reset()} (or to
- * {@link #configure(int, int, int, int, int[], int, int)} that causes the sink to be reset).
+ *
+ *
Returns whether the data was handled in full. If the data was not handled in full then the
+ * same {@link ByteBuffer} must be provided to subsequent calls until it has been fully consumed,
+ * except in the case of an intervening call to {@link #flush()} (or to {@link #configure(int,
+ * int, int, int, int[], int, int)} that causes the sink to be flushed).
*
* @param buffer The buffer containing audio data.
* @param presentationTimeUs The presentation timestamp of the buffer in microseconds.
@@ -318,15 +319,12 @@ public interface AudioSink {
void pause();
/**
- * Resets the sink, after which it is ready to receive buffers from a new playback position.
- *
- * The audio session may remain active until {@link #release()} is called.
+ * Flushes the sink, after which it is ready to receive buffers from a new playback position.
+ *
+ *
The audio session may remain active until {@link #reset()} is called.
*/
+ void flush();
+
+ /** Resets the renderer, releasing any resources that it currently holds. */
void reset();
-
- /**
- * Releases any resources associated with this instance.
- */
- void release();
-
}
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 569260efeb..d43972d7b0 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
@@ -18,8 +18,8 @@ package com.google.android.exoplayer2.audio;
import android.annotation.TargetApi;
import android.media.AudioTimestamp;
import android.media.AudioTrack;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
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 62b120f00a..e87e49d2da 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
@@ -20,8 +20,8 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
import android.media.AudioTimestamp;
import android.media.AudioTrack;
import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util;
@@ -517,7 +517,7 @@ import java.lang.reflect.Method;
rawPlaybackHeadPosition += passthroughWorkaroundPauseOffset;
}
- if (Util.SDK_INT <= 28) {
+ if (Util.SDK_INT <= 29) {
if (rawPlaybackHeadPosition == 0
&& lastRawPlaybackHeadPosition > 0
&& state == PLAYSTATE_PLAYING) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
index 7462a9c4b0..968d8acebd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.audio;
import android.media.AudioTrack;
import android.media.audiofx.AudioEffect;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
/**
* Represents auxiliary effect information, which can be used to attach an auxiliary effect to an
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java
new file mode 100644
index 0000000000..a3a85bb43a
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java
@@ -0,0 +1,155 @@
+/*
+ * 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.audio;
+
+import androidx.annotation.CallSuper;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/**
+ * Base class for audio processors that keep an output buffer and an internal buffer that is reused
+ * whenever input is queued.
+ */
+public abstract class BaseAudioProcessor implements AudioProcessor {
+
+ /** The configured input sample rate, in Hertz, or {@link Format#NO_VALUE} if not configured. */
+ protected int sampleRateHz;
+ /** The configured input channel count, or {@link Format#NO_VALUE} if not configured. */
+ protected int channelCount;
+ /** The configured input encoding, or {@link Format#NO_VALUE} if not configured. */
+ @C.PcmEncoding protected int encoding;
+
+ private ByteBuffer buffer;
+ private ByteBuffer outputBuffer;
+ private boolean inputEnded;
+
+ public BaseAudioProcessor() {
+ buffer = EMPTY_BUFFER;
+ outputBuffer = EMPTY_BUFFER;
+ channelCount = Format.NO_VALUE;
+ sampleRateHz = Format.NO_VALUE;
+ encoding = Format.NO_VALUE;
+ }
+
+ @Override
+ public boolean isActive() {
+ return sampleRateHz != Format.NO_VALUE;
+ }
+
+ @Override
+ public int getOutputChannelCount() {
+ return channelCount;
+ }
+
+ @Override
+ public int getOutputEncoding() {
+ return encoding;
+ }
+
+ @Override
+ public int getOutputSampleRateHz() {
+ return sampleRateHz;
+ }
+
+ @Override
+ public final void queueEndOfStream() {
+ inputEnded = true;
+ onQueueEndOfStream();
+ }
+
+ @CallSuper
+ @Override
+ public ByteBuffer getOutput() {
+ ByteBuffer outputBuffer = this.outputBuffer;
+ this.outputBuffer = EMPTY_BUFFER;
+ return outputBuffer;
+ }
+
+ @CallSuper
+ @SuppressWarnings("ReferenceEquality")
+ @Override
+ public boolean isEnded() {
+ return inputEnded && outputBuffer == EMPTY_BUFFER;
+ }
+
+ @Override
+ public final void flush() {
+ outputBuffer = EMPTY_BUFFER;
+ inputEnded = false;
+ onFlush();
+ }
+
+ @Override
+ public final void reset() {
+ flush();
+ buffer = EMPTY_BUFFER;
+ sampleRateHz = Format.NO_VALUE;
+ channelCount = Format.NO_VALUE;
+ encoding = Format.NO_VALUE;
+ onReset();
+ }
+
+ /** Sets the input format of this processor, returning whether the input format has changed. */
+ protected final boolean setInputFormat(
+ int sampleRateHz, int channelCount, @C.PcmEncoding int encoding) {
+ if (sampleRateHz == this.sampleRateHz
+ && channelCount == this.channelCount
+ && encoding == this.encoding) {
+ return false;
+ }
+ this.sampleRateHz = sampleRateHz;
+ this.channelCount = channelCount;
+ this.encoding = encoding;
+ return true;
+ }
+
+ /**
+ * Replaces the current output buffer with a buffer of at least {@code count} bytes and returns
+ * it. Callers should write to the returned buffer then {@link ByteBuffer#flip()} it so it can be
+ * read via {@link #getOutput()}.
+ */
+ protected final ByteBuffer replaceOutputBuffer(int count) {
+ if (buffer.capacity() < count) {
+ buffer = ByteBuffer.allocateDirect(count).order(ByteOrder.nativeOrder());
+ } else {
+ buffer.clear();
+ }
+ outputBuffer = buffer;
+ return buffer;
+ }
+
+ /** Returns whether the current output buffer has any data remaining. */
+ protected final boolean hasPendingOutput() {
+ return outputBuffer.hasRemaining();
+ }
+
+ /** Called when the end-of-stream is queued to the processor. */
+ protected void onQueueEndOfStream() {
+ // Do nothing.
+ }
+
+ /** Called when the processor is flushed, directly or as part of resetting. */
+ protected void onFlush() {
+ // Do nothing.
+ }
+
+ /** Called when the processor is reset. */
+ protected void onReset() {
+ // Do nothing.
+ }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
index e53eb08c83..ea155323bb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
@@ -15,38 +15,22 @@
*/
package com.google.android.exoplayer2.audio;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.C.Encoding;
-import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Assertions;
import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
import java.util.Arrays;
/**
* An {@link AudioProcessor} that applies a mapping from input channels onto specified output
* channels. This can be used to reorder, duplicate or discard channels.
*/
-/* package */ final class ChannelMappingAudioProcessor implements AudioProcessor {
+/* package */ final class ChannelMappingAudioProcessor extends BaseAudioProcessor {
- private int channelCount;
- private int sampleRateHz;
- private @Nullable int[] pendingOutputChannels;
+ @Nullable private int[] pendingOutputChannels;
private boolean active;
- private @Nullable int[] outputChannels;
- private ByteBuffer buffer;
- private ByteBuffer outputBuffer;
- private boolean inputEnded;
-
- /** Creates a new processor that applies a channel mapping. */
- public ChannelMappingAudioProcessor() {
- buffer = EMPTY_BUFFER;
- outputBuffer = EMPTY_BUFFER;
- channelCount = Format.NO_VALUE;
- sampleRateHz = Format.NO_VALUE;
- }
+ @Nullable private int[] outputChannels;
/**
* Resets the channel mapping. After calling this method, call {@link #configure(int, int, int)}
@@ -61,10 +45,12 @@ import java.util.Arrays;
}
@Override
- public boolean configure(int sampleRateHz, int channelCount, @Encoding int encoding)
+ public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
throws UnhandledFormatException {
boolean outputChannelsChanged = !Arrays.equals(pendingOutputChannels, outputChannels);
outputChannels = pendingOutputChannels;
+
+ int[] outputChannels = this.outputChannels;
if (outputChannels == null) {
active = false;
return outputChannelsChanged;
@@ -72,12 +58,9 @@ import java.util.Arrays;
if (encoding != C.ENCODING_PCM_16BIT) {
throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
}
- if (!outputChannelsChanged && this.sampleRateHz == sampleRateHz
- && this.channelCount == channelCount) {
+ if (!outputChannelsChanged && !setInputFormat(sampleRateHz, channelCount, encoding)) {
return false;
}
- this.sampleRateHz = sampleRateHz;
- this.channelCount = channelCount;
active = channelCount != outputChannels.length;
for (int i = 0; i < outputChannels.length; i++) {
@@ -100,28 +83,14 @@ import java.util.Arrays;
return outputChannels == null ? channelCount : outputChannels.length;
}
- @Override
- public int getOutputEncoding() {
- return C.ENCODING_PCM_16BIT;
- }
-
- @Override
- public int getOutputSampleRateHz() {
- return sampleRateHz;
- }
-
@Override
public void queueInput(ByteBuffer inputBuffer) {
- Assertions.checkState(outputChannels != null);
+ int[] outputChannels = Assertions.checkNotNull(this.outputChannels);
int position = inputBuffer.position();
int limit = inputBuffer.limit();
int frameCount = (limit - position) / (2 * channelCount);
int outputSize = frameCount * outputChannels.length * 2;
- if (buffer.capacity() < outputSize) {
- buffer = ByteBuffer.allocateDirect(outputSize).order(ByteOrder.nativeOrder());
- } else {
- buffer.clear();
- }
+ ByteBuffer buffer = replaceOutputBuffer(outputSize);
while (position < limit) {
for (int channelIndex : outputChannels) {
buffer.putShort(inputBuffer.getShort(position + 2 * channelIndex));
@@ -130,39 +99,10 @@ import java.util.Arrays;
}
inputBuffer.position(limit);
buffer.flip();
- outputBuffer = buffer;
}
@Override
- public void queueEndOfStream() {
- inputEnded = true;
- }
-
- @Override
- public ByteBuffer getOutput() {
- ByteBuffer outputBuffer = this.outputBuffer;
- this.outputBuffer = EMPTY_BUFFER;
- return outputBuffer;
- }
-
- @SuppressWarnings("ReferenceEquality")
- @Override
- public boolean isEnded() {
- return inputEnded && outputBuffer == EMPTY_BUFFER;
- }
-
- @Override
- public void flush() {
- outputBuffer = EMPTY_BUFFER;
- inputEnded = false;
- }
-
- @Override
- public void reset() {
- flush();
- buffer = EMPTY_BUFFER;
- channelCount = Format.NO_VALUE;
- sampleRateHz = Format.NO_VALUE;
+ protected void onReset() {
outputChannels = null;
pendingOutputChannels = null;
active = false;
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 7ee25d07d1..ffcd893e7b 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
@@ -22,8 +22,8 @@ import android.media.AudioManager;
import android.media.AudioTrack;
import android.os.ConditionVariable;
import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+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.PlaybackParameters;
@@ -242,18 +242,11 @@ public final class DefaultAudioSink implements AudioSink {
/** Used to keep the audio session active on pre-V21 builds (see {@link #initialize()}). */
@Nullable private AudioTrack keepSessionIdAudioTrack;
+ @Nullable private Configuration pendingConfiguration;
+ private Configuration configuration;
private AudioTrack audioTrack;
- private boolean isInputPcm;
- private boolean shouldConvertHighResIntPcmToFloat;
- private int inputSampleRate;
- private int outputSampleRate;
- private int outputChannelConfig;
- private @C.Encoding int outputEncoding;
- private AudioAttributes audioAttributes;
- private boolean processingEnabled;
- private boolean canApplyPlaybackParameters;
- private int bufferSize;
+ private AudioAttributes audioAttributes;
@Nullable private PlaybackParameters afterDrainPlaybackParameters;
private PlaybackParameters playbackParameters;
private long playbackParametersOffsetUs;
@@ -262,10 +255,8 @@ public final class DefaultAudioSink implements AudioSink {
@Nullable private ByteBuffer avSyncHeader;
private int bytesUntilNextAvSync;
- private int pcmFrameSize;
private long submittedPcmBytes;
private long submittedEncodedFrames;
- private int outputPcmFrameSize;
private long writtenPcmBytes;
private long writtenEncodedFrames;
private int framesPerEncodedSample;
@@ -354,8 +345,7 @@ public final class DefaultAudioSink implements AudioSink {
channelMappingAudioProcessor,
trimmingAudioProcessor);
Collections.addAll(toIntPcmAudioProcessors, audioProcessorChain.getAudioProcessors());
- toIntPcmAvailableAudioProcessors =
- toIntPcmAudioProcessors.toArray(new AudioProcessor[toIntPcmAudioProcessors.size()]);
+ toIntPcmAvailableAudioProcessors = toIntPcmAudioProcessors.toArray(new AudioProcessor[0]);
toFloatPcmAvailableAudioProcessors = new AudioProcessor[] {new FloatResamplingAudioProcessor()};
volume = 1.0f;
startMediaTimeState = START_NOT_SET;
@@ -398,7 +388,7 @@ public final class DefaultAudioSink implements AudioSink {
return CURRENT_POSITION_NOT_SET;
}
long positionUs = audioTrackPositionTracker.getCurrentPositionUs(sourceEnded);
- positionUs = Math.min(positionUs, framesToDurationUs(getWrittenFrames()));
+ positionUs = Math.min(positionUs, configuration.framesToDurationUs(getWrittenFrames()));
return startMediaTimeUs + applySkipping(applySpeedup(positionUs));
}
@@ -412,23 +402,7 @@ public final class DefaultAudioSink implements AudioSink {
int trimStartFrames,
int trimEndFrames)
throws ConfigurationException {
- boolean flush = false;
- this.inputSampleRate = inputSampleRate;
- int channelCount = inputChannelCount;
- int sampleRate = inputSampleRate;
- isInputPcm = Util.isEncodingLinearPcm(inputEncoding);
- shouldConvertHighResIntPcmToFloat =
- enableConvertHighResIntPcmToFloat
- && supportsOutput(channelCount, C.ENCODING_PCM_FLOAT)
- && Util.isEncodingHighResolutionIntegerPcm(inputEncoding);
- if (isInputPcm) {
- pcmFrameSize = Util.getPcmFrameSize(inputEncoding, channelCount);
- }
- @C.Encoding int encoding = inputEncoding;
- boolean processingEnabled = isInputPcm && inputEncoding != C.ENCODING_PCM_FLOAT;
- canApplyPlaybackParameters = processingEnabled && !shouldConvertHighResIntPcmToFloat;
-
- if (Util.SDK_INT < 21 && channelCount == 8 && outputChannels == null) {
+ if (Util.SDK_INT < 21 && inputChannelCount == 8 && outputChannels == null) {
// AudioTrack doesn't support 8 channel output before Android L. Discard the last two (side)
// channels to give a 6 channel stream that is supported.
outputChannels = new int[6];
@@ -437,12 +411,26 @@ public final class DefaultAudioSink implements AudioSink {
}
}
+ boolean isInputPcm = Util.isEncodingLinearPcm(inputEncoding);
+ boolean processingEnabled = isInputPcm && inputEncoding != C.ENCODING_PCM_FLOAT;
+ int sampleRate = inputSampleRate;
+ int channelCount = inputChannelCount;
+ @C.Encoding int encoding = inputEncoding;
+ boolean shouldConvertHighResIntPcmToFloat =
+ enableConvertHighResIntPcmToFloat
+ && supportsOutput(inputChannelCount, C.ENCODING_PCM_FLOAT)
+ && Util.isEncodingHighResolutionIntegerPcm(inputEncoding);
+ AudioProcessor[] availableAudioProcessors =
+ shouldConvertHighResIntPcmToFloat
+ ? toFloatPcmAvailableAudioProcessors
+ : toIntPcmAvailableAudioProcessors;
+ boolean flushAudioProcessors = false;
if (processingEnabled) {
trimmingAudioProcessor.setTrimFrameCount(trimStartFrames, trimEndFrames);
channelMappingAudioProcessor.setChannelMap(outputChannels);
- for (AudioProcessor audioProcessor : getAvailableAudioProcessors()) {
+ for (AudioProcessor audioProcessor : availableAudioProcessors) {
try {
- flush |= audioProcessor.configure(sampleRate, channelCount, encoding);
+ flushAudioProcessors |= audioProcessor.configure(sampleRate, channelCount, encoding);
} catch (AudioProcessor.UnhandledFormatException e) {
throw new ConfigurationException(e);
}
@@ -454,53 +442,48 @@ public final class DefaultAudioSink implements AudioSink {
}
}
- int channelConfig = getChannelConfig(channelCount, isInputPcm);
- if (channelConfig == AudioFormat.CHANNEL_INVALID) {
+ int outputChannelConfig = getChannelConfig(channelCount, isInputPcm);
+ if (outputChannelConfig == AudioFormat.CHANNEL_INVALID) {
throw new ConfigurationException("Unsupported channel count: " + channelCount);
}
- if (!flush
- && isInitialized()
- && outputEncoding == encoding
- && outputSampleRate == sampleRate
- && outputChannelConfig == channelConfig) {
- // We already have an audio track with the correct sample rate, channel config and encoding.
- return;
- }
-
- reset();
-
- this.processingEnabled = processingEnabled;
- outputSampleRate = sampleRate;
- outputChannelConfig = channelConfig;
- outputEncoding = encoding;
- outputPcmFrameSize =
- isInputPcm ? Util.getPcmFrameSize(outputEncoding, channelCount) : C.LENGTH_UNSET;
- bufferSize = specifiedBufferSize != 0 ? specifiedBufferSize : getDefaultBufferSize();
- }
-
- private int getDefaultBufferSize() {
- if (isInputPcm) {
- int minBufferSize =
- AudioTrack.getMinBufferSize(outputSampleRate, outputChannelConfig, outputEncoding);
- Assertions.checkState(minBufferSize != ERROR_BAD_VALUE);
- int multipliedBufferSize = minBufferSize * BUFFER_MULTIPLICATION_FACTOR;
- int minAppBufferSize = (int) durationUsToFrames(MIN_BUFFER_DURATION_US) * outputPcmFrameSize;
- int maxAppBufferSize = (int) Math.max(minBufferSize,
- durationUsToFrames(MAX_BUFFER_DURATION_US) * outputPcmFrameSize);
- return Util.constrainValue(multipliedBufferSize, minAppBufferSize, maxAppBufferSize);
- } else {
- int rate = getMaximumEncodedRateBytesPerSecond(outputEncoding);
- if (outputEncoding == C.ENCODING_AC3) {
- rate *= AC3_BUFFER_MULTIPLICATION_FACTOR;
+ int inputPcmFrameSize =
+ isInputPcm ? Util.getPcmFrameSize(inputEncoding, inputChannelCount) : C.LENGTH_UNSET;
+ int outputPcmFrameSize =
+ isInputPcm ? Util.getPcmFrameSize(encoding, channelCount) : C.LENGTH_UNSET;
+ boolean canApplyPlaybackParameters = processingEnabled && !shouldConvertHighResIntPcmToFloat;
+ Configuration pendingConfiguration =
+ new Configuration(
+ isInputPcm,
+ inputPcmFrameSize,
+ inputSampleRate,
+ outputPcmFrameSize,
+ sampleRate,
+ outputChannelConfig,
+ encoding,
+ specifiedBufferSize,
+ processingEnabled,
+ canApplyPlaybackParameters,
+ availableAudioProcessors);
+ if (isInitialized()) {
+ if (!pendingConfiguration.canReuseAudioTrack(configuration)) {
+ // We need a new AudioTrack before we can handle more input. We should first stop() the
+ // track and wait for audio to play out (tracked by [Internal: b/33161961]), but for now we
+ // discard the audio track immediately.
+ flush();
+ } else if (flushAudioProcessors) {
+ // We don't need a new AudioTrack but audio processors need to be drained and flushed.
+ this.pendingConfiguration = pendingConfiguration;
+ return;
}
- return (int) (PASSTHROUGH_BUFFER_DURATION_US * rate / C.MICROS_PER_SECOND);
}
+ configuration = pendingConfiguration;
}
private void setupAudioProcessors() {
+ AudioProcessor[] audioProcessors = configuration.availableAudioProcessors;
ArrayList newAudioProcessors = new ArrayList<>();
- for (AudioProcessor audioProcessor : getAvailableAudioProcessors()) {
+ for (AudioProcessor audioProcessor : audioProcessors) {
if (audioProcessor.isActive()) {
newAudioProcessors.add(audioProcessor);
} else {
@@ -529,7 +512,9 @@ public final class DefaultAudioSink implements AudioSink {
// initialization of the audio track to fail.
releasingConditionVariable.block();
- audioTrack = initializeAudioTrack();
+ audioTrack =
+ Assertions.checkNotNull(configuration)
+ .buildAudioTrack(tunneling, audioAttributes, audioSessionId);
int audioSessionId = audioTrack.getAudioSessionId();
if (enablePreV21AudioSessionWorkaround) {
if (Util.SDK_INT < 21) {
@@ -552,13 +537,16 @@ public final class DefaultAudioSink implements AudioSink {
}
playbackParameters =
- canApplyPlaybackParameters
+ configuration.canApplyPlaybackParameters
? audioProcessorChain.applyPlaybackParameters(playbackParameters)
: PlaybackParameters.DEFAULT;
setupAudioProcessors();
audioTrackPositionTracker.setAudioTrack(
- audioTrack, outputEncoding, outputPcmFrameSize, bufferSize);
+ audioTrack,
+ configuration.outputEncoding,
+ configuration.outputPcmFrameSize,
+ configuration.bufferSize);
setVolumeInternal();
if (auxEffectInfo.effectId != AuxEffectInfo.NO_AUX_EFFECT_ID) {
@@ -589,6 +577,21 @@ public final class DefaultAudioSink implements AudioSink {
public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
throws InitializationException, WriteException {
Assertions.checkArgument(inputBuffer == null || buffer == inputBuffer);
+
+ if (pendingConfiguration != null) {
+ // We are waiting for audio processors to drain before applying a the new configuration.
+ if (!drainAudioProcessorsToEndOfStream()) {
+ return false;
+ }
+ configuration = pendingConfiguration;
+ pendingConfiguration = null;
+ playbackParameters =
+ configuration.canApplyPlaybackParameters
+ ? audioProcessorChain.applyPlaybackParameters(playbackParameters)
+ : PlaybackParameters.DEFAULT;
+ setupAudioProcessors();
+ }
+
if (!isInitialized()) {
initialize();
if (playing) {
@@ -607,9 +610,9 @@ public final class DefaultAudioSink implements AudioSink {
return true;
}
- if (!isInputPcm && framesPerEncodedSample == 0) {
+ if (!configuration.isInputPcm && framesPerEncodedSample == 0) {
// If this is the first encoded sample, calculate the sample size in frames.
- framesPerEncodedSample = getFramesPerEncodedSample(outputEncoding, buffer);
+ framesPerEncodedSample = getFramesPerEncodedSample(configuration.outputEncoding, buffer);
if (framesPerEncodedSample == 0) {
// We still don't know the number of frames per sample, so drop the buffer.
// For TrueHD this can occur after some seek operations, as not every sample starts with
@@ -632,7 +635,7 @@ public final class DefaultAudioSink implements AudioSink {
new PlaybackParametersCheckpoint(
newPlaybackParameters,
Math.max(0, presentationTimeUs),
- framesToDurationUs(getWrittenFrames())));
+ configuration.framesToDurationUs(getWrittenFrames())));
// Update the set of active audio processors to take into account the new parameters.
setupAudioProcessors();
}
@@ -644,7 +647,7 @@ public final class DefaultAudioSink implements AudioSink {
// Sanity check that presentationTimeUs is consistent with the expected value.
long expectedPresentationTimeUs =
startMediaTimeUs
- + inputFramesToDurationUs(
+ + configuration.inputFramesToDurationUs(
getSubmittedFrames() - trimmingAudioProcessor.getTrimmedFrameCount());
if (startMediaTimeState == START_IN_SYNC
&& Math.abs(expectedPresentationTimeUs - presentationTimeUs) > 200000) {
@@ -664,7 +667,7 @@ public final class DefaultAudioSink implements AudioSink {
}
}
- if (isInputPcm) {
+ if (configuration.isInputPcm) {
submittedPcmBytes += buffer.remaining();
} else {
submittedEncodedFrames += framesPerEncodedSample;
@@ -673,7 +676,7 @@ public final class DefaultAudioSink implements AudioSink {
inputBuffer = buffer;
}
- if (processingEnabled) {
+ if (configuration.processingEnabled) {
processBuffers(presentationTimeUs);
} else {
writeBuffer(inputBuffer, presentationTimeUs);
@@ -686,7 +689,7 @@ public final class DefaultAudioSink implements AudioSink {
if (audioTrackPositionTracker.isStalled(getWrittenFrames())) {
Log.w(TAG, "Resetting stalled audio track");
- reset();
+ flush();
return true;
}
@@ -770,11 +773,11 @@ public final class DefaultAudioSink implements AudioSink {
throw new WriteException(bytesWritten);
}
- if (isInputPcm) {
+ if (configuration.isInputPcm) {
writtenPcmBytes += bytesWritten;
}
if (bytesWritten == bytesRemaining) {
- if (!isInputPcm) {
+ if (!configuration.isInputPcm) {
writtenEncodedFrames += framesPerEncodedSample;
}
outputBuffer = null;
@@ -799,7 +802,8 @@ public final class DefaultAudioSink implements AudioSink {
private boolean drainAudioProcessorsToEndOfStream() throws WriteException {
boolean audioProcessorNeedsEndOfStream = false;
if (drainingAudioProcessorIndex == C.INDEX_UNSET) {
- drainingAudioProcessorIndex = processingEnabled ? 0 : activeAudioProcessors.length;
+ drainingAudioProcessorIndex =
+ configuration.processingEnabled ? 0 : activeAudioProcessors.length;
audioProcessorNeedsEndOfStream = true;
}
while (drainingAudioProcessorIndex < activeAudioProcessors.length) {
@@ -838,7 +842,7 @@ public final class DefaultAudioSink implements AudioSink {
@Override
public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
- if (isInitialized() && !canApplyPlaybackParameters) {
+ if (configuration != null && !configuration.canApplyPlaybackParameters) {
this.playbackParameters = PlaybackParameters.DEFAULT;
return this.playbackParameters;
}
@@ -876,7 +880,7 @@ public final class DefaultAudioSink implements AudioSink {
// The audio attributes are ignored in tunneling mode, so no need to reset.
return;
}
- reset();
+ flush();
audioSessionId = C.AUDIO_SESSION_ID_UNSET;
}
@@ -884,7 +888,7 @@ public final class DefaultAudioSink implements AudioSink {
public void setAudioSessionId(int audioSessionId) {
if (this.audioSessionId != audioSessionId) {
this.audioSessionId = audioSessionId;
- reset();
+ flush();
}
}
@@ -912,7 +916,7 @@ public final class DefaultAudioSink implements AudioSink {
if (!tunneling || audioSessionId != tunnelingAudioSessionId) {
tunneling = true;
audioSessionId = tunnelingAudioSessionId;
- reset();
+ flush();
}
}
@@ -921,7 +925,7 @@ public final class DefaultAudioSink implements AudioSink {
if (tunneling) {
tunneling = false;
audioSessionId = C.AUDIO_SESSION_ID_UNSET;
- reset();
+ flush();
}
}
@@ -952,7 +956,7 @@ public final class DefaultAudioSink implements AudioSink {
}
@Override
- public void reset() {
+ public void flush() {
if (isInitialized()) {
submittedPcmBytes = 0;
submittedEncodedFrames = 0;
@@ -969,9 +973,9 @@ public final class DefaultAudioSink implements AudioSink {
playbackParametersOffsetUs = 0;
playbackParametersPositionUs = 0;
trimmingAudioProcessor.resetTrimmedFrameCount();
+ flushAudioProcessors();
inputBuffer = null;
outputBuffer = null;
- flushAudioProcessors();
handledEndOfStream = false;
drainingAudioProcessorIndex = C.INDEX_UNSET;
avSyncHeader = null;
@@ -983,6 +987,10 @@ public final class DefaultAudioSink implements AudioSink {
// AudioTrack.release can take some time, so we call it on a background thread.
final AudioTrack toRelease = audioTrack;
audioTrack = null;
+ if (pendingConfiguration != null) {
+ configuration = pendingConfiguration;
+ pendingConfiguration = null;
+ }
audioTrackPositionTracker.reset();
releasingConditionVariable.close();
new Thread() {
@@ -1000,8 +1008,8 @@ public final class DefaultAudioSink implements AudioSink {
}
@Override
- public void release() {
- reset();
+ public void reset() {
+ flush();
releaseKeepSessionIdAudioTrack();
for (AudioProcessor audioProcessor : toIntPcmAvailableAudioProcessors) {
audioProcessor.reset();
@@ -1061,99 +1069,27 @@ public final class DefaultAudioSink implements AudioSink {
}
private long applySkipping(long positionUs) {
- return positionUs + framesToDurationUs(audioProcessorChain.getSkippedOutputFrameCount());
+ return positionUs
+ + configuration.framesToDurationUs(audioProcessorChain.getSkippedOutputFrameCount());
}
private boolean isInitialized() {
return audioTrack != null;
}
- private long inputFramesToDurationUs(long frameCount) {
- return (frameCount * C.MICROS_PER_SECOND) / inputSampleRate;
- }
-
- private long framesToDurationUs(long frameCount) {
- return (frameCount * C.MICROS_PER_SECOND) / outputSampleRate;
- }
-
- private long durationUsToFrames(long durationUs) {
- return (durationUs * outputSampleRate) / C.MICROS_PER_SECOND;
- }
-
private long getSubmittedFrames() {
- return isInputPcm ? (submittedPcmBytes / pcmFrameSize) : submittedEncodedFrames;
+ return configuration.isInputPcm
+ ? (submittedPcmBytes / configuration.inputPcmFrameSize)
+ : submittedEncodedFrames;
}
private long getWrittenFrames() {
- return isInputPcm ? (writtenPcmBytes / outputPcmFrameSize) : writtenEncodedFrames;
+ return configuration.isInputPcm
+ ? (writtenPcmBytes / configuration.outputPcmFrameSize)
+ : writtenEncodedFrames;
}
- private AudioTrack initializeAudioTrack() throws InitializationException {
- AudioTrack audioTrack;
- if (Util.SDK_INT >= 21) {
- audioTrack = createAudioTrackV21();
- } else {
- int streamType = Util.getStreamTypeForAudioUsage(audioAttributes.usage);
- if (audioSessionId == C.AUDIO_SESSION_ID_UNSET) {
- audioTrack =
- new AudioTrack(
- streamType,
- outputSampleRate,
- outputChannelConfig,
- outputEncoding,
- bufferSize,
- MODE_STREAM);
- } else {
- // Re-attach to the same audio session.
- audioTrack =
- new AudioTrack(
- streamType,
- outputSampleRate,
- outputChannelConfig,
- outputEncoding,
- bufferSize,
- MODE_STREAM,
- audioSessionId);
- }
- }
-
- int state = audioTrack.getState();
- if (state != STATE_INITIALIZED) {
- try {
- audioTrack.release();
- } catch (Exception e) {
- // The track has already failed to initialize, so it wouldn't be that surprising if release
- // were to fail too. Swallow the exception.
- }
- throw new InitializationException(state, outputSampleRate, outputChannelConfig, bufferSize);
- }
- return audioTrack;
- }
-
- @TargetApi(21)
- private AudioTrack createAudioTrackV21() {
- android.media.AudioAttributes attributes;
- if (tunneling) {
- attributes = new android.media.AudioAttributes.Builder()
- .setContentType(android.media.AudioAttributes.CONTENT_TYPE_MOVIE)
- .setFlags(android.media.AudioAttributes.FLAG_HW_AV_SYNC)
- .setUsage(android.media.AudioAttributes.USAGE_MEDIA)
- .build();
- } else {
- attributes = audioAttributes.getAudioAttributesV21();
- }
- AudioFormat format =
- new AudioFormat.Builder()
- .setChannelMask(outputChannelConfig)
- .setEncoding(outputEncoding)
- .setSampleRate(outputSampleRate)
- .build();
- int audioSessionId = this.audioSessionId != C.AUDIO_SESSION_ID_UNSET ? this.audioSessionId
- : AudioManager.AUDIO_SESSION_ID_GENERATE;
- return new AudioTrack(attributes, format, bufferSize, MODE_STREAM, audioSessionId);
- }
-
- private AudioTrack initializeKeepSessionIdAudioTrack(int audioSessionId) {
+ private static AudioTrack initializeKeepSessionIdAudioTrack(int audioSessionId) {
int sampleRate = 4000; // Equal to private AudioTrack.MIN_SAMPLE_RATE.
int channelConfig = AudioFormat.CHANNEL_OUT_MONO;
@C.PcmEncoding int encoding = C.ENCODING_PCM_16BIT;
@@ -1162,12 +1098,6 @@ public final class DefaultAudioSink implements AudioSink {
MODE_STATIC, audioSessionId);
}
- private AudioProcessor[] getAvailableAudioProcessors() {
- return shouldConvertHighResIntPcmToFloat
- ? toFloatPcmAvailableAudioProcessors
- : toIntPcmAvailableAudioProcessors;
- }
-
private static int getChannelConfig(int channelCount, boolean isInputPcm) {
if (Util.SDK_INT <= 28 && !isInputPcm) {
// In passthrough mode the channel count used to configure the audio track doesn't affect how
@@ -1196,6 +1126,8 @@ public final class DefaultAudioSink implements AudioSink {
return 640 * 1000 / 8;
case C.ENCODING_E_AC3:
return 6144 * 1000 / 8;
+ case C.ENCODING_AC4:
+ return 2688 * 1000 / 8;
case C.ENCODING_DTS:
// DTS allows an 'open' bitrate, but we assume the maximum listed value: 1536 kbit/s.
return 1536 * 1000 / 8;
@@ -1224,6 +1156,8 @@ public final class DefaultAudioSink implements AudioSink {
return Ac3Util.getAc3SyncframeAudioSampleCount();
} else if (encoding == C.ENCODING_E_AC3) {
return Ac3Util.parseEAc3SyncframeAudioSampleCount(buffer);
+ } else if (encoding == C.ENCODING_AC4) {
+ return Ac4Util.parseAc4SyncframeAudioSampleCount(buffer);
} else if (encoding == C.ENCODING_DOLBY_TRUEHD) {
int syncframeOffset = Ac3Util.findTrueHdSyncframeOffset(buffer);
return syncframeOffset == C.INDEX_UNSET
@@ -1289,9 +1223,7 @@ public final class DefaultAudioSink implements AudioSink {
audioTrack.setStereoVolume(volume, volume);
}
- /**
- * Stores playback parameters with the position and media time at which they apply.
- */
+ /** Stores playback parameters with the position and media time at which they apply. */
private static final class PlaybackParametersCheckpoint {
private final PlaybackParameters playbackParameters;
@@ -1372,4 +1304,159 @@ public final class DefaultAudioSink implements AudioSink {
}
}
}
+
+ /** Stores configuration relating to the audio format. */
+ private static final class Configuration {
+
+ public final boolean isInputPcm;
+ public final int inputPcmFrameSize;
+ public final int inputSampleRate;
+ public final int outputPcmFrameSize;
+ public final int outputSampleRate;
+ public final int outputChannelConfig;
+ @C.Encoding public final int outputEncoding;
+ public final int bufferSize;
+ public final boolean processingEnabled;
+ public final boolean canApplyPlaybackParameters;
+ public final AudioProcessor[] availableAudioProcessors;
+
+ public Configuration(
+ boolean isInputPcm,
+ int inputPcmFrameSize,
+ int inputSampleRate,
+ int outputPcmFrameSize,
+ int outputSampleRate,
+ int outputChannelConfig,
+ int outputEncoding,
+ int specifiedBufferSize,
+ boolean processingEnabled,
+ boolean canApplyPlaybackParameters,
+ AudioProcessor[] availableAudioProcessors) {
+ this.isInputPcm = isInputPcm;
+ this.inputPcmFrameSize = inputPcmFrameSize;
+ this.inputSampleRate = inputSampleRate;
+ this.outputPcmFrameSize = outputPcmFrameSize;
+ this.outputSampleRate = outputSampleRate;
+ this.outputChannelConfig = outputChannelConfig;
+ this.outputEncoding = outputEncoding;
+ this.bufferSize = specifiedBufferSize != 0 ? specifiedBufferSize : getDefaultBufferSize();
+ this.processingEnabled = processingEnabled;
+ this.canApplyPlaybackParameters = canApplyPlaybackParameters;
+ this.availableAudioProcessors = availableAudioProcessors;
+ }
+
+ public boolean canReuseAudioTrack(Configuration audioTrackConfiguration) {
+ return audioTrackConfiguration.outputEncoding == outputEncoding
+ && audioTrackConfiguration.outputSampleRate == outputSampleRate
+ && audioTrackConfiguration.outputChannelConfig == outputChannelConfig;
+ }
+
+ public long inputFramesToDurationUs(long frameCount) {
+ return (frameCount * C.MICROS_PER_SECOND) / inputSampleRate;
+ }
+
+ public long framesToDurationUs(long frameCount) {
+ return (frameCount * C.MICROS_PER_SECOND) / outputSampleRate;
+ }
+
+ public long durationUsToFrames(long durationUs) {
+ return (durationUs * outputSampleRate) / C.MICROS_PER_SECOND;
+ }
+
+ public AudioTrack buildAudioTrack(
+ boolean tunneling, AudioAttributes audioAttributes, int audioSessionId)
+ throws InitializationException {
+ AudioTrack audioTrack;
+ if (Util.SDK_INT >= 21) {
+ audioTrack = createAudioTrackV21(tunneling, audioAttributes, audioSessionId);
+ } else {
+ int streamType = Util.getStreamTypeForAudioUsage(audioAttributes.usage);
+ if (audioSessionId == C.AUDIO_SESSION_ID_UNSET) {
+ audioTrack =
+ new AudioTrack(
+ streamType,
+ outputSampleRate,
+ outputChannelConfig,
+ outputEncoding,
+ bufferSize,
+ MODE_STREAM);
+ } else {
+ // Re-attach to the same audio session.
+ audioTrack =
+ new AudioTrack(
+ streamType,
+ outputSampleRate,
+ outputChannelConfig,
+ outputEncoding,
+ bufferSize,
+ MODE_STREAM,
+ audioSessionId);
+ }
+ }
+
+ int state = audioTrack.getState();
+ if (state != STATE_INITIALIZED) {
+ try {
+ audioTrack.release();
+ } catch (Exception e) {
+ // The track has already failed to initialize, so it wouldn't be that surprising if
+ // release were to fail too. Swallow the exception.
+ }
+ throw new InitializationException(state, outputSampleRate, outputChannelConfig, bufferSize);
+ }
+ return audioTrack;
+ }
+
+ @TargetApi(21)
+ private AudioTrack createAudioTrackV21(
+ boolean tunneling, AudioAttributes audioAttributes, int audioSessionId) {
+ android.media.AudioAttributes attributes;
+ if (tunneling) {
+ attributes =
+ new android.media.AudioAttributes.Builder()
+ .setContentType(android.media.AudioAttributes.CONTENT_TYPE_MOVIE)
+ .setFlags(android.media.AudioAttributes.FLAG_HW_AV_SYNC)
+ .setUsage(android.media.AudioAttributes.USAGE_MEDIA)
+ .build();
+ } else {
+ attributes = audioAttributes.getAudioAttributesV21();
+ }
+ AudioFormat format =
+ new AudioFormat.Builder()
+ .setChannelMask(outputChannelConfig)
+ .setEncoding(outputEncoding)
+ .setSampleRate(outputSampleRate)
+ .build();
+ return new AudioTrack(
+ attributes,
+ format,
+ bufferSize,
+ MODE_STREAM,
+ audioSessionId != C.AUDIO_SESSION_ID_UNSET
+ ? audioSessionId
+ : AudioManager.AUDIO_SESSION_ID_GENERATE);
+ }
+
+ private int getDefaultBufferSize() {
+ if (isInputPcm) {
+ int minBufferSize =
+ AudioTrack.getMinBufferSize(outputSampleRate, outputChannelConfig, outputEncoding);
+ Assertions.checkState(minBufferSize != ERROR_BAD_VALUE);
+ int multipliedBufferSize = minBufferSize * BUFFER_MULTIPLICATION_FACTOR;
+ int minAppBufferSize =
+ (int) durationUsToFrames(MIN_BUFFER_DURATION_US) * outputPcmFrameSize;
+ int maxAppBufferSize =
+ (int)
+ Math.max(
+ minBufferSize, durationUsToFrames(MAX_BUFFER_DURATION_US) * outputPcmFrameSize);
+ return Util.constrainValue(multipliedBufferSize, minAppBufferSize, maxAppBufferSize);
+ } else {
+ int rate = getMaximumEncodedRateBytesPerSecond(outputEncoding);
+ if (outputEncoding == C.ENCODING_AC3) {
+ rate *= AC3_BUFFER_MULTIPLICATION_FACTOR;
+ }
+ return (int) (PASSTHROUGH_BUFFER_DURATION_US * rate / C.MICROS_PER_SECOND);
+ }
+ }
+ }
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
index e3c91cd344..2274d53b55 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
@@ -16,61 +16,30 @@
package com.google.android.exoplayer2.audio;
import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Util;
import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
/**
* An {@link AudioProcessor} that converts 24-bit and 32-bit integer PCM audio to 32-bit float PCM
* audio.
*/
-/* package */ final class FloatResamplingAudioProcessor implements AudioProcessor {
+/* package */ final class FloatResamplingAudioProcessor extends BaseAudioProcessor {
private static final int FLOAT_NAN_AS_INT = Float.floatToIntBits(Float.NaN);
private static final double PCM_32_BIT_INT_TO_PCM_32_BIT_FLOAT_FACTOR = 1.0 / 0x7FFFFFFF;
- private int sampleRateHz;
- private int channelCount;
- private @C.PcmEncoding int sourceEncoding;
- private ByteBuffer buffer;
- private ByteBuffer outputBuffer;
- private boolean inputEnded;
-
- /** Creates a new audio processor that converts audio data to {@link C#ENCODING_PCM_FLOAT}. */
- public FloatResamplingAudioProcessor() {
- sampleRateHz = Format.NO_VALUE;
- channelCount = Format.NO_VALUE;
- sourceEncoding = C.ENCODING_INVALID;
- buffer = EMPTY_BUFFER;
- outputBuffer = EMPTY_BUFFER;
- }
-
@Override
- public boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding)
+ public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
throws UnhandledFormatException {
if (!Util.isEncodingHighResolutionIntegerPcm(encoding)) {
throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
}
- if (this.sampleRateHz == sampleRateHz
- && this.channelCount == channelCount
- && sourceEncoding == encoding) {
- return false;
- }
- this.sampleRateHz = sampleRateHz;
- this.channelCount = channelCount;
- sourceEncoding = encoding;
- return true;
+ return setInputFormat(sampleRateHz, channelCount, encoding);
}
@Override
public boolean isActive() {
- return Util.isEncodingHighResolutionIntegerPcm(sourceEncoding);
- }
-
- @Override
- public int getOutputChannelCount() {
- return channelCount;
+ return Util.isEncodingHighResolutionIntegerPcm(encoding);
}
@Override
@@ -78,24 +47,15 @@ import java.nio.ByteOrder;
return C.ENCODING_PCM_FLOAT;
}
- @Override
- public int getOutputSampleRateHz() {
- return sampleRateHz;
- }
-
@Override
public void queueInput(ByteBuffer inputBuffer) {
- boolean isInput32Bit = sourceEncoding == C.ENCODING_PCM_32BIT;
+ boolean isInput32Bit = encoding == C.ENCODING_PCM_32BIT;
int position = inputBuffer.position();
int limit = inputBuffer.limit();
int size = limit - position;
int resampledSize = isInput32Bit ? size : (size / 3) * 4;
- if (buffer.capacity() < resampledSize) {
- buffer = ByteBuffer.allocateDirect(resampledSize).order(ByteOrder.nativeOrder());
- } else {
- buffer.clear();
- }
+ ByteBuffer buffer = replaceOutputBuffer(resampledSize);
if (isInput32Bit) {
for (int i = position; i < limit; i += 4) {
int pcm32BitInteger =
@@ -117,40 +77,6 @@ import java.nio.ByteOrder;
inputBuffer.position(inputBuffer.limit());
buffer.flip();
- outputBuffer = buffer;
- }
-
- @Override
- public void queueEndOfStream() {
- inputEnded = true;
- }
-
- @Override
- public ByteBuffer getOutput() {
- ByteBuffer outputBuffer = this.outputBuffer;
- this.outputBuffer = EMPTY_BUFFER;
- return outputBuffer;
- }
-
- @SuppressWarnings("ReferenceEquality")
- @Override
- public boolean isEnded() {
- return inputEnded && outputBuffer == EMPTY_BUFFER;
- }
-
- @Override
- public void flush() {
- outputBuffer = EMPTY_BUFFER;
- inputEnded = false;
- }
-
- @Override
- public void reset() {
- flush();
- sampleRateHz = Format.NO_VALUE;
- channelCount = Format.NO_VALUE;
- sourceEncoding = C.ENCODING_INVALID;
- buffer = EMPTY_BUFFER;
}
/**
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 daa0447905..07769e7d85 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
@@ -16,16 +16,14 @@
package com.google.android.exoplayer2.audio;
import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
import android.content.Context;
-import android.content.pm.PackageManager;
import android.media.MediaCodec;
import android.media.MediaCrypto;
import android.media.MediaFormat;
import android.media.audiofx.Virtualizer;
import android.os.Handler;
-import android.support.annotation.CallSuper;
-import android.support.annotation.Nullable;
+import androidx.annotation.CallSuper;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer;
@@ -67,7 +65,6 @@ import java.util.List;
* underlying audio track.
*
*/
-@TargetApi(16)
public class MediaCodecAudioRenderer extends MediaCodecRenderer implements MediaClock {
/**
@@ -253,6 +250,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
mediaCodecSelector,
drmSessionManager,
playClearSamplesWithoutKeys,
+ /* enableDecoderFallback= */ false,
/* assumedMinimumCodecOperatingRate= */ 44100);
this.context = context.getApplicationContext();
this.audioSink = audioSink;
@@ -291,11 +289,15 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
}
}
List decoderInfos =
- mediaCodecSelector.getDecoderInfos(format.sampleMimeType, requiresSecureDecryption);
+ mediaCodecSelector.getDecoderInfos(
+ format.sampleMimeType, requiresSecureDecryption, /* requiresTunnelingDecoder= */ false);
if (decoderInfos.isEmpty()) {
return requiresSecureDecryption
&& !mediaCodecSelector
- .getDecoderInfos(format.sampleMimeType, /* requiresSecureDecoder= */ false)
+ .getDecoderInfos(
+ format.sampleMimeType,
+ /* requiresSecureDecoder= */ false,
+ /* requiresTunnelingDecoder= */ false)
.isEmpty()
? FORMAT_UNSUPPORTED_DRM
: FORMAT_UNSUPPORTED_SUBTYPE;
@@ -324,7 +326,8 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
return Collections.singletonList(passthroughDecoderInfo);
}
}
- return super.getDecoderInfos(mediaCodecSelector, format, requiresSecureDecoder);
+ return mediaCodecSelector.getDecoderInfos(
+ format.sampleMimeType, requiresSecureDecoder, /* requiresTunnelingDecoder= */ false);
}
/**
@@ -352,7 +355,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
codecNeedsDiscardChannelsWorkaround = codecNeedsDiscardChannelsWorkaround(codecInfo.name);
codecNeedsEosBufferTimestampWorkaround = codecNeedsEosBufferTimestampWorkaround(codecInfo.name);
passthroughEnabled = codecInfo.passthrough;
- String codecMimeType = codecInfo.mimeType == null ? MimeTypes.AUDIO_RAW : codecInfo.mimeType;
+ String codecMimeType = passthroughEnabled ? MimeTypes.AUDIO_RAW : codecInfo.mimeType;
MediaFormat mediaFormat =
getMediaFormat(format, codecMimeType, codecMaxInputSize, codecOperatingRate);
codec.configure(mediaFormat, /* surface= */ null, crypto, /* flags= */ 0);
@@ -368,14 +371,22 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
@Override
protected @KeepCodecResult int canKeepCodec(
MediaCodec codec, MediaCodecInfo codecInfo, Format oldFormat, Format newFormat) {
- if (getCodecMaxInputSize(codecInfo, newFormat) <= codecMaxInputSize
- && codecInfo.isSeamlessAdaptationSupported(
- oldFormat, newFormat, /* isNewFormatComplete= */ true)
- && oldFormat.encoderDelay == 0
- && oldFormat.encoderPadding == 0
- && newFormat.encoderDelay == 0
- && newFormat.encoderPadding == 0) {
+ // TODO: We currently rely on recreating the codec when encoder delay or padding is non-zero.
+ // Re-creating the codec is necessary to guarantee that onOutputFormatChanged is called, which
+ // is where encoder delay and padding are propagated to the sink. We should find a better way to
+ // propagate these values, and then allow the codec to be re-used in cases where this would
+ // otherwise be possible.
+ if (getCodecMaxInputSize(codecInfo, newFormat) > codecMaxInputSize
+ || oldFormat.encoderDelay != 0
+ || oldFormat.encoderPadding != 0
+ || newFormat.encoderDelay != 0
+ || newFormat.encoderPadding != 0) {
+ return KEEP_CODEC_RESULT_NO;
+ } else if (codecInfo.isSeamlessAdaptationSupported(
+ oldFormat, newFormat, /* isNewFormatComplete= */ true)) {
return KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION;
+ } else if (areCodecConfigurationCompatible(oldFormat, newFormat)) {
+ return KEEP_CODEC_RESULT_YES_WITH_FLUSH;
} else {
return KEEP_CODEC_RESULT_NO;
}
@@ -387,7 +398,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
}
@Override
- protected float getCodecOperatingRate(
+ protected float getCodecOperatingRateV23(
float operatingRate, Format format, Format[] streamFormats) {
// Use the highest known stream sample-rate up front, to avoid having to reconfigure the codec
// should an adaptive switch to that stream occur.
@@ -510,7 +521,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
@Override
protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
super.onPositionReset(positionUs, joining);
- audioSink.reset();
+ audioSink.flush();
currentPositionUs = positionUs;
allowFirstBufferPositionDiscontinuity = true;
allowPositionDiscontinuity = true;
@@ -536,17 +547,25 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
try {
lastInputTimeUs = C.TIME_UNSET;
pendingStreamChangeCount = 0;
- audioSink.release();
+ audioSink.flush();
} finally {
try {
super.onDisabled();
} finally {
- decoderCounters.ensureUpdated();
eventDispatcher.disabled(decoderCounters);
}
}
}
+ @Override
+ protected void onReset() {
+ try {
+ super.onReset();
+ } finally {
+ audioSink.reset();
+ }
+ }
+
@Override
public boolean isEnded() {
return super.isEnded() && audioSink.isEnded();
@@ -712,27 +731,36 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
* be determined.
*/
private int getCodecMaxInputSize(MediaCodecInfo codecInfo, Format format) {
- if (Util.SDK_INT < 24 && "OMX.google.raw.decoder".equals(codecInfo.name)) {
- // OMX.google.raw.decoder didn't resize its output buffers correctly prior to N, so there's no
- // point requesting a non-default input size. Doing so may cause a native crash, where-as not
- // doing so will cause a more controlled failure when attempting to fill an input buffer. See:
- // https://github.com/google/ExoPlayer/issues/4057.
- boolean needsRawDecoderWorkaround = true;
- if (Util.SDK_INT == 23) {
- PackageManager packageManager = context.getPackageManager();
- if (packageManager != null
- && packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
- // The workaround is not required for AndroidTV devices running M.
- needsRawDecoderWorkaround = false;
- }
- }
- if (needsRawDecoderWorkaround) {
+ if ("OMX.google.raw.decoder".equals(codecInfo.name)) {
+ // OMX.google.raw.decoder didn't resize its output buffers correctly prior to N, except on
+ // Android TV running M, so there's no point requesting a non-default input size. Doing so may
+ // cause a native crash, whereas not doing so will cause a more controlled failure when
+ // attempting to fill an input buffer. See: https://github.com/google/ExoPlayer/issues/4057.
+ if (Util.SDK_INT < 24 && !(Util.SDK_INT == 23 && Util.isTv(context))) {
return Format.NO_VALUE;
}
}
return format.maxInputSize;
}
+ /**
+ * Returns whether two {@link Format}s will cause the same codec to be configured in an identical
+ * way, excluding {@link MediaFormat#KEY_MAX_INPUT_SIZE} and configuration that does not come from
+ * the {@link Format}.
+ *
+ * @param oldFormat The first format.
+ * @param newFormat The second format.
+ * @return Whether the two formats will cause a codec to be configured in an identical way,
+ * excluding {@link MediaFormat#KEY_MAX_INPUT_SIZE} and configuration that does not come from
+ * the {@link Format}.
+ */
+ protected boolean areCodecConfigurationCompatible(Format oldFormat, Format newFormat) {
+ return Util.areEqual(oldFormat.sampleMimeType, newFormat.sampleMimeType)
+ && oldFormat.channelCount == newFormat.channelCount
+ && oldFormat.sampleRate == newFormat.sampleRate
+ && oldFormat.initializationDataEquals(newFormat);
+ }
+
/**
* Returns the framework {@link MediaFormat} that can be used to configure a {@link MediaCodec}
* for decoding the given {@link Format} for playback.
@@ -762,6 +790,11 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
mediaFormat.setFloat(MediaFormat.KEY_OPERATING_RATE, codecOperatingRate);
}
}
+ if (Util.SDK_INT <= 28 && MimeTypes.AUDIO_AC4.equals(format.sampleMimeType)) {
+ // On some older builds, the AC-4 decoder expects to receive samples formatted as raw frames
+ // not sync frames. Set a format key to override this.
+ mediaFormat.setInteger("ac4-is-sync", 1);
+ }
return mediaFormat;
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
index 3ae1a393f9..d0c057b676 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
@@ -18,45 +18,21 @@ package com.google.android.exoplayer2.audio;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
/**
* An {@link AudioProcessor} that converts 8-bit, 24-bit and 32-bit integer PCM audio to 16-bit
* integer PCM audio.
*/
-/* package */ final class ResamplingAudioProcessor implements AudioProcessor {
-
- private int sampleRateHz;
- private int channelCount;
- private @C.PcmEncoding int encoding;
- private ByteBuffer buffer;
- private ByteBuffer outputBuffer;
- private boolean inputEnded;
-
- /** Creates a new audio processor that converts audio data to {@link C#ENCODING_PCM_16BIT}. */
- public ResamplingAudioProcessor() {
- sampleRateHz = Format.NO_VALUE;
- channelCount = Format.NO_VALUE;
- encoding = C.ENCODING_INVALID;
- buffer = EMPTY_BUFFER;
- outputBuffer = EMPTY_BUFFER;
- }
+/* package */ final class ResamplingAudioProcessor extends BaseAudioProcessor {
@Override
- public boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding)
+ public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
throws UnhandledFormatException {
if (encoding != C.ENCODING_PCM_8BIT && encoding != C.ENCODING_PCM_16BIT
&& encoding != C.ENCODING_PCM_24BIT && encoding != C.ENCODING_PCM_32BIT) {
throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
}
- if (this.sampleRateHz == sampleRateHz && this.channelCount == channelCount
- && this.encoding == encoding) {
- return false;
- }
- this.sampleRateHz = sampleRateHz;
- this.channelCount = channelCount;
- this.encoding = encoding;
- return true;
+ return setInputFormat(sampleRateHz, channelCount, encoding);
}
@Override
@@ -64,21 +40,11 @@ import java.nio.ByteOrder;
return encoding != C.ENCODING_INVALID && encoding != C.ENCODING_PCM_16BIT;
}
- @Override
- public int getOutputChannelCount() {
- return channelCount;
- }
-
@Override
public int getOutputEncoding() {
return C.ENCODING_PCM_16BIT;
}
- @Override
- public int getOutputSampleRateHz() {
- return sampleRateHz;
- }
-
@Override
public void queueInput(ByteBuffer inputBuffer) {
// Prepare the output buffer.
@@ -105,13 +71,9 @@ import java.nio.ByteOrder;
default:
throw new IllegalStateException();
}
- if (buffer.capacity() < resampledSize) {
- buffer = ByteBuffer.allocateDirect(resampledSize).order(ByteOrder.nativeOrder());
- } else {
- buffer.clear();
- }
// Resample the little endian input and update the input/output buffers.
+ ByteBuffer buffer = replaceOutputBuffer(resampledSize);
switch (encoding) {
case C.ENCODING_PCM_8BIT:
// 8->16 bit resampling. Shift each byte from [0, 256) to [-128, 128) and scale up.
@@ -146,40 +108,6 @@ import java.nio.ByteOrder;
}
inputBuffer.position(inputBuffer.limit());
buffer.flip();
- outputBuffer = buffer;
- }
-
- @Override
- public void queueEndOfStream() {
- inputEnded = true;
- }
-
- @Override
- public ByteBuffer getOutput() {
- ByteBuffer outputBuffer = this.outputBuffer;
- this.outputBuffer = EMPTY_BUFFER;
- return outputBuffer;
- }
-
- @SuppressWarnings("ReferenceEquality")
- @Override
- public boolean isEnded() {
- return inputEnded && outputBuffer == EMPTY_BUFFER;
- }
-
- @Override
- public void flush() {
- outputBuffer = EMPTY_BUFFER;
- inputEnded = false;
- }
-
- @Override
- public void reset() {
- flush();
- sampleRateHz = Format.NO_VALUE;
- channelCount = Format.NO_VALUE;
- encoding = C.ENCODING_INVALID;
- buffer = EMPTY_BUFFER;
}
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
index a1ff7028c1..caf8a61651 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
@@ -15,21 +15,19 @@
*/
package com.google.android.exoplayer2.audio;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
/**
* An {@link AudioProcessor} that skips silence in the input stream. Input and output are 16-bit
* PCM.
*/
-public final class SilenceSkippingAudioProcessor implements AudioProcessor {
+public final class SilenceSkippingAudioProcessor extends BaseAudioProcessor {
/**
* The minimum duration of audio that must be below {@link #SILENCE_THRESHOLD_LEVEL} to classify
@@ -70,16 +68,10 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
/** State when the input is silent. */
private static final int STATE_SILENT = 2;
- private int channelCount;
- private int sampleRateHz;
private int bytesPerFrame;
private boolean enabled;
- private ByteBuffer buffer;
- private ByteBuffer outputBuffer;
- private boolean inputEnded;
-
/**
* Buffers audio data that may be classified as silence while in {@link #STATE_MAYBE_SILENT}. If
* the input becomes noisy before the buffer has filled, it will be output. Otherwise, the buffer
@@ -93,7 +85,7 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
*/
private byte[] paddingBuffer;
- private @State int state;
+ @State private int state;
private int maybeSilenceBufferSize;
private int paddingSize;
private boolean hasOutputNoise;
@@ -101,10 +93,6 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
/** Creates a new silence trimming audio processor. */
public SilenceSkippingAudioProcessor() {
- buffer = EMPTY_BUFFER;
- outputBuffer = EMPTY_BUFFER;
- channelCount = Format.NO_VALUE;
- sampleRateHz = Format.NO_VALUE;
maybeSilenceBuffer = Util.EMPTY_BYTE_ARRAY;
paddingBuffer = Util.EMPTY_BYTE_ARRAY;
}
@@ -131,43 +119,23 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
// AudioProcessor implementation.
@Override
- public boolean configure(int sampleRateHz, int channelCount, int encoding)
+ public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
throws UnhandledFormatException {
if (encoding != C.ENCODING_PCM_16BIT) {
throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
}
- if (this.sampleRateHz == sampleRateHz && this.channelCount == channelCount) {
- return false;
- }
- this.sampleRateHz = sampleRateHz;
- this.channelCount = channelCount;
bytesPerFrame = channelCount * 2;
- return true;
+ return setInputFormat(sampleRateHz, channelCount, encoding);
}
@Override
public boolean isActive() {
- return sampleRateHz != Format.NO_VALUE && enabled;
- }
-
- @Override
- public int getOutputChannelCount() {
- return channelCount;
- }
-
- @Override
- public @C.Encoding int getOutputEncoding() {
- return C.ENCODING_PCM_16BIT;
- }
-
- @Override
- public int getOutputSampleRateHz() {
- return sampleRateHz;
+ return super.isActive() && enabled;
}
@Override
public void queueInput(ByteBuffer inputBuffer) {
- while (inputBuffer.hasRemaining() && !outputBuffer.hasRemaining()) {
+ while (inputBuffer.hasRemaining() && !hasPendingOutput()) {
switch (state) {
case STATE_NOISY:
processNoisy(inputBuffer);
@@ -185,8 +153,7 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
}
@Override
- public void queueEndOfStream() {
- inputEnded = true;
+ protected void onQueueEndOfStream() {
if (maybeSilenceBufferSize > 0) {
// We haven't received enough silence to transition to the silent state, so output the buffer.
output(maybeSilenceBuffer, maybeSilenceBufferSize);
@@ -197,20 +164,7 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
}
@Override
- public ByteBuffer getOutput() {
- ByteBuffer outputBuffer = this.outputBuffer;
- this.outputBuffer = EMPTY_BUFFER;
- return outputBuffer;
- }
-
- @SuppressWarnings("ReferenceEquality")
- @Override
- public boolean isEnded() {
- return inputEnded && outputBuffer == EMPTY_BUFFER;
- }
-
- @Override
- public void flush() {
+ protected void onFlush() {
if (isActive()) {
int maybeSilenceBufferSize = durationUsToFrames(MINIMUM_SILENCE_DURATION_US) * bytesPerFrame;
if (maybeSilenceBuffer.length != maybeSilenceBufferSize) {
@@ -222,20 +176,14 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
}
}
state = STATE_NOISY;
- outputBuffer = EMPTY_BUFFER;
- inputEnded = false;
skippedFrames = 0;
maybeSilenceBufferSize = 0;
hasOutputNoise = false;
}
@Override
- public void reset() {
+ protected void onReset() {
enabled = false;
- flush();
- buffer = EMPTY_BUFFER;
- channelCount = Format.NO_VALUE;
- sampleRateHz = Format.NO_VALUE;
paddingSize = 0;
maybeSilenceBuffer = Util.EMPTY_BYTE_ARRAY;
paddingBuffer = Util.EMPTY_BYTE_ARRAY;
@@ -330,30 +278,19 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
* processor.
*/
private void output(byte[] data, int length) {
- prepareForOutput(length);
- buffer.put(data, 0, length);
- buffer.flip();
- outputBuffer = buffer;
+ replaceOutputBuffer(length).put(data, 0, length).flip();
+ if (length > 0) {
+ hasOutputNoise = true;
+ }
}
/**
* Copies remaining bytes from {@code data} to populate a new output buffer from the processor.
*/
private void output(ByteBuffer data) {
- prepareForOutput(data.remaining());
- buffer.put(data);
- buffer.flip();
- outputBuffer = buffer;
- }
-
- /** Prepares to output {@code size} bytes in {@code buffer}. */
- private void prepareForOutput(int size) {
- if (buffer.capacity() < size) {
- buffer = ByteBuffer.allocateDirect(size).order(ByteOrder.nativeOrder());
- } else {
- buffer.clear();
- }
- if (size > 0) {
+ int length = data.remaining();
+ replaceOutputBuffer(length).put(data).flip();
+ if (length > 0) {
hasOutputNoise = true;
}
}
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 bd63765953..553dfb1187 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
@@ -19,8 +19,8 @@ import android.media.audiofx.Virtualizer;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.BaseRenderer;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException;
@@ -106,8 +106,8 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
? extends AudioDecoderException> decoder;
private DecoderInputBuffer inputBuffer;
private SimpleOutputBuffer outputBuffer;
- private DrmSession drmSession;
- private DrmSession pendingDrmSession;
+ @Nullable private DrmSession decoderDrmSession;
+ @Nullable private DrmSession sourceDrmSession;
@ReinitializationState private int decoderReinitializationState;
private boolean decoderReceivedBuffers;
@@ -462,12 +462,12 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
}
private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
- if (drmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
+ if (decoderDrmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
return false;
}
- @DrmSession.State int drmSessionState = drmSession.getState();
+ @DrmSession.State int drmSessionState = decoderDrmSession.getState();
if (drmSessionState == DrmSession.STATE_ERROR) {
- throw ExoPlaybackException.createForRenderer(drmSession.getError(), getIndex());
+ throw ExoPlaybackException.createForRenderer(decoderDrmSession.getError(), getIndex());
}
return drmSessionState != DrmSession.STATE_OPENED_WITH_KEYS;
}
@@ -540,7 +540,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
@Override
protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
- audioSink.reset();
+ audioSink.flush();
currentPositionUs = positionUs;
allowFirstBufferPositionDiscontinuity = true;
allowPositionDiscontinuity = true;
@@ -568,25 +568,11 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
audioTrackNeedsConfigure = true;
waitingForKeys = false;
try {
+ setSourceDrmSession(null);
releaseDecoder();
- audioSink.release();
+ audioSink.reset();
} finally {
- try {
- if (drmSession != null) {
- drmSessionManager.releaseSession(drmSession);
- }
- } finally {
- try {
- if (pendingDrmSession != null && pendingDrmSession != drmSession) {
- drmSessionManager.releaseSession(pendingDrmSession);
- }
- } finally {
- drmSession = null;
- pendingDrmSession = null;
- decoderCounters.ensureUpdated();
- eventDispatcher.disabled(decoderCounters);
- }
- }
+ eventDispatcher.disabled(decoderCounters);
}
}
@@ -615,12 +601,13 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
return;
}
- drmSession = pendingDrmSession;
+ setDecoderDrmSession(sourceDrmSession);
+
ExoMediaCrypto mediaCrypto = null;
- if (drmSession != null) {
- mediaCrypto = drmSession.getMediaCrypto();
+ if (decoderDrmSession != null) {
+ mediaCrypto = decoderDrmSession.getMediaCrypto();
if (mediaCrypto == null) {
- DrmSessionException drmError = drmSession.getError();
+ DrmSessionException drmError = decoderDrmSession.getError();
if (drmError != null) {
// Continue for now. We may be able to avoid failure if the session recovers, or if a new
// input format causes the session to be replaced before it's used.
@@ -646,17 +633,34 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
}
private void releaseDecoder() {
- if (decoder == null) {
- return;
- }
-
inputBuffer = null;
outputBuffer = null;
- decoder.release();
- decoder = null;
- decoderCounters.decoderReleaseCount++;
decoderReinitializationState = REINITIALIZATION_STATE_NONE;
decoderReceivedBuffers = false;
+ if (decoder != null) {
+ decoder.release();
+ decoder = null;
+ decoderCounters.decoderReleaseCount++;
+ }
+ setDecoderDrmSession(null);
+ }
+
+ private void setSourceDrmSession(@Nullable DrmSession session) {
+ DrmSession previous = sourceDrmSession;
+ sourceDrmSession = session;
+ releaseDrmSessionIfUnused(previous);
+ }
+
+ private void setDecoderDrmSession(@Nullable DrmSession session) {
+ DrmSession previous = decoderDrmSession;
+ 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 {
@@ -671,13 +675,16 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
throw ExoPlaybackException.createForRenderer(
new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
}
- pendingDrmSession = drmSessionManager.acquireSession(Looper.myLooper(),
- inputFormat.drmInitData);
- if (pendingDrmSession == drmSession) {
- drmSessionManager.releaseSession(pendingDrmSession);
+ 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 {
- pendingDrmSession = null;
+ setSourceDrmSession(null);
}
}
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 2ca2d47828..0d938d33f4 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2.audio;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.C.Encoding;
import com.google.android.exoplayer2.Format;
@@ -69,7 +69,8 @@ public final class SonicAudioProcessor implements AudioProcessor {
private int outputSampleRateHz;
private int pendingOutputSampleRateHz;
- private @Nullable Sonic sonic;
+ private boolean pendingSonicRecreation;
+ @Nullable private Sonic sonic;
private ByteBuffer buffer;
private ShortBuffer shortBuffer;
private ByteBuffer outputBuffer;
@@ -103,7 +104,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
speed = Util.constrainValue(speed, MINIMUM_SPEED, MAXIMUM_SPEED);
if (this.speed != speed) {
this.speed = speed;
- sonic = null;
+ pendingSonicRecreation = true;
}
flush();
return speed;
@@ -120,7 +121,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
pitch = Util.constrainValue(pitch, MINIMUM_PITCH, MAXIMUM_PITCH);
if (this.pitch != pitch) {
this.pitch = pitch;
- sonic = null;
+ pendingSonicRecreation = true;
}
flush();
return pitch;
@@ -172,7 +173,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
this.sampleRateHz = sampleRateHz;
this.channelCount = channelCount;
this.outputSampleRateHz = outputSampleRateHz;
- sonic = null;
+ pendingSonicRecreation = true;
return true;
}
@@ -201,7 +202,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
@Override
public void queueInput(ByteBuffer inputBuffer) {
- Assertions.checkState(sonic != null);
+ Sonic sonic = Assertions.checkNotNull(this.sonic);
if (inputBuffer.hasRemaining()) {
ShortBuffer shortBuffer = inputBuffer.asShortBuffer();
int inputSize = inputBuffer.remaining();
@@ -227,8 +228,9 @@ public final class SonicAudioProcessor implements AudioProcessor {
@Override
public void queueEndOfStream() {
- Assertions.checkState(sonic != null);
- sonic.queueEndOfStream();
+ if (sonic != null) {
+ sonic.queueEndOfStream();
+ }
inputEnded = true;
}
@@ -247,9 +249,9 @@ public final class SonicAudioProcessor implements AudioProcessor {
@Override
public void flush() {
if (isActive()) {
- if (sonic == null) {
+ if (pendingSonicRecreation) {
sonic = new Sonic(sampleRateHz, channelCount, speed, pitch, outputSampleRateHz);
- } else {
+ } else if (sonic != null) {
sonic.flush();
}
}
@@ -270,6 +272,7 @@ public final class SonicAudioProcessor implements AudioProcessor {
shortBuffer = buffer.asShortBuffer();
outputBuffer = EMPTY_BUFFER;
pendingOutputSampleRateHz = SAMPLE_RATE_NO_CHANGE;
+ pendingSonicRecreation = false;
sonic = null;
inputBytes = 0;
outputBytes = 0;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
index 0072b7c2a3..6e4c97701a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
@@ -15,9 +15,8 @@
*/
package com.google.android.exoplayer2.audio;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util;
@@ -36,13 +35,13 @@ import java.nio.ByteOrder;
* custom {@link com.google.android.exoplayer2.audio.DefaultAudioSink.AudioProcessorChain} when
* creating the audio sink, and include this audio processor after all other audio processors.
*/
-public final class TeeAudioProcessor implements AudioProcessor {
+public final class TeeAudioProcessor extends BaseAudioProcessor {
/** A sink for audio buffers handled by the audio processor. */
public interface AudioBufferSink {
/** Called when the audio processor is flushed with a format of subsequent input. */
- void flush(int sampleRateHz, int channelCount, @C.Encoding int encoding);
+ void flush(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding);
/**
* Called when data is written to the audio processor.
@@ -54,15 +53,6 @@ public final class TeeAudioProcessor implements AudioProcessor {
private final AudioBufferSink audioBufferSink;
- private int sampleRateHz;
- private int channelCount;
- private @C.Encoding int encoding;
- private boolean isActive;
-
- private ByteBuffer buffer;
- private ByteBuffer outputBuffer;
- private boolean inputEnded;
-
/**
* Creates a new tee audio processor, sending incoming data to the given {@link AudioBufferSink}.
*
@@ -71,98 +61,28 @@ public final class TeeAudioProcessor implements AudioProcessor {
*/
public TeeAudioProcessor(AudioBufferSink audioBufferSink) {
this.audioBufferSink = Assertions.checkNotNull(audioBufferSink);
-
- buffer = EMPTY_BUFFER;
- outputBuffer = EMPTY_BUFFER;
- channelCount = Format.NO_VALUE;
- sampleRateHz = Format.NO_VALUE;
}
@Override
- public boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding)
- throws UnhandledFormatException {
- this.sampleRateHz = sampleRateHz;
- this.channelCount = channelCount;
- this.encoding = encoding;
- boolean wasActive = isActive;
- isActive = true;
- return !wasActive;
+ public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding) {
+ return setInputFormat(sampleRateHz, channelCount, encoding);
}
@Override
- public boolean isActive() {
- return isActive;
- }
-
- @Override
- public int getOutputChannelCount() {
- return channelCount;
- }
-
- @Override
- public int getOutputEncoding() {
- return encoding;
- }
-
- @Override
- public int getOutputSampleRateHz() {
- return sampleRateHz;
- }
-
- @Override
- public void queueInput(ByteBuffer buffer) {
- int remaining = buffer.remaining();
+ public void queueInput(ByteBuffer inputBuffer) {
+ int remaining = inputBuffer.remaining();
if (remaining == 0) {
return;
}
+ audioBufferSink.handleBuffer(inputBuffer.asReadOnlyBuffer());
+ replaceOutputBuffer(remaining).put(inputBuffer).flip();
+ }
- audioBufferSink.handleBuffer(buffer.asReadOnlyBuffer());
-
- if (this.buffer.capacity() < remaining) {
- this.buffer = ByteBuffer.allocateDirect(remaining).order(ByteOrder.nativeOrder());
- } else {
- this.buffer.clear();
+ @Override
+ protected void onFlush() {
+ if (isActive()) {
+ audioBufferSink.flush(sampleRateHz, channelCount, encoding);
}
-
- this.buffer.put(buffer);
-
- this.buffer.flip();
- outputBuffer = this.buffer;
- }
-
- @Override
- public void queueEndOfStream() {
- inputEnded = true;
- }
-
- @Override
- public ByteBuffer getOutput() {
- ByteBuffer outputBuffer = this.outputBuffer;
- this.outputBuffer = EMPTY_BUFFER;
- return outputBuffer;
- }
-
- @SuppressWarnings("ReferenceEquality")
- @Override
- public boolean isEnded() {
- return inputEnded && buffer == EMPTY_BUFFER;
- }
-
- @Override
- public void flush() {
- outputBuffer = EMPTY_BUFFER;
- inputEnded = false;
-
- audioBufferSink.flush(sampleRateHz, channelCount, encoding);
- }
-
- @Override
- public void reset() {
- flush();
- buffer = EMPTY_BUFFER;
- sampleRateHz = Format.NO_VALUE;
- channelCount = Format.NO_VALUE;
- encoding = Format.NO_VALUE;
}
/**
@@ -187,8 +107,8 @@ public final class TeeAudioProcessor implements AudioProcessor {
private int sampleRateHz;
private int channelCount;
- private @C.Encoding int encoding;
- private @Nullable RandomAccessFile randomAccessFile;
+ @C.PcmEncoding private int encoding;
+ @Nullable private RandomAccessFile randomAccessFile;
private int counter;
private int bytesWritten;
@@ -204,7 +124,7 @@ public final class TeeAudioProcessor implements AudioProcessor {
}
@Override
- public void flush(int sampleRateHz, int channelCount, int encoding) {
+ public void flush(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding) {
try {
reset();
} catch (IOException e) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
index 7b66bd63d2..c9e9f921c7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
@@ -16,39 +16,27 @@
package com.google.android.exoplayer2.audio;
import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.C.Encoding;
-import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Util;
import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
/** Audio processor for trimming samples from the start/end of data. */
-/* package */ final class TrimmingAudioProcessor implements AudioProcessor {
+/* package */ final class TrimmingAudioProcessor extends BaseAudioProcessor {
- private static final int OUTPUT_ENCODING = C.ENCODING_PCM_16BIT;
+ @C.PcmEncoding private static final int OUTPUT_ENCODING = C.ENCODING_PCM_16BIT;
private boolean isActive;
private int trimStartFrames;
private int trimEndFrames;
- private int channelCount;
- private int sampleRateHz;
private int bytesPerFrame;
private boolean receivedInputSinceConfigure;
private int pendingTrimStartBytes;
- private ByteBuffer buffer;
- private ByteBuffer outputBuffer;
private byte[] endBuffer;
private int endBufferSize;
- private boolean inputEnded;
private long trimmedFrameCount;
/** Creates a new audio processor for trimming samples from the start/end of data. */
public TrimmingAudioProcessor() {
- buffer = EMPTY_BUFFER;
- outputBuffer = EMPTY_BUFFER;
- channelCount = Format.NO_VALUE;
- sampleRateHz = Format.NO_VALUE;
endBuffer = Util.EMPTY_BYTE_ARRAY;
}
@@ -80,7 +68,7 @@ import java.nio.ByteOrder;
}
@Override
- public boolean configure(int sampleRateHz, int channelCount, @Encoding int encoding)
+ public boolean configure(int sampleRateHz, int channelCount, @C.PcmEncoding int encoding)
throws UnhandledFormatException {
if (encoding != OUTPUT_ENCODING) {
throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
@@ -88,8 +76,6 @@ import java.nio.ByteOrder;
if (endBufferSize > 0) {
trimmedFrameCount += endBufferSize / bytesPerFrame;
}
- this.channelCount = channelCount;
- this.sampleRateHz = sampleRateHz;
bytesPerFrame = Util.getPcmFrameSize(OUTPUT_ENCODING, channelCount);
endBuffer = new byte[trimEndFrames * bytesPerFrame];
endBufferSize = 0;
@@ -97,6 +83,7 @@ import java.nio.ByteOrder;
boolean wasActive = isActive;
isActive = trimStartFrames != 0 || trimEndFrames != 0;
receivedInputSinceConfigure = false;
+ setInputFormat(sampleRateHz, channelCount, encoding);
return wasActive != isActive;
}
@@ -105,21 +92,6 @@ import java.nio.ByteOrder;
return isActive;
}
- @Override
- public int getOutputChannelCount() {
- return channelCount;
- }
-
- @Override
- public int getOutputEncoding() {
- return OUTPUT_ENCODING;
- }
-
- @Override
- public int getOutputSampleRateHz() {
- return sampleRateHz;
- }
-
@Override
public void queueInput(ByteBuffer inputBuffer) {
int position = inputBuffer.position();
@@ -147,11 +119,7 @@ import java.nio.ByteOrder;
// endBuffer as full as possible, the output should be any surplus bytes currently in endBuffer
// followed by any surplus bytes in the new inputBuffer.
int remainingBytesToOutput = endBufferSize + remaining - endBuffer.length;
- if (buffer.capacity() < remainingBytesToOutput) {
- buffer = ByteBuffer.allocateDirect(remainingBytesToOutput).order(ByteOrder.nativeOrder());
- } else {
- buffer.clear();
- }
+ ByteBuffer buffer = replaceOutputBuffer(remainingBytesToOutput);
// Output from endBuffer.
int endBufferBytesToOutput = Util.constrainValue(remainingBytesToOutput, 0, endBufferSize);
@@ -172,48 +140,31 @@ import java.nio.ByteOrder;
endBufferSize += remaining;
buffer.flip();
- outputBuffer = buffer;
- }
-
- @Override
- public void queueEndOfStream() {
- inputEnded = true;
}
@SuppressWarnings("ReferenceEquality")
@Override
public ByteBuffer getOutput() {
- ByteBuffer outputBuffer = this.outputBuffer;
- if (inputEnded && endBufferSize > 0 && outputBuffer == EMPTY_BUFFER) {
+ if (super.isEnded() && endBufferSize > 0) {
// Because audio processors may be drained in the middle of the stream we assume that the
- // contents of the end buffer need to be output. Gapless transitions don't involve a call to
- // queueEndOfStream so won't be affected. When audio is actually ending we play the padding
- // data which is incorrect. This behavior can be fixed once we have the timestamps associated
- // with input buffers.
- if (buffer.capacity() < endBufferSize) {
- buffer = ByteBuffer.allocateDirect(endBufferSize).order(ByteOrder.nativeOrder());
- } else {
- buffer.clear();
- }
- buffer.put(endBuffer, 0, endBufferSize);
+ // contents of the end buffer need to be output. For gapless transitions, configure will be
+ // always be called, which clears the end buffer as needed. When audio is actually ending we
+ // play the padding data which is incorrect. This behavior can be fixed once we have the
+ // timestamps associated with input buffers.
+ replaceOutputBuffer(endBufferSize).put(endBuffer, 0, endBufferSize).flip();
endBufferSize = 0;
- buffer.flip();
- outputBuffer = buffer;
}
- this.outputBuffer = EMPTY_BUFFER;
- return outputBuffer;
+ return super.getOutput();
}
@SuppressWarnings("ReferenceEquality")
@Override
public boolean isEnded() {
- return inputEnded && endBufferSize == 0 && outputBuffer == EMPTY_BUFFER;
+ return super.isEnded() && endBufferSize == 0;
}
@Override
- public void flush() {
- outputBuffer = EMPTY_BUFFER;
- inputEnded = false;
+ protected void onFlush() {
if (receivedInputSinceConfigure) {
// Audio processors are flushed after initial configuration, so we leave the pending trim
// start byte count unmodified if the processor was just configured. Otherwise we (possibly
@@ -226,11 +177,7 @@ import java.nio.ByteOrder;
}
@Override
- public void reset() {
- flush();
- buffer = EMPTY_BUFFER;
- channelCount = Format.NO_VALUE;
- sampleRateHz = Format.NO_VALUE;
+ protected void onReset() {
endBuffer = Util.EMPTY_BYTE_ARRAY;
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java b/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java
new file mode 100644
index 0000000000..b0fd1cf2f0
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java
@@ -0,0 +1,31 @@
+/*
+ * 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.database;
+
+import android.database.SQLException;
+import java.io.IOException;
+
+/** An {@link IOException} whose cause is an {@link SQLException}. */
+public final class DatabaseIOException extends IOException {
+
+ public DatabaseIOException(SQLException cause) {
+ super(cause);
+ }
+
+ public DatabaseIOException(SQLException cause, String message) {
+ super(message, cause);
+ }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
new file mode 100644
index 0000000000..2bb5f260ba
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
@@ -0,0 +1,56 @@
+/*
+ * 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.database;
+
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+
+/**
+ * Provides {@link SQLiteDatabase} instances to ExoPlayer components, which may read and write
+ * tables prefixed with {@link #TABLE_PREFIX}.
+ */
+public interface DatabaseProvider {
+
+ /** Prefix for tables that can be read and written by ExoPlayer components. */
+ String TABLE_PREFIX = "ExoPlayer";
+
+ /**
+ * Creates and/or opens a database that will be used for reading and writing.
+ *
+ * Once opened successfully, the database is cached, so you can call this method every time you
+ * need to write to the database. Errors such as bad permissions or a full disk may cause this
+ * method to fail, but future attempts may succeed if the problem is fixed.
+ *
+ * @throws SQLiteException If the database cannot be opened for writing.
+ * @return A read/write database object.
+ */
+ SQLiteDatabase getWritableDatabase();
+
+ /**
+ * Creates and/or opens a database. This will be the same object returned by {@link
+ * #getWritableDatabase()} unless some problem, such as a full disk, requires the database to be
+ * opened read-only. In that case, a read-only database object will be returned. If the problem is
+ * fixed, a future call to {@link #getWritableDatabase()} may succeed, in which case the read-only
+ * database object will be closed and the read/write object will be returned in the future.
+ *
+ *
Once opened successfully, the database is cached, so you can call this method every time you
+ * need to read from the database.
+ *
+ * @throws SQLiteException If the database cannot be opened.
+ * @return A database object valid until {@link #getWritableDatabase()} is called.
+ */
+ SQLiteDatabase getReadableDatabase();
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
new file mode 100644
index 0000000000..c04683b434
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
@@ -0,0 +1,42 @@
+/*
+ * 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.database;
+
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+/** A {@link DatabaseProvider} that provides instances obtained from a {@link SQLiteOpenHelper}. */
+public final class DefaultDatabaseProvider implements DatabaseProvider {
+
+ private final SQLiteOpenHelper sqliteOpenHelper;
+
+ /**
+ * @param sqliteOpenHelper An {@link SQLiteOpenHelper} from which to obtain database instances.
+ */
+ public DefaultDatabaseProvider(SQLiteOpenHelper sqliteOpenHelper) {
+ this.sqliteOpenHelper = sqliteOpenHelper;
+ }
+
+ @Override
+ public SQLiteDatabase getWritableDatabase() {
+ return sqliteOpenHelper.getWritableDatabase();
+ }
+
+ @Override
+ public SQLiteDatabase getReadableDatabase() {
+ return sqliteOpenHelper.getReadableDatabase();
+ }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
new file mode 100644
index 0000000000..32dda5965c
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
@@ -0,0 +1,95 @@
+/*
+ * 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.database;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import com.google.android.exoplayer2.util.Log;
+
+/**
+ * An {@link SQLiteOpenHelper} that provides instances of a standalone ExoPlayer database.
+ *
+ *
Suitable for use by applications that do not already have their own database, or that would
+ * prefer to keep ExoPlayer tables isolated in their own database. Other applications should prefer
+ * to use {@link DefaultDatabaseProvider} with their own {@link SQLiteOpenHelper}.
+ */
+public final class ExoDatabaseProvider extends SQLiteOpenHelper implements DatabaseProvider {
+
+ /** The file name used for the standalone ExoPlayer database. */
+ public static final String DATABASE_NAME = "exoplayer_internal.db";
+
+ private static final int VERSION = 1;
+ private static final String TAG = "ExoDatabaseProvider";
+
+ /**
+ * Provides instances of the database located by passing {@link #DATABASE_NAME} to {@link
+ * Context#getDatabasePath(String)}.
+ *
+ * @param context Any context.
+ */
+ public ExoDatabaseProvider(Context context) {
+ super(context.getApplicationContext(), DATABASE_NAME, /* factory= */ null, VERSION);
+ }
+
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ // Features create their own tables.
+ }
+
+ @Override
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ // Features handle their own upgrades.
+ }
+
+ @Override
+ public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ wipeDatabase(db);
+ }
+
+ /**
+ * Makes a best effort to wipe the existing database. The wipe may be incomplete if the database
+ * contains foreign key constraints.
+ */
+ private static void wipeDatabase(SQLiteDatabase db) {
+ String[] columns = {"type", "name"};
+ try (Cursor cursor =
+ db.query(
+ "sqlite_master",
+ columns,
+ /* selection= */ null,
+ /* selectionArgs= */ null,
+ /* groupBy= */ null,
+ /* having= */ null,
+ /* orderBy= */ null)) {
+ while (cursor.moveToNext()) {
+ String type = cursor.getString(0);
+ String name = cursor.getString(1);
+ if (!"sqlite_sequence".equals(name)) {
+ // If it's not an SQL-controlled entity, drop it
+ String sql = "DROP " + type + " IF EXISTS " + name;
+ try {
+ db.execSQL(sql);
+ } catch (SQLException e) {
+ Log.e(TAG, "Error executing " + sql, e);
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
new file mode 100644
index 0000000000..be367d2f22
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
@@ -0,0 +1,170 @@
+/*
+ * 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.database;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Utility methods for accessing versions of ExoPlayer database components. This allows them to be
+ * versioned independently to the version of the containing database.
+ */
+public final class VersionTable {
+
+ /** Returned by {@link #getVersion(SQLiteDatabase, int, String)} if the version is unset. */
+ public static final int VERSION_UNSET = -1;
+ /** Version of tables used for offline functionality. */
+ public static final int FEATURE_OFFLINE = 0;
+ /** Version of tables used for cache content metadata. */
+ public static final int FEATURE_CACHE_CONTENT_METADATA = 1;
+ /** Version of tables used for cache file metadata. */
+ public static final int FEATURE_CACHE_FILE_METADATA = 2;
+
+ private static final String TABLE_NAME = DatabaseProvider.TABLE_PREFIX + "Versions";
+
+ private static final String COLUMN_FEATURE = "feature";
+ private static final String COLUMN_INSTANCE_UID = "instance_uid";
+ private static final String COLUMN_VERSION = "version";
+
+ private static final String WHERE_FEATURE_AND_INSTANCE_UID_EQUALS =
+ COLUMN_FEATURE + " = ? AND " + COLUMN_INSTANCE_UID + " = ?";
+
+ private static final String PRIMARY_KEY =
+ "PRIMARY KEY (" + COLUMN_FEATURE + ", " + COLUMN_INSTANCE_UID + ")";
+ private static final String SQL_CREATE_TABLE_IF_NOT_EXISTS =
+ "CREATE TABLE IF NOT EXISTS "
+ + TABLE_NAME
+ + " ("
+ + COLUMN_FEATURE
+ + " INTEGER NOT NULL,"
+ + COLUMN_INSTANCE_UID
+ + " TEXT NOT NULL,"
+ + COLUMN_VERSION
+ + " INTEGER NOT NULL,"
+ + PRIMARY_KEY
+ + ")";
+
+ @Documented
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({FEATURE_OFFLINE, FEATURE_CACHE_CONTENT_METADATA, FEATURE_CACHE_FILE_METADATA})
+ private @interface Feature {}
+
+ private VersionTable() {}
+
+ /**
+ * Sets the version of a specified instance of a specified feature.
+ *
+ * @param writableDatabase The database to update.
+ * @param feature The feature.
+ * @param instanceUid The unique identifier of the instance of the feature.
+ * @param version The version.
+ * @throws DatabaseIOException If an error occurs executing the SQL.
+ */
+ public static void setVersion(
+ SQLiteDatabase writableDatabase, @Feature int feature, String instanceUid, int version)
+ throws DatabaseIOException {
+ try {
+ writableDatabase.execSQL(SQL_CREATE_TABLE_IF_NOT_EXISTS);
+ ContentValues values = new ContentValues();
+ values.put(COLUMN_FEATURE, feature);
+ values.put(COLUMN_INSTANCE_UID, instanceUid);
+ values.put(COLUMN_VERSION, version);
+ writableDatabase.replaceOrThrow(TABLE_NAME, /* nullColumnHack= */ null, values);
+ } catch (SQLException e) {
+ throw new DatabaseIOException(e);
+ }
+ }
+
+ /**
+ * Removes the version of a specified instance of a feature.
+ *
+ * @param writableDatabase The database to update.
+ * @param feature The feature.
+ * @param instanceUid The unique identifier of the instance of the feature.
+ * @throws DatabaseIOException If an error occurs executing the SQL.
+ */
+ public static void removeVersion(
+ SQLiteDatabase writableDatabase, @Feature int feature, String instanceUid)
+ throws DatabaseIOException {
+ try {
+ if (!tableExists(writableDatabase, TABLE_NAME)) {
+ return;
+ }
+ writableDatabase.delete(
+ TABLE_NAME,
+ WHERE_FEATURE_AND_INSTANCE_UID_EQUALS,
+ featureAndInstanceUidArguments(feature, instanceUid));
+ } catch (SQLException e) {
+ throw new DatabaseIOException(e);
+ }
+ }
+
+ /**
+ * Returns the version of a specified instance of a feature, or {@link #VERSION_UNSET} if no
+ * version is set.
+ *
+ * @param database The database to query.
+ * @param feature The feature.
+ * @param instanceUid The unique identifier of the instance of the feature.
+ * @return The version, or {@link #VERSION_UNSET} if no version is set.
+ * @throws DatabaseIOException If an error occurs executing the SQL.
+ */
+ public static int getVersion(SQLiteDatabase database, @Feature int feature, String instanceUid)
+ throws DatabaseIOException {
+ try {
+ if (!tableExists(database, TABLE_NAME)) {
+ return VERSION_UNSET;
+ }
+ try (Cursor cursor =
+ database.query(
+ TABLE_NAME,
+ new String[] {COLUMN_VERSION},
+ WHERE_FEATURE_AND_INSTANCE_UID_EQUALS,
+ featureAndInstanceUidArguments(feature, instanceUid),
+ /* groupBy= */ null,
+ /* having= */ null,
+ /* orderBy= */ null)) {
+ if (cursor.getCount() == 0) {
+ return VERSION_UNSET;
+ }
+ cursor.moveToNext();
+ return cursor.getInt(/* COLUMN_VERSION index */ 0);
+ }
+ } catch (SQLException e) {
+ throw new DatabaseIOException(e);
+ }
+ }
+
+ @VisibleForTesting
+ /* package */ static boolean tableExists(SQLiteDatabase readableDatabase, String tableName) {
+ long count =
+ DatabaseUtils.queryNumEntries(
+ readableDatabase, "sqlite_master", "tbl_name = ?", new String[] {tableName});
+ return count > 0;
+ }
+
+ private static String[] featureAndInstanceUidArguments(int feature, String instance) {
+ return new String[] {Integer.toString(feature), instance};
+ }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
index ec17de8d74..379ca971b5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
@@ -62,7 +62,7 @@ public final class CryptoInfo {
private final PatternHolderV24 patternHolder;
public CryptoInfo() {
- frameworkCryptoInfo = Util.SDK_INT >= 16 ? newFrameworkCryptoInfoV16() : null;
+ frameworkCryptoInfo = new android.media.MediaCodec.CryptoInfo();
patternHolder = Util.SDK_INT >= 24 ? new PatternHolderV24(frameworkCryptoInfo) : null;
}
@@ -79,34 +79,8 @@ public final class CryptoInfo {
this.mode = mode;
this.encryptedBlocks = encryptedBlocks;
this.clearBlocks = clearBlocks;
- if (Util.SDK_INT >= 16) {
- updateFrameworkCryptoInfoV16();
- }
- }
-
- /**
- * Returns an equivalent {@link android.media.MediaCodec.CryptoInfo} instance.
- *
- * Successive calls to this method on a single {@link CryptoInfo} will return the same instance.
- * Changes to the {@link CryptoInfo} will be reflected in the returned object. The return object
- * should not be modified directly.
- *
- * @return The equivalent {@link android.media.MediaCodec.CryptoInfo} instance.
- */
- @TargetApi(16)
- public android.media.MediaCodec.CryptoInfo getFrameworkCryptoInfoV16() {
- return frameworkCryptoInfo;
- }
-
- @TargetApi(16)
- private android.media.MediaCodec.CryptoInfo newFrameworkCryptoInfoV16() {
- return new android.media.MediaCodec.CryptoInfo();
- }
-
- @TargetApi(16)
- private void updateFrameworkCryptoInfoV16() {
- // Update fields directly because the framework's CryptoInfo.set performs an unnecessary object
- // allocation on Android N.
+ // Update frameworkCryptoInfo fields directly because CryptoInfo.set performs an unnecessary
+ // object allocation on Android N.
frameworkCryptoInfo.numSubSamples = numSubSamples;
frameworkCryptoInfo.numBytesOfClearData = numBytesOfClearData;
frameworkCryptoInfo.numBytesOfEncryptedData = numBytesOfEncryptedData;
@@ -118,6 +92,25 @@ public final class CryptoInfo {
}
}
+ /**
+ * Returns an equivalent {@link android.media.MediaCodec.CryptoInfo} instance.
+ *
+ *
Successive calls to this method on a single {@link CryptoInfo} will return the same
+ * instance. Changes to the {@link CryptoInfo} will be reflected in the returned object. The
+ * return object should not be modified directly.
+ *
+ * @return The equivalent {@link android.media.MediaCodec.CryptoInfo} instance.
+ */
+ public android.media.MediaCodec.CryptoInfo getFrameworkCryptoInfo() {
+ return frameworkCryptoInfo;
+ }
+
+ /** @deprecated Use {@link #getFrameworkCryptoInfo()}. */
+ @Deprecated
+ public android.media.MediaCodec.CryptoInfo getFrameworkCryptoInfoV16() {
+ return getFrameworkCryptoInfo();
+ }
+
@TargetApi(24)
private static final class PatternHolderV24 {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
index 983c96f89d..7fc6fb625a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2.decoder;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import com.google.android.exoplayer2.C;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
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 7e5ae694ce..f8204f6be3 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
@@ -15,7 +15,7 @@
*/
package com.google.android.exoplayer2.decoder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions;
import java.util.ArrayDeque;
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
new file mode 100644
index 0000000000..dbe5c93172
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionResource.java
@@ -0,0 +1,72 @@
+/*
+ * 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 0b1b4ba380..775d56f40b 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
@@ -22,20 +22,25 @@ import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.Pair;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
import com.google.android.exoplayer2.drm.ExoMediaDrm.KeyRequest;
import com.google.android.exoplayer2.drm.ExoMediaDrm.ProvisionRequest;
+import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.EventDispatcher;
import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.Util;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+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}.
@@ -84,7 +89,7 @@ import java.util.UUID;
private final ExoMediaDrm mediaDrm;
private final ProvisioningManager provisioningManager;
private final @DefaultDrmSessionManager.Mode int mode;
- private final HashMap optionalKeyRequestParameters;
+ private final @Nullable HashMap optionalKeyRequestParameters;
private final EventDispatcher eventDispatcher;
private final int initialDrmRequestRetryCount;
@@ -96,13 +101,13 @@ import java.util.UUID;
private int openCount;
private HandlerThread requestHandlerThread;
private PostRequestHandler postRequestHandler;
- private T mediaCrypto;
- private DrmSessionException lastException;
- private byte[] sessionId;
- private @Nullable byte[] offlineLicenseKeySetId;
+ private @Nullable T mediaCrypto;
+ private @Nullable DrmSessionException lastException;
+ private byte @MonotonicNonNull [] sessionId;
+ private byte @MonotonicNonNull [] offlineLicenseKeySetId;
- private KeyRequest currentKeyRequest;
- private ProvisionRequest currentProvisionRequest;
+ private @Nullable KeyRequest currentKeyRequest;
+ private @Nullable ProvisionRequest currentProvisionRequest;
/**
* Instantiates a new DRM session.
@@ -129,18 +134,25 @@ import java.util.UUID;
@Nullable List schemeDatas,
@DefaultDrmSessionManager.Mode int mode,
@Nullable byte[] offlineLicenseKeySetId,
- HashMap optionalKeyRequestParameters,
+ @Nullable HashMap optionalKeyRequestParameters,
MediaDrmCallback callback,
Looper playbackLooper,
EventDispatcher eventDispatcher,
int initialDrmRequestRetryCount) {
+ if (mode == DefaultDrmSessionManager.MODE_QUERY
+ || mode == DefaultDrmSessionManager.MODE_RELEASE) {
+ Assertions.checkNotNull(offlineLicenseKeySetId);
+ }
this.uuid = uuid;
this.provisioningManager = provisioningManager;
this.mediaDrm = mediaDrm;
this.mode = mode;
- this.offlineLicenseKeySetId = offlineLicenseKeySetId;
- this.schemeDatas =
- offlineLicenseKeySetId == null ? Collections.unmodifiableList(schemeDatas) : null;
+ if (offlineLicenseKeySetId != null) {
+ this.offlineLicenseKeySetId = offlineLicenseKeySetId;
+ this.schemeDatas = null;
+ } else {
+ this.schemeDatas = Collections.unmodifiableList(Assertions.checkNotNull(schemeDatas));
+ }
this.optionalKeyRequestParameters = optionalKeyRequestParameters;
this.callback = callback;
this.initialDrmRequestRetryCount = initialDrmRequestRetryCount;
@@ -166,9 +178,9 @@ import java.util.UUID;
}
}
- /**
- * @return True if the session is closed and cleaned up, false otherwise.
- */
+ /** @return True if the session is closed and cleaned up, false otherwise. */
+ // Assigning null to various non-null variables for clean-up. Class won't be used after release.
+ @SuppressWarnings("assignment.type.incompatible")
public boolean release() {
if (--openCount == 0) {
state = STATE_RELEASED;
@@ -195,24 +207,10 @@ import java.util.UUID;
return Arrays.equals(this.sessionId, sessionId);
}
- @SuppressWarnings("deprecation")
public void onMediaDrmEvent(int what) {
- if (!isOpen()) {
- return;
- }
switch (what) {
case ExoMediaDrm.EVENT_KEY_REQUIRED:
- doLicense(false);
- break;
- case ExoMediaDrm.EVENT_KEY_EXPIRED:
- // When an already expired key is loaded MediaDrm sends this event immediately. Ignore
- // this event if the state isn't STATE_OPENED_WITH_KEYS yet which means we're still
- // waiting for key response.
- onKeysExpired();
- break;
- case ExoMediaDrm.EVENT_PROVISION_REQUIRED:
- state = STATE_OPENED;
- provisioningManager.provisionRequired(this);
+ onKeysRequired();
break;
default:
break;
@@ -245,33 +243,35 @@ import java.util.UUID;
}
@Override
- public final DrmSessionException getError() {
+ public final @Nullable DrmSessionException getError() {
return state == STATE_ERROR ? lastException : null;
}
@Override
- public final T getMediaCrypto() {
+ public final @Nullable T getMediaCrypto() {
return mediaCrypto;
}
@Override
- public Map queryKeyStatus() {
+ public @Nullable Map queryKeyStatus() {
return sessionId == null ? null : mediaDrm.queryKeyStatus(sessionId);
}
@Override
- public byte[] getOfflineLicenseKeySetId() {
+ public @Nullable byte[] getOfflineLicenseKeySetId() {
return offlineLicenseKeySetId;
}
// Internal methods.
/**
- * Try to open a session, do provisioning if necessary.
- * @param allowProvisioning if provisioning is allowed, set this to false when calling from
- * processing provision response.
- * @return true on success, false otherwise.
+ * Try to open a session, do provisioning if necessary.
+ *
+ * @param allowProvisioning if provisioning is allowed, set this to false when calling from
+ * processing provision response.
+ * @return true on success, false otherwise.
*/
+ @EnsuresNonNullIf(result = true, expression = "sessionId")
private boolean openInternal(boolean allowProvisioning) {
if (isOpen()) {
// Already opened
@@ -319,19 +319,20 @@ import java.util.UUID;
provisioningManager.onProvisionCompleted();
}
+ @RequiresNonNull("sessionId")
private void doLicense(boolean allowRetry) {
switch (mode) {
case DefaultDrmSessionManager.MODE_PLAYBACK:
case DefaultDrmSessionManager.MODE_QUERY:
if (offlineLicenseKeySetId == null) {
- postKeyRequest(ExoMediaDrm.KEY_TYPE_STREAMING, allowRetry);
+ postKeyRequest(sessionId, ExoMediaDrm.KEY_TYPE_STREAMING, allowRetry);
} else if (state == STATE_OPENED_WITH_KEYS || restoreKeys()) {
long licenseDurationRemainingSec = getLicenseDurationRemainingSec();
if (mode == DefaultDrmSessionManager.MODE_PLAYBACK
&& licenseDurationRemainingSec <= MAX_LICENSE_DURATION_TO_RENEW) {
Log.d(TAG, "Offline license has expired or will expire soon. "
+ "Remaining seconds: " + licenseDurationRemainingSec);
- postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
+ postKeyRequest(sessionId, ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
} else if (licenseDurationRemainingSec <= 0) {
onError(new KeysExpiredException());
} else {
@@ -342,19 +343,20 @@ import java.util.UUID;
break;
case DefaultDrmSessionManager.MODE_DOWNLOAD:
if (offlineLicenseKeySetId == null) {
- postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
+ postKeyRequest(sessionId, ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
} else {
// Renew
if (restoreKeys()) {
- postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
+ postKeyRequest(sessionId, ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
}
}
break;
case DefaultDrmSessionManager.MODE_RELEASE:
+ Assertions.checkNotNull(offlineLicenseKeySetId);
// 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()) {
- postKeyRequest(ExoMediaDrm.KEY_TYPE_RELEASE, allowRetry);
+ postKeyRequest(offlineLicenseKeySetId, ExoMediaDrm.KEY_TYPE_RELEASE, allowRetry);
}
break;
default:
@@ -362,6 +364,7 @@ import java.util.UUID;
}
}
+ @RequiresNonNull({"sessionId", "offlineLicenseKeySetId"})
private boolean restoreKeys() {
try {
mediaDrm.restoreKeys(sessionId, offlineLicenseKeySetId);
@@ -377,12 +380,12 @@ import java.util.UUID;
if (!C.WIDEVINE_UUID.equals(uuid)) {
return Long.MAX_VALUE;
}
- Pair pair = WidevineUtil.getLicenseDurationRemainingSec(this);
+ Pair pair =
+ Assertions.checkNotNull(WidevineUtil.getLicenseDurationRemainingSec(this));
return Math.min(pair.first, pair.second);
}
- private void postKeyRequest(int type, boolean allowRetry) {
- byte[] scope = type == ExoMediaDrm.KEY_TYPE_RELEASE ? offlineLicenseKeySetId : sessionId;
+ private void postKeyRequest(byte[] scope, int type, boolean allowRetry) {
try {
currentKeyRequest =
mediaDrm.getKeyRequest(scope, schemeDatas, type, optionalKeyRequestParameters);
@@ -407,7 +410,7 @@ import java.util.UUID;
try {
byte[] responseData = (byte[]) response;
if (mode == DefaultDrmSessionManager.MODE_RELEASE) {
- mediaDrm.provideKeyResponse(offlineLicenseKeySetId, responseData);
+ mediaDrm.provideKeyResponse(Util.castNonNull(offlineLicenseKeySetId), responseData);
eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmKeysRestored);
} else {
byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, responseData);
@@ -424,10 +427,10 @@ import java.util.UUID;
}
}
- private void onKeysExpired() {
- if (state == STATE_OPENED_WITH_KEYS) {
- state = STATE_OPENED;
- onError(new KeysExpiredException());
+ private void onKeysRequired() {
+ if (mode == DefaultDrmSessionManager.MODE_PLAYBACK && state == STATE_OPENED_WITH_KEYS) {
+ Util.castNonNull(sessionId);
+ doLicense(/* allowRetry= */ false);
}
}
@@ -447,6 +450,8 @@ import java.util.UUID;
}
}
+ @EnsuresNonNullIf(result = true, expression = "sessionId")
+ @SuppressWarnings("contracts.conditional.postcondition.not.satisfied")
private boolean isOpen() {
return state == STATE_OPENED || state == STATE_OPENED_WITH_KEYS;
}
@@ -461,8 +466,9 @@ import java.util.UUID;
}
@Override
+ @SuppressWarnings("unchecked")
public void handleMessage(Message msg) {
- Pair requestAndResponse = (Pair) msg.obj;
+ Pair requestAndResponse = (Pair) msg.obj;
Object request = requestAndResponse.first;
Object response = requestAndResponse.second;
switch (msg.what) {
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 6062a6652a..3820836e49 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
@@ -20,8 +20,8 @@ import android.annotation.TargetApi;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.drm.DefaultDrmSession.ProvisioningManager;
@@ -47,10 +47,6 @@ import java.util.UUID;
public class DefaultDrmSessionManager implements DrmSessionManager,
ProvisioningManager {
- /** @deprecated Use {@link DefaultDrmSessionEventListener}. */
- @Deprecated
- public interface EventListener extends DefaultDrmSessionEventListener {}
-
/**
* Signals that the {@link DrmInitData} passed to {@link #acquireSession} does not contain does
* not contain scheme data for the required UUID.
@@ -96,7 +92,7 @@ public class DefaultDrmSessionManager implements DrmSe
private final UUID uuid;
private final ExoMediaDrm mediaDrm;
private final MediaDrmCallback callback;
- private final HashMap optionalKeyRequestParameters;
+ private final @Nullable HashMap optionalKeyRequestParameters;
private final EventDispatcher eventDispatcher;
private final boolean multiSession;
private final int initialDrmRequestRetryCount;
@@ -104,30 +100,11 @@ public class DefaultDrmSessionManager implements DrmSe
private final List> sessions;
private final List> provisioningSessions;
- private Looper playbackLooper;
+ private @Nullable Looper playbackLooper;
private int mode;
- private byte[] offlineLicenseKeySetId;
+ private @Nullable byte[] offlineLicenseKeySetId;
- /* package */ volatile MediaDrmHandler mediaDrmHandler;
-
- /**
- * @deprecated Use {@link #newWidevineInstance(MediaDrmCallback, HashMap)} and {@link
- * #addListener(Handler, DefaultDrmSessionEventListener)}.
- */
- @Deprecated
- public static DefaultDrmSessionManager newWidevineInstance(
- MediaDrmCallback callback,
- HashMap optionalKeyRequestParameters,
- Handler eventHandler,
- DefaultDrmSessionEventListener eventListener)
- throws UnsupportedDrmException {
- DefaultDrmSessionManager drmSessionManager =
- newWidevineInstance(callback, optionalKeyRequestParameters);
- if (eventHandler != null && eventListener != null) {
- drmSessionManager.addListener(eventHandler, eventListener);
- }
- return drmSessionManager;
- }
+ /* package */ volatile @Nullable MediaDrmHandler mediaDrmHandler;
/**
* Instantiates a new instance using the Widevine scheme.
@@ -138,30 +115,11 @@ public class DefaultDrmSessionManager implements DrmSe
* @throws UnsupportedDrmException If the specified DRM scheme is not supported.
*/
public static DefaultDrmSessionManager newWidevineInstance(
- MediaDrmCallback callback, HashMap optionalKeyRequestParameters)
+ MediaDrmCallback callback, @Nullable HashMap optionalKeyRequestParameters)
throws UnsupportedDrmException {
return newFrameworkInstance(C.WIDEVINE_UUID, callback, optionalKeyRequestParameters);
}
- /**
- * @deprecated Use {@link #newPlayReadyInstance(MediaDrmCallback, String)} and {@link
- * #addListener(Handler, DefaultDrmSessionEventListener)}.
- */
- @Deprecated
- public static DefaultDrmSessionManager newPlayReadyInstance(
- MediaDrmCallback callback,
- String customData,
- Handler eventHandler,
- DefaultDrmSessionEventListener eventListener)
- throws UnsupportedDrmException {
- DefaultDrmSessionManager drmSessionManager =
- newPlayReadyInstance(callback, customData);
- if (eventHandler != null && eventListener != null) {
- drmSessionManager.addListener(eventHandler, eventListener);
- }
- return drmSessionManager;
- }
-
/**
* Instantiates a new instance using the PlayReady scheme.
*
@@ -173,7 +131,7 @@ public class DefaultDrmSessionManager implements DrmSe
* @throws UnsupportedDrmException If the specified DRM scheme is not supported.
*/
public static DefaultDrmSessionManager newPlayReadyInstance(
- MediaDrmCallback callback, String customData) throws UnsupportedDrmException {
+ MediaDrmCallback callback, @Nullable String customData) throws UnsupportedDrmException {
HashMap optionalKeyRequestParameters;
if (!TextUtils.isEmpty(customData)) {
optionalKeyRequestParameters = new HashMap<>();
@@ -184,26 +142,6 @@ public class DefaultDrmSessionManager implements DrmSe
return newFrameworkInstance(C.PLAYREADY_UUID, callback, optionalKeyRequestParameters);
}
- /**
- * @deprecated Use {@link #newFrameworkInstance(UUID, MediaDrmCallback, HashMap)} and {@link
- * #addListener(Handler, DefaultDrmSessionEventListener)}.
- */
- @Deprecated
- public static DefaultDrmSessionManager newFrameworkInstance(
- UUID uuid,
- MediaDrmCallback callback,
- HashMap optionalKeyRequestParameters,
- Handler eventHandler,
- DefaultDrmSessionEventListener eventListener)
- throws UnsupportedDrmException {
- DefaultDrmSessionManager drmSessionManager =
- newFrameworkInstance(uuid, callback, optionalKeyRequestParameters);
- if (eventHandler != null && eventListener != null) {
- drmSessionManager.addListener(eventHandler, eventListener);
- }
- return drmSessionManager;
- }
-
/**
* Instantiates a new instance.
*
@@ -214,7 +152,9 @@ public class DefaultDrmSessionManager implements DrmSe
* @throws UnsupportedDrmException If the specified DRM scheme is not supported.
*/
public static DefaultDrmSessionManager newFrameworkInstance(
- UUID uuid, MediaDrmCallback callback, HashMap optionalKeyRequestParameters)
+ UUID uuid,
+ MediaDrmCallback callback,
+ @Nullable HashMap optionalKeyRequestParameters)
throws UnsupportedDrmException {
return new DefaultDrmSessionManager<>(
uuid,
@@ -225,24 +165,6 @@ public class DefaultDrmSessionManager implements DrmSe
INITIAL_DRM_REQUEST_RETRY_COUNT);
}
- /**
- * @deprecated Use {@link #DefaultDrmSessionManager(UUID, ExoMediaDrm, MediaDrmCallback, HashMap)}
- * and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
- */
- @Deprecated
- public DefaultDrmSessionManager(
- UUID uuid,
- ExoMediaDrm mediaDrm,
- MediaDrmCallback callback,
- HashMap optionalKeyRequestParameters,
- Handler eventHandler,
- DefaultDrmSessionEventListener eventListener) {
- this(uuid, mediaDrm, callback, optionalKeyRequestParameters);
- if (eventHandler != null && eventListener != null) {
- addListener(eventHandler, eventListener);
- }
- }
-
/**
* @param uuid The UUID of the drm scheme.
* @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
@@ -254,7 +176,7 @@ public class DefaultDrmSessionManager implements DrmSe
UUID uuid,
ExoMediaDrm mediaDrm,
MediaDrmCallback callback,
- HashMap optionalKeyRequestParameters) {
+ @Nullable HashMap optionalKeyRequestParameters) {
this(
uuid,
mediaDrm,
@@ -264,25 +186,6 @@ public class DefaultDrmSessionManager implements DrmSe
INITIAL_DRM_REQUEST_RETRY_COUNT);
}
- /**
- * @deprecated Use {@link #DefaultDrmSessionManager(UUID, ExoMediaDrm, MediaDrmCallback, HashMap,
- * boolean)} and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
- */
- @Deprecated
- public DefaultDrmSessionManager(
- UUID uuid,
- ExoMediaDrm mediaDrm,
- MediaDrmCallback callback,
- HashMap optionalKeyRequestParameters,
- Handler eventHandler,
- DefaultDrmSessionEventListener eventListener,
- boolean multiSession) {
- this(uuid, mediaDrm, callback, optionalKeyRequestParameters, multiSession);
- if (eventHandler != null && eventListener != null) {
- addListener(eventHandler, eventListener);
- }
- }
-
/**
* @param uuid The UUID of the drm scheme.
* @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
@@ -296,7 +199,7 @@ public class DefaultDrmSessionManager implements DrmSe
UUID uuid,
ExoMediaDrm mediaDrm,
MediaDrmCallback callback,
- HashMap optionalKeyRequestParameters,
+ @Nullable HashMap optionalKeyRequestParameters,
boolean multiSession) {
this(
uuid,
@@ -307,32 +210,6 @@ public class DefaultDrmSessionManager implements DrmSe
INITIAL_DRM_REQUEST_RETRY_COUNT);
}
- /**
- * @deprecated Use {@link #DefaultDrmSessionManager(UUID, ExoMediaDrm, MediaDrmCallback, HashMap,
- * boolean, int)} and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
- */
- @Deprecated
- public DefaultDrmSessionManager(
- UUID uuid,
- ExoMediaDrm mediaDrm,
- MediaDrmCallback callback,
- HashMap optionalKeyRequestParameters,
- Handler eventHandler,
- DefaultDrmSessionEventListener eventListener,
- boolean multiSession,
- int initialDrmRequestRetryCount) {
- this(
- uuid,
- mediaDrm,
- callback,
- optionalKeyRequestParameters,
- multiSession,
- initialDrmRequestRetryCount);
- if (eventHandler != null && eventListener != null) {
- addListener(eventHandler, eventListener);
- }
- }
-
/**
* @param uuid The UUID of the drm scheme.
* @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
@@ -348,7 +225,7 @@ public class DefaultDrmSessionManager implements DrmSe
UUID uuid,
ExoMediaDrm mediaDrm,
MediaDrmCallback callback,
- HashMap optionalKeyRequestParameters,
+ @Nullable HashMap optionalKeyRequestParameters,
boolean multiSession,
int initialDrmRequestRetryCount) {
Assertions.checkNotNull(uuid);
@@ -449,21 +326,22 @@ public class DefaultDrmSessionManager implements DrmSe
* required.
*
* {@code mode} must be one of these:
+ *
*
- * - {@link #MODE_PLAYBACK}: If {@code offlineLicenseKeySetId} is null, a streaming license is
- * requested otherwise the offline license is restored.
- *
- {@link #MODE_QUERY}: {@code offlineLicenseKeySetId} can not be null. The offline license
- * is restored.
- *
- {@link #MODE_DOWNLOAD}: If {@code offlineLicenseKeySetId} is null, an offline license is
- * requested otherwise the offline license is renewed.
- *
- {@link #MODE_RELEASE}: {@code offlineLicenseKeySetId} can not be null. The offline license
- * is released.
+ *
- {@link #MODE_PLAYBACK}: If {@code offlineLicenseKeySetId} is null, a streaming license is
+ * requested otherwise the offline license is restored.
+ *
- {@link #MODE_QUERY}: {@code offlineLicenseKeySetId} can not be null. The offline license
+ * is restored.
+ *
- {@link #MODE_DOWNLOAD}: If {@code offlineLicenseKeySetId} is null, an offline license is
+ * requested otherwise the offline license is renewed.
+ *
- {@link #MODE_RELEASE}: {@code offlineLicenseKeySetId} can not be null. The offline
+ * license is released.
*
*
* @param mode The mode to be set.
* @param offlineLicenseKeySetId The key set id of the license to be used with the given mode.
*/
- public void setMode(@Mode int mode, byte[] offlineLicenseKeySetId) {
+ public void setMode(@Mode int mode, @Nullable byte[] offlineLicenseKeySetId) {
Assertions.checkState(sessions.isEmpty());
if (mode == MODE_QUERY || mode == MODE_RELEASE) {
Assertions.checkNotNull(offlineLicenseKeySetId);
@@ -475,7 +353,7 @@ public class DefaultDrmSessionManager implements DrmSe
// DrmSessionManager implementation.
@Override
- public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
+ public boolean canAcquireSession(DrmInitData drmInitData) {
if (offlineLicenseKeySetId != null) {
// An offline license can be restored so a session can always be acquired.
return true;
@@ -583,6 +461,10 @@ public class DefaultDrmSessionManager implements DrmSe
@Override
public void provisionRequired(DefaultDrmSession session) {
+ if (provisioningSessions.contains(session)) {
+ // The session has already requested provisioning.
+ return;
+ }
provisioningSessions.add(session);
if (provisioningSessions.size() == 1) {
// This is the first session requesting provisioning, so have it perform the operation.
@@ -643,6 +525,10 @@ public class DefaultDrmSessionManager implements DrmSe
@Override
public void handleMessage(Message msg) {
byte[] sessionId = (byte[]) msg.obj;
+ if (sessionId == null) {
+ // The event is not associated with any particular session.
+ return;
+ }
for (DefaultDrmSession session : sessions) {
if (session.hasSessionId(sessionId)) {
session.onMediaDrmEvent(msg.what);
@@ -656,11 +542,13 @@ public class DefaultDrmSessionManager implements DrmSe
private class MediaDrmEventListener implements OnEventListener {
@Override
- public void onEvent(ExoMediaDrm md, byte[] sessionId, int event, int extra,
- byte[] data) {
- if (mode == DefaultDrmSessionManager.MODE_PLAYBACK) {
- mediaDrmHandler.obtainMessage(event, sessionId).sendToTarget();
- }
+ public void onEvent(
+ ExoMediaDrm md,
+ byte[] sessionId,
+ int event,
+ int extra,
+ @Nullable byte[] data) {
+ Assertions.checkNotNull(mediaDrmHandler).obtainMessage(event, sessionId).sendToTarget();
}
}
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 b9415c74af..4fde9f05d3 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
@@ -17,7 +17,8 @@ package com.google.android.exoplayer2.drm;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
+import android.text.TextUtils;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
import com.google.android.exoplayer2.util.Assertions;
@@ -85,10 +86,8 @@ public final class DrmInitData implements Comparator, Parcelable {
// Lazily initialized hashcode.
private int hashCode;
- /**
- * The protection scheme type, or null if not applicable or unknown.
- */
- @Nullable public final String schemeType;
+ /** The protection scheme type, or null if not applicable or unknown. */
+ public final @Nullable String schemeType;
/**
* Number of {@link SchemeData}s.
@@ -99,15 +98,15 @@ public final class DrmInitData implements Comparator, Parcelable {
* @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
*/
public DrmInitData(List schemeDatas) {
- this(null, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()]));
+ this(null, false, schemeDatas.toArray(new SchemeData[0]));
}
/**
* @param schemeType See {@link #schemeType}.
* @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
*/
- public DrmInitData(String schemeType, List schemeDatas) {
- this(schemeType, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()]));
+ public DrmInitData(@Nullable String schemeType, List schemeDatas) {
+ this(schemeType, false, schemeDatas.toArray(new SchemeData[0]));
}
/**
@@ -131,16 +130,17 @@ public final class DrmInitData implements Comparator, Parcelable {
if (cloneSchemeDatas) {
schemeDatas = schemeDatas.clone();
}
- // Sorting ensures that universal scheme data (i.e. data that applies to all schemes) is matched
- // last. It's also required by the equals and hashcode implementations.
- Arrays.sort(schemeDatas, this);
this.schemeDatas = schemeDatas;
schemeDataCount = schemeDatas.length;
+ // Sorting ensures that universal scheme data (i.e. data that applies to all schemes) is matched
+ // last. It's also required by the equals and hashcode implementations.
+ Arrays.sort(this.schemeDatas, this);
}
- /* package */ DrmInitData(Parcel in) {
+ /* package */
+ DrmInitData(Parcel in) {
schemeType = in.readString();
- schemeDatas = in.createTypedArray(SchemeData.CREATOR);
+ schemeDatas = Util.castNonNull(in.createTypedArray(SchemeData.CREATOR));
schemeDataCount = schemeDatas.length;
}
@@ -152,7 +152,7 @@ public final class DrmInitData implements Comparator, Parcelable {
* @return The initialization data for the scheme, or null if the scheme is not supported.
*/
@Deprecated
- public SchemeData get(UUID uuid) {
+ public @Nullable SchemeData get(UUID uuid) {
for (SchemeData schemeData : schemeDatas) {
if (schemeData.matches(uuid)) {
return schemeData;
@@ -184,6 +184,25 @@ public final class DrmInitData implements Comparator, Parcelable {
return new DrmInitData(schemeType, false, schemeDatas);
}
+ /**
+ * Returns an instance containing the {@link #schemeDatas} from both this and {@code other}. The
+ * {@link #schemeType} of the instances being merged must either match, or at least one scheme
+ * type must be {@code null}.
+ *
+ * @param drmInitData The instance to merge.
+ * @return The merged result.
+ */
+ public DrmInitData merge(DrmInitData drmInitData) {
+ Assertions.checkState(
+ schemeType == null
+ || drmInitData.schemeType == null
+ || TextUtils.equals(schemeType, drmInitData.schemeType));
+ String mergedSchemeType = schemeType != null ? this.schemeType : drmInitData.schemeType;
+ SchemeData[] mergedSchemeDatas =
+ Util.nullSafeArrayConcatenation(schemeDatas, drmInitData.schemeDatas);
+ return new DrmInitData(mergedSchemeType, mergedSchemeDatas);
+ }
+
@Override
public int hashCode() {
if (hashCode == 0) {
@@ -270,10 +289,8 @@ public final class DrmInitData implements Comparator, Parcelable {
public final @Nullable String licenseServerUrl;
/** The mimeType of {@link #data}. */
public final String mimeType;
- /**
- * The initialization data. May be null for scheme support checks only.
- */
- public final byte[] data;
+ /** The initialization data. May be null for scheme support checks only. */
+ public final @Nullable byte[] data;
/**
* Whether secure decryption is required.
*/
@@ -285,7 +302,7 @@ public final class DrmInitData implements Comparator, Parcelable {
* @param mimeType See {@link #mimeType}.
* @param data See {@link #data}.
*/
- public SchemeData(UUID uuid, String mimeType, byte[] data) {
+ public SchemeData(UUID uuid, String mimeType, @Nullable byte[] data) {
this(uuid, mimeType, data, false);
}
@@ -296,7 +313,8 @@ public final class DrmInitData implements Comparator, Parcelable {
* @param data See {@link #data}.
* @param requiresSecureDecryption See {@link #requiresSecureDecryption}.
*/
- public SchemeData(UUID uuid, String mimeType, byte[] data, boolean requiresSecureDecryption) {
+ public SchemeData(
+ UUID uuid, String mimeType, @Nullable byte[] data, boolean requiresSecureDecryption) {
this(uuid, /* licenseServerUrl= */ null, mimeType, data, requiresSecureDecryption);
}
@@ -312,7 +330,7 @@ public final class DrmInitData implements Comparator, Parcelable {
UUID uuid,
@Nullable String licenseServerUrl,
String mimeType,
- byte[] data,
+ @Nullable byte[] data,
boolean requiresSecureDecryption) {
this.uuid = Assertions.checkNotNull(uuid);
this.licenseServerUrl = licenseServerUrl;
@@ -324,7 +342,7 @@ public final class DrmInitData implements Comparator, Parcelable {
/* package */ SchemeData(Parcel in) {
uuid = new UUID(in.readLong(), in.readLong());
licenseServerUrl = in.readString();
- mimeType = in.readString();
+ mimeType = Util.castNonNull(in.readString());
data = in.createByteArray();
requiresSecureDecryption = in.readByte() != 0;
}
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 f2fbe94895..392b0734b1 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
@@ -15,9 +15,9 @@
*/
package com.google.android.exoplayer2.drm;
-import android.annotation.TargetApi;
import android.media.MediaDrm;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -26,7 +26,6 @@ import java.util.Map;
/**
* A DRM session.
*/
-@TargetApi(16)
public interface DrmSession {
/**
@@ -77,21 +76,24 @@ public interface DrmSession {
@State int getState();
/**
- * Returns the cause of the error state.
+ * Returns the cause of the error state, or null if {@link #getState()} is not {@link
+ * #STATE_ERROR}.
*/
+ @Nullable
DrmSessionException getError();
/**
* Returns a {@link ExoMediaCrypto} for the open session, or null if called before the session has
* been opened or after it's been released.
*/
+ @Nullable
T getMediaCrypto();
/**
* Returns a map describing the key status for the session, or null if called before the session
* has been opened or after it's been released.
- *
- * Since DRM license policies vary by vendor, the specific status field names are determined by
+ *
+ *
Since DRM license policies vary by vendor, the specific status field names are determined by
* each DRM vendor. Refer to your DRM provider documentation for definitions of the field names
* for a particular DRM engine plugin.
*
@@ -99,12 +101,13 @@ public interface DrmSession {
* has been opened or after it's been released.
* @see MediaDrm#queryKeyStatus(byte[])
*/
+ @Nullable
Map queryKeyStatus();
/**
* Returns the key set id of the offline license loaded into this session, or null if there isn't
* one.
*/
+ @Nullable
byte[] getOfflineLicenseKeySetId();
-
}
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 cf3d97d0b2..d8093507a4 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
@@ -15,14 +15,12 @@
*/
package com.google.android.exoplayer2.drm;
-import android.annotation.TargetApi;
import android.os.Looper;
import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
/**
* Manages a DRM session.
*/
-@TargetApi(16)
public interface DrmSessionManager {
/**
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 d30e670c3f..82fd9a5549 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
@@ -15,6 +15,7 @@
*/
package com.google.android.exoplayer2.drm;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.util.Assertions;
import java.util.Map;
@@ -33,22 +34,22 @@ public final class ErrorStateDrmSession implements Drm
}
@Override
- public DrmSessionException getError() {
+ public @Nullable DrmSessionException getError() {
return error;
}
@Override
- public T getMediaCrypto() {
+ public @Nullable T getMediaCrypto() {
return null;
}
@Override
- public Map queryKeyStatus() {
+ public @Nullable Map queryKeyStatus() {
return null;
}
@Override
- public byte[] getOfflineLicenseKeySetId() {
+ public @Nullable byte[] getOfflineLicenseKeySetId() {
return null;
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java
index d5a4f6add5..feba7eaaf4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java
@@ -15,14 +15,5 @@
*/
package com.google.android.exoplayer2.drm;
-/**
- * An opaque {@link android.media.MediaCrypto} equivalent.
- */
-public interface ExoMediaCrypto {
-
- /**
- * @see android.media.MediaCrypto#requiresSecureDecoderComponent(String)
- */
- boolean requiresSecureDecoderComponent(String mimeType);
-
-}
+/** An opaque {@link android.media.MediaCrypto} equivalent. */
+public interface ExoMediaCrypto {}
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 24c3ddbbd0..49915f3af5 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
@@ -21,7 +21,7 @@ import android.media.MediaDrm;
import android.media.MediaDrmException;
import android.media.NotProvisionedException;
import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
import java.util.HashMap;
import java.util.List;
@@ -265,11 +265,9 @@ public interface ExoMediaDrm {
/**
* @see android.media.MediaCrypto#MediaCrypto(UUID, byte[])
- *
- * @param initData Opaque initialization data specific to the crypto scheme.
+ * @param sessionId The DRM session ID.
* @return An object extends {@link ExoMediaCrypto}, using opaque crypto scheme specific data.
* @throws MediaCryptoException If the instance can't be created.
*/
- T createMediaCrypto(byte[] initData) throws MediaCryptoException;
-
+ T createMediaCrypto(byte[] sessionId) throws MediaCryptoException;
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
index 4e58ed6a31..7211b5fcde 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
@@ -15,50 +15,35 @@
*/
package com.google.android.exoplayer2.drm;
-import android.annotation.TargetApi;
import android.media.MediaCrypto;
-import com.google.android.exoplayer2.util.Assertions;
+import java.util.UUID;
/**
- * An {@link ExoMediaCrypto} implementation that wraps the framework {@link MediaCrypto}.
+ * An {@link ExoMediaCrypto} implementation that contains the necessary information to build or
+ * update a framework {@link MediaCrypto}.
*/
-@TargetApi(16)
public final class FrameworkMediaCrypto implements ExoMediaCrypto {
- private final MediaCrypto mediaCrypto;
- private final boolean forceAllowInsecureDecoderComponents;
+ /** The DRM scheme UUID. */
+ public final UUID uuid;
+ /** The DRM session id. */
+ public final byte[] sessionId;
+ /**
+ * Whether to allow use of insecure decoder components even if the underlying platform says
+ * otherwise.
+ */
+ public final boolean forceAllowInsecureDecoderComponents;
/**
- * @param mediaCrypto The {@link MediaCrypto} to wrap.
+ * @param uuid The DRM scheme UUID.
+ * @param sessionId The DRM session id.
+ * @param forceAllowInsecureDecoderComponents Whether to allow use of insecure decoder components
+ * even if the underlying platform says otherwise.
*/
- public FrameworkMediaCrypto(MediaCrypto mediaCrypto) {
- this(mediaCrypto, false);
- }
-
- /**
- * @param mediaCrypto The {@link MediaCrypto} to wrap.
- * @param forceAllowInsecureDecoderComponents Whether to force
- * {@link #requiresSecureDecoderComponent(String)} to return {@code false}, rather than
- * {@link MediaCrypto#requiresSecureDecoderComponent(String)} of the wrapped
- * {@link MediaCrypto}.
- */
- public FrameworkMediaCrypto(MediaCrypto mediaCrypto,
- boolean forceAllowInsecureDecoderComponents) {
- this.mediaCrypto = Assertions.checkNotNull(mediaCrypto);
+ public FrameworkMediaCrypto(
+ UUID uuid, byte[] sessionId, boolean forceAllowInsecureDecoderComponents) {
+ this.uuid = uuid;
+ this.sessionId = sessionId;
this.forceAllowInsecureDecoderComponents = forceAllowInsecureDecoderComponents;
}
-
- /**
- * Returns the wrapped {@link MediaCrypto}.
- */
- public MediaCrypto getWrappedMediaCrypto() {
- return mediaCrypto;
- }
-
- @Override
- public boolean requiresSecureDecoderComponent(String mimeType) {
- return !forceAllowInsecureDecoderComponents
- && mediaCrypto.requiresSecureDecoderComponent(mimeType);
- }
-
}
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 d2a5b6a0d6..615aa0e7b1 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
@@ -18,20 +18,24 @@ package com.google.android.exoplayer2.drm;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.media.DeniedByServerException;
-import android.media.MediaCrypto;
import android.media.MediaCryptoException;
import android.media.MediaDrm;
import android.media.MediaDrmException;
import android.media.NotProvisionedException;
import android.media.UnsupportedSchemeException;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -45,6 +49,10 @@ import java.util.UUID;
public final class FrameworkMediaDrm implements ExoMediaDrm {
private static final String CENC_SCHEME_MIME_TYPE = "cenc";
+ private static final String MOCK_LA_URL_VALUE = "https://x";
+ private static final String MOCK_LA_URL = "" + MOCK_LA_URL_VALUE + "";
+ private static final int UTF_16_BYTES_PER_CHARACTER = 2;
+ private static final String TAG = "FrameworkMediaDrm";
private final UUID uuid;
private final MediaDrm mediaDrm;
@@ -76,6 +84,8 @@ public final class FrameworkMediaDrm implements ExoMediaDrm listener) {
@@ -129,7 +139,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm schemeDatas) {
@@ -226,11 +241,12 @@ public final class FrameworkMediaDrm implements ExoMediaDrm= 23 && version == 1) {
@@ -272,6 +289,18 @@ public final class FrameworkMediaDrm implements ExoMediaDrm")) {
+ // LA_URL already present. Do nothing.
+ return data;
+ }
+ // This PlayReady object record does not include an LA_URL. We add a mock value for it.
+ int endOfDataTagIndex = xml.indexOf("");
+ if (endOfDataTagIndex == -1) {
+ Log.w(TAG, "Could not find the tag. Skipping LA_URL workaround.");
+ }
+ String xmlWithMockLaUrl =
+ xml.substring(/* beginIndex= */ 0, /* endIndex= */ endOfDataTagIndex)
+ + MOCK_LA_URL
+ + xml.substring(/* beginIndex= */ endOfDataTagIndex);
+ int extraBytes = MOCK_LA_URL.length() * UTF_16_BYTES_PER_CHARACTER;
+ ByteBuffer newData = ByteBuffer.allocate(length + extraBytes);
+ newData.order(ByteOrder.LITTLE_ENDIAN);
+ newData.putInt(length + extraBytes);
+ newData.putShort((short) objectRecordCount);
+ newData.putShort((short) recordType);
+ newData.putShort((short) (xmlWithMockLaUrl.length() * UTF_16_BYTES_PER_CHARACTER));
+ newData.put(xmlWithMockLaUrl.getBytes(Charset.forName(C.UTF16LE_NAME)));
+ return newData.array();
+ }
}
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 8b8c3bec99..a3e602e404 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
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.drm;
import android.annotation.TargetApi;
import android.net.Uri;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.drm.ExoMediaDrm.KeyRequest;
@@ -135,8 +136,12 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
return executePost(dataSourceFactory, url, request.getData(), requestProperties);
}
- private static byte[] executePost(HttpDataSource.Factory dataSourceFactory, String url,
- byte[] data, Map requestProperties) throws IOException {
+ private static byte[] executePost(
+ HttpDataSource.Factory dataSourceFactory,
+ String url,
+ byte[] data,
+ @Nullable Map requestProperties)
+ throws IOException {
HttpDataSource dataSource = dataSourceFactory.createDataSource();
if (requestProperties != null) {
for (Map.Entry requestProperty : requestProperties.entrySet()) {
@@ -164,17 +169,18 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
boolean manuallyRedirect =
(e.responseCode == 307 || e.responseCode == 308)
&& manualRedirectCount++ < MAX_MANUAL_REDIRECTS;
- url = manuallyRedirect ? getRedirectUrl(e) : null;
- if (url == null) {
+ String redirectUrl = manuallyRedirect ? getRedirectUrl(e) : null;
+ if (redirectUrl == null) {
throw e;
}
+ url = redirectUrl;
} finally {
Util.closeQuietly(inputStream);
}
}
}
- private static String getRedirectUrl(InvalidResponseCodeException exception) {
+ private static @Nullable String getRedirectUrl(InvalidResponseCodeException exception) {
Map> headerFields = exception.headerFields;
if (headerFields != null) {
List locationHeaders = headerFields.get("Location");
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 9298c16cb0..55a7a901ac 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
@@ -19,6 +19,7 @@ import android.media.MediaDrm;
import android.os.ConditionVariable;
import android.os.Handler;
import android.os.HandlerThread;
+import androidx.annotation.Nullable;
import android.util.Pair;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.drm.DefaultDrmSessionManager.Mode;
@@ -34,6 +35,8 @@ import java.util.UUID;
*/
public final class OfflineLicenseHelper {
+ private static final DrmInitData DUMMY_DRM_INIT_DATA = new DrmInitData();
+
private final ConditionVariable conditionVariable;
private final DefaultDrmSessionManager drmSessionManager;
private final HandlerThread handlerThread;
@@ -89,13 +92,13 @@ public final class OfflineLicenseHelper {
* @throws UnsupportedDrmException If the Widevine DRM scheme is unsupported or cannot be
* instantiated.
* @see DefaultDrmSessionManager#DefaultDrmSessionManager(java.util.UUID, ExoMediaDrm,
- * MediaDrmCallback, HashMap, Handler, DefaultDrmSessionEventListener)
+ * MediaDrmCallback, HashMap)
*/
public static OfflineLicenseHelper newWidevineInstance(
String defaultLicenseUrl,
boolean forceDefaultLicenseUrl,
Factory httpDataSourceFactory,
- HashMap optionalKeyRequestParameters)
+ @Nullable HashMap optionalKeyRequestParameters)
throws UnsupportedDrmException {
return new OfflineLicenseHelper<>(C.WIDEVINE_UUID,
FrameworkMediaDrm.newInstance(C.WIDEVINE_UUID),
@@ -112,13 +115,13 @@ public final class OfflineLicenseHelper {
* @param optionalKeyRequestParameters An optional map of parameters to pass as the last argument
* to {@link MediaDrm#getKeyRequest(byte[], byte[], String, int, HashMap)}. May be null.
* @see DefaultDrmSessionManager#DefaultDrmSessionManager(java.util.UUID, ExoMediaDrm,
- * MediaDrmCallback, HashMap, Handler, DefaultDrmSessionEventListener)
+ * MediaDrmCallback, HashMap)
*/
public OfflineLicenseHelper(
UUID uuid,
ExoMediaDrm mediaDrm,
MediaDrmCallback callback,
- HashMap optionalKeyRequestParameters) {
+ @Nullable HashMap optionalKeyRequestParameters) {
handlerThread = new HandlerThread("OfflineLicenseHelper");
handlerThread.start();
conditionVariable = new ConditionVariable();
@@ -199,7 +202,8 @@ public final class OfflineLicenseHelper {
public synchronized byte[] renewLicense(byte[] offlineLicenseKeySetId)
throws DrmSessionException {
Assertions.checkNotNull(offlineLicenseKeySetId);
- return blockingKeyRequest(DefaultDrmSessionManager.MODE_DOWNLOAD, offlineLicenseKeySetId, null);
+ return blockingKeyRequest(
+ DefaultDrmSessionManager.MODE_DOWNLOAD, offlineLicenseKeySetId, DUMMY_DRM_INIT_DATA);
}
/**
@@ -211,7 +215,8 @@ public final class OfflineLicenseHelper {
public synchronized void releaseLicense(byte[] offlineLicenseKeySetId)
throws DrmSessionException {
Assertions.checkNotNull(offlineLicenseKeySetId);
- blockingKeyRequest(DefaultDrmSessionManager.MODE_RELEASE, offlineLicenseKeySetId, null);
+ blockingKeyRequest(
+ DefaultDrmSessionManager.MODE_RELEASE, offlineLicenseKeySetId, DUMMY_DRM_INIT_DATA);
}
/**
@@ -224,8 +229,9 @@ public final class OfflineLicenseHelper {
public synchronized Pair getLicenseDurationRemainingSec(byte[] offlineLicenseKeySetId)
throws DrmSessionException {
Assertions.checkNotNull(offlineLicenseKeySetId);
- DrmSession