loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename DefaultDrmSessionEventListener to DrmSessionEventListener

Browse Source 
Part of issue:#6765

PiperOrigin-RevId: 299319146
This commit is contained in:
ibaker 2020-03-06 11:29:34 +00:00 committed by Oliver Woodman
parent eeab811301
commit c6bf6aae2a
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
View File

@ -31,7 +31,7 @@ import com.google.android.exoplayer2.audio.AudioAttributes;
import com.google.android.exoplayer2.audio.AudioListener; import com.google.android.exoplayer2.audio.AudioListener;
import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.audio.AudioRendererEventListener;
import com.google.android.exoplayer2.decoder.DecoderCounters; import com.google.android.exoplayer2.decoder.DecoderCounters;
import com.google.android.exoplayer2.drm.DefaultDrmSessionEventListener; import com.google.android.exoplayer2.drm.DrmSessionEventListener;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.MetadataOutput; import com.google.android.exoplayer2.metadata.MetadataOutput;
import com.google.android.exoplayer2.source.LoadEventInfo; import com.google.android.exoplayer2.source.LoadEventInfo;
@ -66,7 +66,7 @@ public class AnalyticsCollector
VideoRendererEventListener, VideoRendererEventListener,
MediaSourceEventListener, MediaSourceEventListener,
BandwidthMeter.EventListener, BandwidthMeter.EventListener,
DefaultDrmSessionEventListener, DrmSessionEventListener,
VideoListener, VideoListener,
AudioListener { AudioListener {

14
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
View File

@ -109,7 +109,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
private final boolean playClearSamplesWithoutKeys; private final boolean playClearSamplesWithoutKeys;
private final boolean isPlaceholderSession; private final boolean isPlaceholderSession;
private final HashMap<String, String> keyRequestParameters; private final HashMap<String, String> keyRequestParameters;
private final EventDispatcher<DefaultDrmSessionEventListener> eventDispatcher; private final EventDispatcher<DrmSessionEventListener> eventDispatcher;
private final LoadErrorHandlingPolicy loadErrorHandlingPolicy; private final LoadErrorHandlingPolicy loadErrorHandlingPolicy;
/* package */ final MediaDrmCallback callback; /* package */ final MediaDrmCallback callback;
@ -161,7 +161,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
HashMap<String, String> keyRequestParameters, HashMap<String, String> keyRequestParameters,
MediaDrmCallback callback, MediaDrmCallback callback,
Looper playbackLooper, Looper playbackLooper,
EventDispatcher<DefaultDrmSessionEventListener> eventDispatcher, EventDispatcher<DrmSessionEventListener> eventDispatcher,
LoadErrorHandlingPolicy loadErrorHandlingPolicy) { LoadErrorHandlingPolicy loadErrorHandlingPolicy) {
if (mode == DefaultDrmSessionManager.MODE_QUERY if (mode == DefaultDrmSessionManager.MODE_QUERY
|| mode == DefaultDrmSessionManager.MODE_RELEASE) { || mode == DefaultDrmSessionManager.MODE_RELEASE) {
@ -289,7 +289,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
if (sessionId != null) { if (sessionId != null) {
mediaDrm.closeSession(sessionId); mediaDrm.closeSession(sessionId);
sessionId = null; sessionId = null;
this.eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmSessionReleased); this.eventDispatcher.dispatch(DrmSessionEventListener::onDrmSessionReleased);
} }
releaseCallback.onSessionReleased(this); releaseCallback.onSessionReleased(this);
} }
@ -314,7 +314,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
try { try {
sessionId = mediaDrm.openSession(); sessionId = mediaDrm.openSession();
mediaCrypto = mediaDrm.createMediaCrypto(sessionId); mediaCrypto = mediaDrm.createMediaCrypto(sessionId);
eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmSessionAcquired); eventDispatcher.dispatch(DrmSessionEventListener::onDrmSessionAcquired);
state = STATE_OPENED; state = STATE_OPENED;
Assertions.checkNotNull(sessionId); Assertions.checkNotNull(sessionId);
return true; return true;
@ -378,7 +378,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
onError(new KeysExpiredException()); onError(new KeysExpiredException());
} else { } else {
state = STATE_OPENED_WITH_KEYS; state = STATE_OPENED_WITH_KEYS;
eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmKeysRestored); eventDispatcher.dispatch(DrmSessionEventListener::onDrmKeysRestored);
} }
} }
break; break;
@ -448,7 +448,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
byte[] responseData = (byte[]) response; byte[] responseData = (byte[]) response;
if (mode == DefaultDrmSessionManager.MODE_RELEASE) { if (mode == DefaultDrmSessionManager.MODE_RELEASE) {
mediaDrm.provideKeyResponse(Util.castNonNull(offlineLicenseKeySetId), responseData); mediaDrm.provideKeyResponse(Util.castNonNull(offlineLicenseKeySetId), responseData);
eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmKeysRestored); eventDispatcher.dispatch(DrmSessionEventListener::onDrmKeysRestored);
} else { } else {
byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, responseData); byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, responseData);
if ((mode == DefaultDrmSessionManager.MODE_DOWNLOAD if ((mode == DefaultDrmSessionManager.MODE_DOWNLOAD
@ -459,7 +459,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
offlineLicenseKeySetId = keySetId; offlineLicenseKeySetId = keySetId;
} }
state = STATE_OPENED_WITH_KEYS; state = STATE_OPENED_WITH_KEYS;
eventDispatcher.dispatch(DefaultDrmSessionEventListener::onDrmKeysLoaded); eventDispatcher.dispatch(DrmSessionEventListener::onDrmKeysLoaded);
} }
} catch (Exception e) { } catch (Exception e) {
onKeysError(e); onKeysError(e);

10
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View File

@ -239,7 +239,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
private final ExoMediaDrm.Provider<T> exoMediaDrmProvider; private final ExoMediaDrm.Provider<T> exoMediaDrmProvider;
private final MediaDrmCallback callback; private final MediaDrmCallback callback;
private final HashMap<String, String> keyRequestParameters; private final HashMap<String, String> keyRequestParameters;
private final EventDispatcher<DefaultDrmSessionEventListener> eventDispatcher; private final EventDispatcher<DrmSessionEventListener> eventDispatcher;
private final boolean multiSession; private final boolean multiSession;
private final int[] useDrmSessionsForClearContentTrackTypes; private final int[] useDrmSessionsForClearContentTrackTypes;
private final boolean playClearSamplesWithoutKeys; private final boolean playClearSamplesWithoutKeys;
@ -367,21 +367,21 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
} }
/** /**
* Adds a {@link DefaultDrmSessionEventListener} to listen to drm session events. * Adds a {@link DrmSessionEventListener} to listen to drm session events.
* *
* @param handler A handler to use when delivering events to {@code eventListener}. * @param handler A handler to use when delivering events to {@code eventListener}.
* @param eventListener A listener of events. * @param eventListener A listener of events.
*/ */
public final void addListener(Handler handler, DefaultDrmSessionEventListener eventListener) { public final void addListener(Handler handler, DrmSessionEventListener eventListener) {
eventDispatcher.addListener(handler, eventListener); eventDispatcher.addListener(handler, eventListener);
} }
/** /**
* Removes a {@link DefaultDrmSessionEventListener} from the list of drm session event listeners. * Removes a {@link DrmSessionEventListener} from the list of drm session event listeners.
* *
* @param eventListener The listener to remove. * @param eventListener The listener to remove.
*/ */
public final void removeListener(DefaultDrmSessionEventListener eventListener) { public final void removeListener(DrmSessionEventListener eventListener) {
eventDispatcher.removeListener(eventListener); eventDispatcher.removeListener(eventListener);
} }

4
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionEventListener.java → library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionEventListener.java
View File

@ -17,8 +17,8 @@ package com.google.android.exoplayer2.drm;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
/** Listener of {@link DefaultDrmSessionManager} events. */ /** Listener of {@link DrmSessionManager} events. */
public interface DefaultDrmSessionEventListener { public interface DrmSessionEventListener {
/** Called each time a drm session is acquired. */ /** Called each time a drm session is acquired. */
default void onDrmSessionAcquired() {} default void onDrmSessionAcquired() {}

4
library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
View File

@ -147,8 +147,8 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
handlerThread = new HandlerThread("OfflineLicenseHelper"); handlerThread = new HandlerThread("OfflineLicenseHelper");
handlerThread.start(); handlerThread.start();
conditionVariable = new ConditionVariable(); conditionVariable = new ConditionVariable();
DefaultDrmSessionEventListener eventListener = DrmSessionEventListener eventListener =
new DefaultDrmSessionEventListener() { new DrmSessionEventListener() {
@Override @Override
public void onDrmKeysLoaded() { public void onDrmKeysLoaded() {
conditionVariable.open(); conditionVariable.open();