sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove spurious TargetApi annotation

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=194535300
This commit is contained in:
olly 2018-04-27 06:38:05 -07:00 committed by Oliver Woodman
parent ed994517b2
commit 159979e69e
1 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
View file

@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.drm; package com.google.android.exoplayer2.drm;
import android.annotation.TargetApi;
import android.media.DeniedByServerException; import android.media.DeniedByServerException;
import android.media.MediaCryptoException; import android.media.MediaCryptoException;
import android.media.MediaDrm; import android.media.MediaDrm;
import android.media.MediaDrmException; import android.media.MediaDrmException;
import android.media.NotProvisionedException; import android.media.NotProvisionedException;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.Nullable;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -30,7 +30,6 @@ import java.util.UUID;
/** /**
* Used to obtain keys for decrypting protected media streams. See {@link android.media.MediaDrm}. * Used to obtain keys for decrypting protected media streams. See {@link android.media.MediaDrm}.
*/ */
@TargetApi(18)
public interface ExoMediaDrm<T extends ExoMediaCrypto> { public interface ExoMediaDrm<T extends ExoMediaCrypto> {
/** /**
@ -72,14 +71,18 @@ public interface ExoMediaDrm<T extends ExoMediaCrypto> {
/** /**
* Called when an event occurs that requires the app to be notified * Called when an event occurs that requires the app to be notified
* *
* @param mediaDrm the {@link ExoMediaDrm} object on which the event occurred. * @param mediaDrm The {@link ExoMediaDrm} object on which the event occurred.
* @param sessionId the DRM session ID on which the event occurred * @param sessionId The DRM session ID on which the event occurred.
* @param event indicates the event type * @param event Indicates the event type.
* @param extra an secondary error code * @param extra A secondary error code.
* @param data optional byte array of data that may be associated with the event * @param data Optional byte array of data that may be associated with the event.
*/ */
void onEvent(ExoMediaDrm<? extends T> mediaDrm, byte[] sessionId, int event, int extra, void onEvent(
byte[] data); ExoMediaDrm<? extends T> mediaDrm,
byte[] sessionId,
int event,
int extra,
@Nullable byte[] data);
} }
/** /**
@ -90,20 +93,25 @@ public interface ExoMediaDrm<T extends ExoMediaCrypto> {
* Called when the keys in a session change status, such as when the license is renewed or * Called when the keys in a session change status, such as when the license is renewed or
* expires. * expires.
* *
* @param mediaDrm the {@link ExoMediaDrm} object on which the event occurred. * @param mediaDrm The {@link ExoMediaDrm} object on which the event occurred.
* @param sessionId the DRM session ID on which the event occurred. * @param sessionId The DRM session ID on which the event occurred.
* @param exoKeyInfo a list of {@link KeyStatus} that contains key ID and status. * @param exoKeyInformation A list of {@link KeyStatus} that contains key ID and status.
* @param hasNewUsableKey true if new key becomes usable. * @param hasNewUsableKey Whether a new key became usable.
*/ */
void onKeyStatusChange(ExoMediaDrm<? extends T> mediaDrm, byte[] sessionId, void onKeyStatusChange(
List<KeyStatus> exoKeyInfo, boolean hasNewUsableKey); ExoMediaDrm<? extends T> mediaDrm,
byte[] sessionId,
List<KeyStatus> exoKeyInformation,
boolean hasNewUsableKey);
} }
/** /**
* @see android.media.MediaDrm.KeyStatus * @see android.media.MediaDrm.KeyStatus
*/ */
interface KeyStatus { interface KeyStatus {
/** Returns the status code for the key. */
int getStatusCode(); int getStatusCode();
/** Returns the id for the key. */
byte[] getKeyId(); byte[] getKeyId();
} }
@ -218,15 +226,16 @@ public interface ExoMediaDrm<T extends ExoMediaCrypto> {
*/ */
void closeSession(byte[] sessionId); void closeSession(byte[] sessionId);
/** /** @see MediaDrm#getKeyRequest(byte[], byte[], String, int, HashMap) */
* @see MediaDrm#getKeyRequest(byte[], byte[], String, int, HashMap) KeyRequest getKeyRequest(
*/ byte[] scope,
KeyRequest getKeyRequest(byte[] scope, byte[] init, String mimeType, int keyType, byte[] init,
HashMap<String, String> optionalParameters) throws NotProvisionedException; String mimeType,
int keyType,
HashMap<String, String> optionalParameters)
throws NotProvisionedException;
/** /** @see MediaDrm#provideKeyResponse(byte[], byte[]) */
* @see MediaDrm#provideKeyResponse(byte[], byte[])
*/
byte[] provideKeyResponse(byte[] scope, byte[] response) byte[] provideKeyResponse(byte[] scope, byte[] response)
throws NotProvisionedException, DeniedByServerException; throws NotProvisionedException, DeniedByServerException;