Better behavior if media doesn't support DRM scheme

We don't expect this case to occur, since track selection is
normally expected to check canAcquireSession before selecting
a track. Nevertheless, if an attempt is made to acquire a
session when the media doesn't support the manager's UUID, we
should fail in a more graceful way.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173124170
This commit is contained in:
olly 2017-10-23 09:13:44 -07:00 committed by Oliver Woodman
parent 3289e3e9cb
commit c4f3cad586
2 changed files with 69 additions and 5 deletions

View File

@ -26,6 +26,7 @@ import android.text.TextUtils;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.drm.DefaultDrmSession.ProvisioningManager; import com.google.android.exoplayer2.drm.DefaultDrmSession.ProvisioningManager;
import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
import com.google.android.exoplayer2.drm.DrmSession.DrmSessionException;
import com.google.android.exoplayer2.drm.ExoMediaDrm.OnEventListener; import com.google.android.exoplayer2.drm.ExoMediaDrm.OnEventListener;
import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil; import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
@ -372,20 +373,21 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
if (offlineLicenseKeySetId == null) { if (offlineLicenseKeySetId == null) {
SchemeData data = getSchemeData(drmInitData, uuid); SchemeData data = getSchemeData(drmInitData, uuid);
if (data == null) { if (data == null) {
final IllegalStateException error = new IllegalStateException(
"Media does not support uuid: " + uuid);
if (eventHandler != null && eventListener != null) { if (eventHandler != null && eventListener != null) {
eventHandler.post(new Runnable() { eventHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
eventListener.onDrmSessionManagerError(new IllegalStateException( eventListener.onDrmSessionManagerError(error);
"Media does not support uuid: " + uuid));
} }
}); });
} }
} else { return new ErrorStateDrmSession<>(new DrmSessionException(error));
}
initData = getSchemeInitData(data, uuid); initData = getSchemeInitData(data, uuid);
mimeType = getSchemeMimeType(data, uuid); mimeType = getSchemeMimeType(data, uuid);
} }
}
DefaultDrmSession<T> session; DefaultDrmSession<T> session;
if (!multiSession) { if (!multiSession) {
@ -414,6 +416,11 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
@Override @Override
public void releaseSession(DrmSession<T> session) { public void releaseSession(DrmSession<T> session) {
if (session instanceof ErrorStateDrmSession) {
// Do nothing.
return;
}
DefaultDrmSession<T> drmSession = (DefaultDrmSession<T>) session; DefaultDrmSession<T> drmSession = (DefaultDrmSession<T>) session;
if (drmSession.release()) { if (drmSession.release()) {
sessions.remove(drmSession); sessions.remove(drmSession);

View File

@ -0,0 +1,57 @@
/*
* 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.drm;
import com.google.android.exoplayer2.util.Assertions;
import java.util.Map;
/**
* A {@link DrmSession} that's in a terminal error state.
*/
/* package */ final class ErrorStateDrmSession<T extends ExoMediaCrypto> implements DrmSession<T> {
private final DrmSessionException error;
public ErrorStateDrmSession(DrmSessionException error) {
this.error = Assertions.checkNotNull(error);
}
@Override
public int getState() {
return STATE_ERROR;
}
@Override
public DrmSessionException getError() {
return error;
}
@Override
public T getMediaCrypto() {
return null;
}
@Override
public Map<String, String> queryKeyStatus() {
return null;
}
@Override
public byte[] getOfflineLicenseKeySetId() {
return null;
}
}