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

Simplify release event logic in DefaultDrmSession

Browse Source 
This is a no-op assuming the class is always used correctly.
When release causes referenceCount to reach zero there can be at most
one EventDispatcher still connected (which is the one that must be
passed to that final release() call), so we can always pass the event
directly to the EventDispatcher passed in to release().

PiperOrigin-RevId: 358794004
This commit is contained in:
ibaker 2021-02-22 12:48:47 +00:00 committed by marcbaechinger
parent 399e1365d0
commit 8d942dc213
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,14 +321,10 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
mediaDrm.closeSession(sessionId); mediaDrm.closeSession(sessionId);
sessionId = null; sessionId = null;
} }
dispatchEvent(DrmSessionEventListener.EventDispatcher::drmSessionReleased);
} }
if (eventDispatcher != null) { if (eventDispatcher != null) {
if (isOpen()) { // Acquire and release events are only sent to the provided dispatcher.
// If the session is still open then send the release event only to the provided dispatcher eventDispatcher.drmSessionReleased();
// before removing it.
eventDispatcher.drmSessionReleased();
}
eventDispatchers.remove(eventDispatcher); eventDispatchers.remove(eventDispatcher);
} }
referenceCountListener.onReferenceCountDecremented(this, referenceCount); referenceCountListener.onReferenceCountDecremented(this, referenceCount);