Skip to content

Commit

Permalink
Ensure DrmSessionManager.setPlayer() is called before prepare()
Browse files Browse the repository at this point in the history 
`prepare()` now logs a warning if it's called before `setPlayer()`
because it's not possible to tell if it's being called on the wrong
thread (since 9d028b3).

This change finds all the places one is called immediately after the
other and flips the order to be more correct.

Issue: androidx/media#350

#minor-release

PiperOrigin-RevId: 526582294
  • Loading branch information
@icbaker @rohitjoins
icbaker authored and rohitjoins committed Apr 24, 2023
1 parent 6da9306 commit aa4e008
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,9 @@ public MediaItem getMediaItem() {
@Override
protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
transferListener = mediaTransferListener;
drmSessionManager.prepare();
drmSessionManager.setPlayer(
/* playbackLooper= */ checkNotNull(Looper.myLooper()), getPlayerId());
drmSessionManager.prepare();
notifySourceInfoRefreshed();
}

Expand Down
42 changes: 21 additions & 21 deletions ...ry/core/src/test/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ public void acquireSession_triggersKeyLoadAndSessionIsOpened() throws Exception
new DefaultDrmSessionManager.Builder()
.setUuidAndExoMediaDrmProvider(DRM_SCHEME_UUID, uuid -> new FakeExoMediaDrm())
.build(/* mediaDrmCallback= */ licenseServer);
drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand All @@ -90,8 +90,8 @@ public void keepaliveEnabled_sessionsKeptForRequestedTime() throws Exception {
.setSessionKeepaliveMs(10_000)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand All @@ -115,8 +115,8 @@ public void keepaliveDisabled_sessionsReleasedImmediately() throws Exception {
.setSessionKeepaliveMs(C.TIME_UNSET)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand All @@ -137,8 +137,8 @@ public void managerRelease_allKeepaliveSessionsImmediatelyReleased() throws Exce
.setSessionKeepaliveMs(10_000)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand All @@ -161,8 +161,8 @@ public void managerRelease_keepaliveDisabled_doesntReleaseAnySessions() throws E
.setSessionKeepaliveMs(C.TIME_UNSET)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand All @@ -187,8 +187,8 @@ public void managerRelease_mediaDrmNotReleasedUntilLastSessionReleased() throws
.setSessionKeepaliveMs(10_000)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand Down Expand Up @@ -232,8 +232,8 @@ public void managerRelease_mediaDrmNotReleasedUntilLastSessionReleased() throws
.setSessionKeepaliveMs(10_000)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand Down Expand Up @@ -271,8 +271,8 @@ public void maxConcurrentSessionsExceeded_allKeepAliveSessionsEagerlyReleased()
.setMultiSession(true)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession firstDrmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand Down Expand Up @@ -312,8 +312,8 @@ public void maxConcurrentSessionsExceeded_allPreacquiredAndKeepaliveSessionsEage
.setMultiSession(true)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSessionReference firstDrmSessionReference =
checkNotNull(
drmSessionManager.preacquireSession(
Expand Down Expand Up @@ -357,8 +357,8 @@ public void sessionReacquired_keepaliveTimeOutCancelled() throws Exception {
.setSessionKeepaliveMs(10_000)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession firstDrmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand Down Expand Up @@ -404,8 +404,8 @@ public void onDrmKeysLoaded(
.setSessionKeepaliveMs(C.TIME_UNSET)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();

DrmSessionReference sessionReference =
drmSessionManager.preacquireSession(eventDispatcher, FORMAT_WITH_DRM_INIT_DATA);
Expand Down Expand Up @@ -449,8 +449,8 @@ public void onDrmKeysLoaded(
.setSessionKeepaliveMs(C.TIME_UNSET)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();

DrmSessionReference sessionReference =
drmSessionManager.preacquireSession(/* eventDispatcher= */ null, FORMAT_WITH_DRM_INIT_DATA);
Expand Down Expand Up @@ -485,8 +485,8 @@ public void preacquireSession_releaseManagerBeforeAcquisition_acquisitionDoesntH
.setSessionKeepaliveMs(C.TIME_UNSET)
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();

DrmSessionReference sessionReference =
drmSessionManager.preacquireSession(/* eventDispatcher= */ null, FORMAT_WITH_DRM_INIT_DATA);
Expand Down Expand Up @@ -529,8 +529,8 @@ public void keyRefreshEvent_triggersKeyRefresh() throws Exception {
.setUuidAndExoMediaDrmProvider(DRM_SCHEME_UUID, new AppManagedProvider(exoMediaDrm))
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();

DefaultDrmSession drmSession =
(DefaultDrmSession)
Expand Down Expand Up @@ -570,8 +570,8 @@ public void keyRefreshEvent_whileManagerIsReleasing_triggersKeyRefresh() throws
.setUuidAndExoMediaDrmProvider(DRM_SCHEME_UUID, new AppManagedProvider(exoMediaDrm))
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();

DefaultDrmSession drmSession =
(DefaultDrmSession)
Expand Down Expand Up @@ -614,8 +614,8 @@ public void keyRefreshEvent_whileManagerIsReleasing_triggersKeyRefresh() throws
DRM_SCHEME_UUID,
uuid -> new FakeExoMediaDrm.Builder().setProvisionsRequired(1).build())
.build(/* mediaDrmCallback= */ licenseServer);
drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand Down Expand Up @@ -647,8 +647,8 @@ public void keyRefreshEvent_whileManagerIsReleasing_triggersKeyRefresh() throws
.throwNotProvisionedExceptionFromGetKeyRequest()
.build())
.build(/* mediaDrmCallback= */ licenseServer);
drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand All @@ -673,8 +673,8 @@ public void deviceNotProvisioned_doubleProvisioningHandledAndOpenSessionRetried(
DRM_SCHEME_UUID,
uuid -> new FakeExoMediaDrm.Builder().setProvisionsRequired(2).build())
.build(/* mediaDrmCallback= */ licenseServer);
drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand All @@ -701,8 +701,8 @@ public void keyResponseIndicatesProvisioningRequired_provisioningDone() {
.setUuidAndExoMediaDrmProvider(
DRM_SCHEME_UUID, uuid -> new FakeExoMediaDrm.Builder().build())
.build(/* mediaDrmCallback= */ licenseServer);
drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand All @@ -727,8 +727,8 @@ public void provisioningUndoneWhileManagerIsActive_deviceReprovisioned() {
.setUuidAndExoMediaDrmProvider(DRM_SCHEME_UUID, new AppManagedProvider(mediaDrm))
.setSessionKeepaliveMs(C.TIME_UNSET)
.build(/* mediaDrmCallback= */ licenseServer);
drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand Down Expand Up @@ -782,8 +782,8 @@ public void managerReleasing_acquireSessionAndPreacquireSessionFail() throws Exc
.setUuidAndExoMediaDrmProvider(DRM_SCHEME_UUID, uuid -> new FakeExoMediaDrm())
.build(/* mediaDrmCallback= */ licenseServer);

drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), PlayerId.UNSET);
drmSessionManager.prepare();
DrmSession drmSession =
checkNotNull(
drmSessionManager.acquireSession(
Expand Down
2 changes: 1 addition & 1 deletion library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,8 @@ public MediaItem getMediaItem() {
@Override
protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
this.mediaTransferListener = mediaTransferListener;
drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), getPlayerId());
drmSessionManager.prepare();
if (sideloadedManifest) {
processManifest(false);
} else {
Expand Down
2 changes: 1 addition & 1 deletion library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,9 @@ public MediaItem getMediaItem() {
@Override
protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
this.mediaTransferListener = mediaTransferListener;
drmSessionManager.prepare();
drmSessionManager.setPlayer(
/* playbackLooper= */ checkNotNull(Looper.myLooper()), getPlayerId());
drmSessionManager.prepare();
MediaSourceEventListener.EventDispatcher eventDispatcher =
createEventDispatcher(/* mediaPeriodId= */ null);
playlistTracker.start(
Expand Down
2 changes: 1 addition & 1 deletion ...ing/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,8 @@ public MediaItem getMediaItem() {
@Override
protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
this.mediaTransferListener = mediaTransferListener;
drmSessionManager.prepare();
drmSessionManager.setPlayer(/* playbackLooper= */ Looper.myLooper(), getPlayerId());
drmSessionManager.prepare();
if (sideloadedManifest) {
manifestLoaderErrorThrower = new LoaderErrorThrower.Dummy();
processManifest();
Expand Down
2 changes: 1 addition & 1 deletion testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ public boolean isSingleWindow() {
public synchronized void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
assertThat(preparedSource).isFalse();
transferListener = mediaTransferListener;
drmSessionManager.prepare();
drmSessionManager.setPlayer(
/* playbackLooper= */ checkNotNull(Looper.myLooper()), getPlayerId());
drmSessionManager.prepare();
preparedSource = true;
releasedSource = false;
sourceInfoRefreshHandler = Util.createHandlerForCurrentLooper();
Expand Down

0 comments on commit aa4e008

Please sign in to comment.