+ * This method may be called when the manager is in the following states: + * {@link #STATE_OPENED}, {@link #STATE_OPENED_WITH_KEYS} + * + * @return A {@link MediaCrypto} for the open session. + * @throws IllegalStateException If called when a session isn't opened. + */ + MediaCrypto getMediaCrypto(); + + /** + * Whether the session requires a secure decoder for the specified mime type. + *
+ * Normally this method should return {@link MediaCrypto#requiresSecureDecoderComponent(String)}, + * however in some cases implementations may wish to modify the return value (i.e. to force a + * secure decoder even when one is not required). + *
+ * This method may be called when the manager is in the following states: + * {@link #STATE_OPENED}, {@link #STATE_OPENED_WITH_KEYS} + * + * @return Whether the open session requires a secure decoder for the specified mime type. + * @throws IllegalStateException If called when a session isn't opened. + */ + boolean requiresSecureDecoderComponent(String mimeType); + + /** + * Gets the cause of the error state. + *
+ * This method may be called when the manager is in any state. + * + * @return An exception if the state is {@link #STATE_ERROR}. Null otherwise. + */ + Exception getError(); + +} diff --git a/library/src/main/java/com/google/android/exoplayer/drm/DrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer/drm/DrmSessionManager.java index 16fa52b730..940c347c2b 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/DrmSessionManager.java +++ b/library/src/main/java/com/google/android/exoplayer/drm/DrmSessionManager.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer.drm; import android.annotation.TargetApi; -import android.media.MediaCrypto; import android.os.Looper; /** @@ -26,81 +25,20 @@ import android.os.Looper; public interface DrmSessionManager { /** - * The error state. {@link #getError()} can be used to retrieve the cause. - */ - int STATE_ERROR = 0; - /** - * The session is closed. - */ - int STATE_CLOSED = 1; - /** - * The session is being opened (i.e. {@link #open(Looper, DrmInitData)} has been called, but the - * session is not yet open). - */ - int STATE_OPENING = 2; - /** - * The session is open, but does not yet have the keys required for decryption. - */ - int STATE_OPENED = 3; - /** - * The session is open and has the keys required for decryption. - */ - int STATE_OPENED_WITH_KEYS = 4; - - /** - * Opens the session, possibly asynchronously. + * Acquires a {@link DrmSession} for the specified {@link DrmInitData}. + *
+ * The {@link DrmSession} must be returned to {@link #releaseSession(DrmSession)} when it is no + * longer required * * @param playbackLooper The looper associated with the media playback thread. * @param drmInitData DRM initialization data. + * @return The DRM session. */ - void open(Looper playbackLooper, DrmInitData drmInitData); + DrmSession acquireSession(Looper playbackLooper, DrmInitData drmInitData); /** - * Closes the session. + * Releases a {@link DrmSession}. */ - void close(); - - /** - * Gets the current state of the session. - * - * @return One of {@link #STATE_ERROR}, {@link #STATE_CLOSED}, {@link #STATE_OPENING}, - * {@link #STATE_OPENED} and {@link #STATE_OPENED_WITH_KEYS}. - */ - int getState(); - - /** - * Gets a {@link MediaCrypto} for the open session. - *
- * This method may be called when the manager is in the following states: - * {@link #STATE_OPENED}, {@link #STATE_OPENED_WITH_KEYS} - * - * @return A {@link MediaCrypto} for the open session. - * @throws IllegalStateException If called when a session isn't opened. - */ - MediaCrypto getMediaCrypto(); - - /** - * Whether the session requires a secure decoder for the specified mime type. - *
- * Normally this method should return {@link MediaCrypto#requiresSecureDecoderComponent(String)}, - * however in some cases implementations may wish to modify the return value (i.e. to force a - * secure decoder even when one is not required). - *
- * This method may be called when the manager is in the following states: - * {@link #STATE_OPENED}, {@link #STATE_OPENED_WITH_KEYS} - * - * @return Whether the open session requires a secure decoder for the specified mime type. - * @throws IllegalStateException If called when a session isn't opened. - */ - boolean requiresSecureDecoderComponent(String mimeType); - - /** - * Gets the cause of the error state. - *
- * This method may be called when the manager is in any state. - * - * @return An exception if the state is {@link #STATE_ERROR}. Null otherwise. - */ - Exception getError(); + void releaseSession(DrmSession drmSession); } diff --git a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java index 044e2a95f4..a670484d13 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java +++ b/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java @@ -41,11 +41,10 @@ import java.util.HashMap; import java.util.UUID; /** - * A base class for {@link DrmSessionManager} implementations that support streaming playbacks - * using {@link MediaDrm}. + * A {@link DrmSessionManager} that supports streaming playbacks using {@link MediaDrm}. */ @TargetApi(18) -public class StreamingDrmSessionManager implements DrmSessionManager { +public class StreamingDrmSessionManager implements DrmSessionManager, DrmSession { /** * Interface definition for a callback to be notified of {@link StreamingDrmSessionManager} @@ -172,32 +171,6 @@ public class StreamingDrmSessionManager implements DrmSessionManager { state = STATE_CLOSED; } - @Override - public final int getState() { - return state; - } - - @Override - public final MediaCrypto getMediaCrypto() { - if (state != STATE_OPENED && state != STATE_OPENED_WITH_KEYS) { - throw new IllegalStateException(); - } - return mediaCrypto; - } - - @Override - public boolean requiresSecureDecoderComponent(String mimeType) { - if (state != STATE_OPENED && state != STATE_OPENED_WITH_KEYS) { - throw new IllegalStateException(); - } - return mediaCrypto.requiresSecureDecoderComponent(mimeType); - } - - @Override - public final Exception getError() { - return state == STATE_ERROR ? lastException : null; - } - /** * Provides access to {@link MediaDrm#getPropertyString(String)}. *
@@ -246,11 +219,13 @@ public class StreamingDrmSessionManager implements DrmSessionManager { mediaDrm.setPropertyByteArray(key, value); } + // DrmSessionManager implementation. + @Override - public void open(Looper playbackLooper, DrmInitData drmInitData) { + public DrmSession acquireSession(Looper playbackLooper, DrmInitData drmInitData) { Assertions.checkState(this.playbackLooper == null || this.playbackLooper == playbackLooper); if (++openCount != 1) { - return; + return this; } if (this.playbackLooper == null) { @@ -266,7 +241,7 @@ public class StreamingDrmSessionManager implements DrmSessionManager { schemeData = drmInitData.get(uuid); if (schemeData == null) { onError(new IllegalStateException("Media does not support uuid: " + uuid)); - return; + return this; } if (Util.SDK_INT < 21) { // Prior to L the Widevine CDM required data to be extracted from the PSSH atom. @@ -279,10 +254,11 @@ public class StreamingDrmSessionManager implements DrmSessionManager { } state = STATE_OPENING; openInternal(true); + return this; } @Override - public void close() { + public void releaseSession(DrmSession session) { if (--openCount != 0) { return; } @@ -303,6 +279,36 @@ public class StreamingDrmSessionManager implements DrmSessionManager { } } + // DrmSession implementation. + + @Override + public final int getState() { + return state; + } + + @Override + public final MediaCrypto getMediaCrypto() { + if (state != STATE_OPENED && state != STATE_OPENED_WITH_KEYS) { + throw new IllegalStateException(); + } + return mediaCrypto; + } + + @Override + public boolean requiresSecureDecoderComponent(String mimeType) { + if (state != STATE_OPENED && state != STATE_OPENED_WITH_KEYS) { + throw new IllegalStateException(); + } + return mediaCrypto.requiresSecureDecoderComponent(mimeType); + } + + @Override + public final Exception getError() { + return state == STATE_ERROR ? lastException : null; + } + + // Internal methods. + private void openInternal(boolean allowProvisioning) { try { sessionId = mediaDrm.openSession();